diff options
| -rw-r--r-- | external/nss/UnpackedTarball_gyp.mk | 3 | ||||
| -rw-r--r-- | external/nss/gyp-rpath.patch | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/external/nss/UnpackedTarball_gyp.mk b/external/nss/UnpackedTarball_gyp.mk index ce44ae51f996..72358686e97a 100644 --- a/external/nss/UnpackedTarball_gyp.mk +++ b/external/nss/UnpackedTarball_gyp.mk @@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,gyp)) $(eval $(call gb_UnpackedTarball_set_tarball,gyp,$(GYP_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,gyp,0)) + $(eval $(call gb_UnpackedTarball_add_patches,gyp,\ external/nss/gyp-buildsystem.patch.0 \ + external/nss/gyp-rpath.patch \ )) ifeq ($(OS),WNT) diff --git a/external/nss/gyp-rpath.patch b/external/nss/gyp-rpath.patch new file mode 100644 index 000000000000..d918584c9745 --- /dev/null +++ b/external/nss/gyp-rpath.patch @@ -0,0 +1,12 @@ +--- pylib/gyp/generator/ninja.py ++++ pylib/gyp/generator/ninja.py +@@ -1241,6 +1241,8 @@ + else: + ldflags.append('-Wl,-rpath=%s' % self.target_rpath) + ldflags.append('-Wl,-rpath-link=%s' % rpath) ++ elif not is_executable: ++ ldflags.append('-Wl,-rpath=\$$ORIGIN') + self.WriteVariableList(ninja_file, 'ldflags', + map(self.ExpandSpecial, ldflags)) + + |