diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-13 21:00:28 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 16:00:56 +0100 |
| commit | 78d4b78353b281b7380fe793abd81e9cedd8ee48 (patch) | |
| tree | ab26bcea01e777994b0e00958bf2c372eddea6e5 | |
| parent | 226e89180c7959795394f7f0b7d4202c31e59187 (diff) | |
nss: remove permission changes from nss_macosx.patch
... and instead do that in ExternalProject, which should be more
maintainable than patching.
Change-Id: I0ccf5697976399cf4f92c53e896492044ee6492d
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 28 | ||||
| -rw-r--r-- | external/nss/nss_macosx.patch | 33 |
2 files changed, 15 insertions, 46 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 38dec3c49644..dc19ec4ed186 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -67,19 +67,21 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject NSDISTMODE=copy \ $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \ && rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \ - $(if $(filter MACOSX,$(OS)),&& $(PERL) \ - $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libfreebl3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnspr4.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsmime3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsoftokn3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libssl3.dylib) \ + $(if $(filter MACOSX,$(OS)),\ + && chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \ + && $(PERL) \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libfreebl3.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnspr4.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsmime3.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsoftokn3.dylib \ + $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libssl3.dylib) \ ,nss) endif diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index ca625cb5bb79..853cd34d4f6b 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -21,39 +21,6 @@ _OPTIMIZE_FLAGS=-O2 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' STRIP="$STRIP -x -S" ---- a/a/nspr/lib/ds/Makefile.in -+++ b/b/nspr/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) ---- a/a/nspr/lib/libc/src/Makefile.in -+++ b/b/nspr/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) ---- a/a/nspr/pr/src/Makefile.in -+++ b/b/nspr/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) --- a/a/nss/coreconf/Darwin.mk +++ b/b/nss/coreconf/Darwin.mk @@ -39,8 +39,12 @@ |