Title: [116800] trunk
- Revision
- 116800
- Author
- kev...@webkit.org
- Date
- 2012-05-11 13:24:31 -0700 (Fri, 11 May 2012)
Log Message
[wx] Unreviewed build fixes for recent trunk changes and 32-bit ld *nix builds.
Modified Paths
Diff
Modified: trunk/ChangeLog (116799 => 116800)
--- trunk/ChangeLog 2012-05-11 20:16:47 UTC (rev 116799)
+++ trunk/ChangeLog 2012-05-11 20:24:31 UTC (rev 116800)
@@ -1,3 +1,9 @@
+2012-05-11 Kevin Ollivier <kev...@theolliviers.com>
+
+ [wx] Unreviewed build fix, exclude some files we don't use from the build.
+
+ * wscript:
+
2012-05-11 Tommy Widenflycht <tom...@google.com>
MediaStream API: Fix a reference counting issue in UserMediaRequest
Modified: trunk/Tools/ChangeLog (116799 => 116800)
--- trunk/Tools/ChangeLog 2012-05-11 20:16:47 UTC (rev 116799)
+++ trunk/Tools/ChangeLog 2012-05-11 20:24:31 UTC (rev 116800)
@@ -1,3 +1,10 @@
+2012-05-11 Kevin Ollivier <kev...@theolliviers.com>
+
+ [wx] Unreviewed build fix. Fix memory exhausted errors from 32-bit ld on *nix.
+
+ * waf/build/settings.py:
+ (common_configure):
+
2012-05-11 Dirk Pranke <dpra...@chromium.org>
webkit-patch rebaseline should fetch stale expectations :)
Modified: trunk/Tools/waf/build/settings.py (116799 => 116800)
--- trunk/Tools/waf/build/settings.py 2012-05-11 20:16:47 UTC (rev 116799)
+++ trunk/Tools/waf/build/settings.py 2012-05-11 20:24:31 UTC (rev 116800)
@@ -493,6 +493,8 @@
conf.check_cfg(path='curl-config', args='--cflags --libs', package='', uselib_store='CURL', mandatory=True)
if not sys.platform.startswith('darwin'):
+ # this is needed to keep ld from hitting the 4gb process limit under Linux/Unix.
+ conf.env.append_value('LINKFLAGS', ['-Wl,--no-keep-memory'])
conf.check_cfg(package='cairo', args='--cflags --libs', uselib_store='WX', mandatory=True)
conf.check_cfg(package='pango', args='--cflags --libs', uselib_store='WX', mandatory=True)
conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='WX', mandatory=True)
Modified: trunk/wscript (116799 => 116800)
--- trunk/wscript 2012-05-11 20:16:47 UTC (rev 116799)
+++ trunk/wscript 2012-05-11 20:24:31 UTC (rev 116800)
@@ -340,9 +340,13 @@
excludes.append('JSNavigatorCustom.cpp')
excludes.append('WebGLContextEvent.cpp')
excludes.append('FileSystemPOSIX.cpp')
+ excludes.append('LocaleICU.cpp')
+ excludes.append('LocalizedDateICU.cpp')
+ excludes.append('PlatformGestureRecognizer.cpp')
excludes.append('SharedBufferPOSIX.cpp')
excludes.append('TouchAdjustment.cpp')
excludes.append('DNSResolveQueue.cpp')
+ excludes.append('WebDOMRadioNodeList.cpp')
# These files appear not to build with older versions of ICU
excludes.append('LocalizedNumberICU.cpp')
@@ -362,9 +366,6 @@
# once we move over to the new FPD implementation, remove this.
excludes.append('FontPlatformData.cpp')
- # we don't use gestures currently
- excludes.append('PlatformGestureRecognizer.cpp')
-
# we need a better system to exclude CF stuff
excludes.append('HyphenationCF.cpp')
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
