diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-05-22 08:35:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-05-22 08:46:32 +0200 |
| commit | 2bb3500284182756116890e24fa12be8dace0753 (patch) | |
| tree | 370486678007f301f7c0005e57727139e41187ee /nss/nss_macosx.patch | |
| parent | e84fe1e99e3df4ef1db7ad947f7866de16d7c662 (diff) | |
Fix nss library paths for Mac OS X
nss uses hard-coded @executable_path (which is wrong, consider e.g. the case of
the URE uno executable), so patch it to use @_..._OOO instead (and no need to
set --prefix), and pass the resulting libs through macosx-change-install-names
(which requires the generated libs to be writable).
Change-Id: I0f04533f0f0581ee7b9dfd8929b8629c0842cc1b
Diffstat (limited to 'nss/nss_macosx.patch')
| -rw-r--r-- | nss/nss_macosx.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch index ac6fe7138e3e..6b5096072f5c 100644 --- a/nss/nss_macosx.patch +++ b/nss/nss_macosx.patch @@ -10,3 +10,58 @@ ifdef USE_DEBUG_RTL NSPR_CONFIGURE_OPTS += --enable-debug-rtl endif +--- misc/nss-3.13.5/mozilla/nsprpub/configure ++++ misc/build/nss-3.13.5/mozilla/nsprpub/configure +@@ -3888,7 +3889,7 @@ + fi + + DSO_CFLAGS=-fPIC +- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' ++ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names' + _OPTIMIZE_FLAGS=-O2 + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' + STRIP="$STRIP -x -S" +--- misc/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in ++++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in +@@ -143,7 +143,7 @@ + + export:: $(TARGETS) + $(INSTALL) -m 444 $(HEADERS) $(dist_includedir) +- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) ++ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir) + ifdef SHARED_LIBRARY + ifeq ($(OS_ARCH),HP-UX) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir) +--- misc/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in ++++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in +@@ -144,7 +144,7 @@ + # + + export:: $(TARGETS) +- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) ++ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir) + ifdef SHARED_LIBRARY + ifeq ($(OS_ARCH),HP-UX) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir) +--- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in ++++ misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in +@@ -365,7 +365,7 @@ + # + + build:: $(TARGETS) +- $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) ++ $(INSTALL) -m 664 $(TARGETS) $(dist_libdir) + ifdef SHARED_LIBRARY + ifeq ($(OS_ARCH),HP-UX) + $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir) +--- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk ++++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk +@@ -150,7 +150,7 @@ + # May override this with different compatibility and current version numbers. + DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 + # May override this with -bundle to create a loadable module. +-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names ++DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @__________________________________________________OOO/$(notdir $@) -headerpad_max_install_names + + MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) + DLL_SUFFIX = dylib |