diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-13 17:08:03 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 11:27:38 +0000 |
| commit | cca8c8cf79e0d9bcfb8798de3948aa446317b08e (patch) | |
| tree | 00f58d7fc35e8ba68b36ad99ac3fe117a04d0360 /external/nss/ExternalProject_nss.mk | |
| parent | 6c5557c60f97778fd732c01f054553356ce7f258 (diff) | |
nss: upgrade to 3.15.3
- from nss_macosx.patch drop nmedit hunk (removed upstream)
- adapt include and lib paths to changed tarball directory layout
Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe
Reviewed-on: https://gerrit.libreoffice.org/6670
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/nss/ExternalProject_nss.mk')
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 0bd7a38a451a..38dec3c49644 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -16,10 +16,10 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\ $(call gb_ExternalProject_get_state_target,nss,configure): $(call gb_ExternalProject_run,configure,\ - $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \ - mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \ + $(if $(filter MSC,$(COM)),LIB="$(ILIB)") \ + nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \ ,,nss_configure.log) ifeq ($(OS),WNT) @@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject XCFLAGS="$(SOLARINC)" \ $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \ NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ - ,mozilla/security/nss) + ,nss) else @@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-shared --disable-static" \ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py" \ && rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \ - ,mozilla/security/nss) + ,nss) endif else # OS!=WNT @@ -66,21 +66,21 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ NSDISTMODE=copy \ $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \ - && rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \ + && 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)/mozilla/dist/out/lib/libfreebl3.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssckbi.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssdbm3.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssutil3.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplc4.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplds4.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsmime3.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsoftokn3.dylib \ - $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libssl3.dylib) \ - ,mozilla/security/nss) + $(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 |