Index: comp_gyp.patch |
diff --git a/comp_gyp.patch b/comp_gyp.patch |
new file mode 100644 |
index 0000000000000000000000000000000000000000..e493a981c432f9bd9cf33e40fa35da6246d8709d |
--- /dev/null |
+++ b/comp_gyp.patch |
@@ -0,0 +1,59 @@ |
+Index: pylib/gyp/xcodeproj_file.py |
+=================================================================== |
+--- pylib/gyp/xcodeproj_file.py (revision 1246) |
++++ pylib/gyp/xcodeproj_file.py (working copy) |
+@@ -2015,7 +2015,7 @@ |
+ |
+ def __repr__(self): |
+ props = self._properties |
+- name = '%s.gyp:%s' % (props['containerPortal'].Name(), props['remoteInfo']) |
++ name = '%s.gyp:%s %d' % (props['containerPortal'].Name(), props['remoteInfo'], props['proxyType']) |
+ return '<%s %r at 0x%x>' % (self.__class__.__name__, name, id(self)) |
+ |
+ def Name(self): |
+@@ -2117,8 +2117,7 @@ |
+ pbxproject = self.PBXProjectAncestor() |
+ other_pbxproject = other.PBXProjectAncestor() |
+ if pbxproject == other_pbxproject: |
+- # The easy case. Add a dependency to another target in the same |
+- # project file. |
++ # Add a dependency to another target in the same project file. |
+ container = PBXContainerItemProxy({'containerPortal': pbxproject, |
+ 'proxyType': 1, |
+ 'remoteGlobalIDString': other, |
+@@ -2127,8 +2126,7 @@ |
+ 'targetProxy': container}) |
+ self.AppendProperty('dependencies', dependency) |
+ else: |
+- # The hard case. Add a dependency to a target in a different project |
+- # file. Actually, this case isn't really so hard. |
++ # Add a dependency to a target in a different project file. |
+ other_project_ref = \ |
+ pbxproject.AddOrGetProjectReference(other_pbxproject)[1] |
+ container = PBXContainerItemProxy({ |
+Index: pylib/gyp/generator/make.py |
+=================================================================== |
+--- pylib/gyp/generator/make.py (revision 1246) |
++++ pylib/gyp/generator/make.py (working copy) |
+@@ -148,7 +148,7 @@ |
+ # - Set SONAME to the library filename so our binaries don't reference |
+ # the local, absolute paths used on the link command-line. |
+ quiet_cmd_solink = SOLINK($(TOOLSET)) $@ |
+-cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS) |
++cmd_solink = $(LINK.$(TOOLSET)) -Wl,-all_load -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS) |
+ |
+ quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@ |
+ cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS) |
+Index: pylib/gyp/generator/ninja.py |
+=================================================================== |
+--- pylib/gyp/generator/ninja.py (revision 1246) |
++++ pylib/gyp/generator/ninja.py (working copy) |
+@@ -1213,7 +1213,7 @@ |
+ 'solink', |
+ description='SOLINK $out, POSTBUILDS', |
+ command=('$ld -shared $ldflags -o $out ' |
+- '$in $libs$postbuilds')) |
++ '$in -Wl,-all_load $libs$postbuilds')) |
+ master_ninja.rule( |
+ 'solink_module', |
+ description='SOLINK(module) $out, POSTBUILDS', |