From: kevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri, 11 May 2012 20:24:31 +0000 (+0000)
Subject: [wx] Unreviewed build fixes for recent trunk changes and 32-bit ld *nix builds.
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=d60b8db2ef2571064b019393e66ddd4922ea5c60

[wx] Unreviewed build fixes for recent trunk changes and 32-bit ld *nix builds.


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@116800 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/ChangeLog b/ChangeLog
index 991930d..a668667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-11  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix, exclude some files we don't use from the build.
+
+        * wscript:
+
 2012-05-11  Tommy Widenflycht  <tommyw@google.com>
 
         MediaStream API: Fix a reference counting issue in UserMediaRequest
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 5315199..89b82b7 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-11  Kevin Ollivier  <kevino@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  <dpranke@chromium.org>
 
         webkit-patch rebaseline should fetch stale expectations :)
diff --git a/Tools/waf/build/settings.py b/Tools/waf/build/settings.py
index fdf6c1e..26a2080 100644
--- a/Tools/waf/build/settings.py
+++ b/Tools/waf/build/settings.py
@@ -493,6 +493,8 @@ def common_configure(conf):
             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)
diff --git a/wscript b/wscript
index 5eeafcf..b0f45b8 100644
--- a/wscript
+++ b/wscript
@@ -340,9 +340,13 @@ def build(bld):
         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 @@ def build(bld):
         # 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')