From c9a3695857f3c616dcfe3503616be961ed4c8987 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 29 Sep 2014 16:58:50 +0100 Subject: bump nss from 3.15.3 to 3.16.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://gerrit.libreoffice.org/11700 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 726172e3eb8370125b89f853cebb1fb901547ebe) Signed-off-by: Michael Stahl Conflicts: external/nss/ExternalProject_nss.mk external/nss/nspr-build-config.patch external/nss/nss_macosx.patch (cherry picked from commit afd19a5ee99b1855bc2c2a48a29d2da16be883d1) Reviewed-on: https://gerrit.libreoffice.org/11898 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier Conflicts: download.lst external/nss/nss-linux-x86.patch.0 external/nss/nss-pem.patch Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e --- external/nss/ExternalProject_nss.mk | 2 +- external/nss/nss.aix.patch | 133 +++++++++++++++--------------- external/nss/nss.patch | 160 +++++++++++++++++++----------------- external/nss/nss_macosx.patch | 41 ++++----- 4 files changed, 172 insertions(+), 164 deletions(-) (limited to 'external') diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index dc19ec4ed186..cf071a48a1b7 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -16,7 +16,7 @@ $(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)") \ + $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" 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) \ diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch index c83ae5758e7a..da9aacb10e84 100644 --- a/external/nss/nss.aix.patch +++ b/external/nss/nss.aix.patch @@ -1,16 +1,7 @@ ---- a/a/nspr/configure 2010-08-18 07:23:01.000000000 -0500 -+++ b/b/nspr/configure 2010-08-18 07:33:11.000000000 -0500 -@@ -2973,7 +2973,8 @@ - #define SYSV 1 - EOF - -- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' -+ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@' -+ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib' - ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 - echo "configure:3477: checking for sys/atomic_op.h" >&5 -@@ -3102,7 +3103,6 @@ +diff -ru a/nspr/configure b/nspr/configure +--- a/a/nspr/configure 2014-09-29 16:47:42.984012225 +0100 ++++ b/b/nspr/configure 2014-09-29 16:50:33.907375937 +0100 +@@ -6369,7 +6369,6 @@ AIX_LINK_OPTS='-brtl -bnso -berok' ;; esac @@ -18,9 +9,10 @@ AIX_WRAP='$(DIST)/lib/aixwrap.o' AIX_TMP='./_aix_tmp.o' if test -n "$USE_64"; then ---- a/a/nspr/configure.in 2010-08-18 07:23:01.000000000 -0500 -+++ b/b/nspr/configure.in 2010-08-18 07:32:36.000000000 -0500 -@@ -831,7 +831,8 @@ +diff -ru a/nspr/configure.in b/nspr/configure.in +--- a/a/nspr/configure.in 2014-09-29 16:46:35.257394860 +0100 ++++ b/b/nspr/configure.in 2014-09-29 16:50:33.908375942 +0100 +@@ -1229,7 +1229,8 @@ AC_DEFINE(XP_UNIX) AC_DEFINE(AIX) AC_DEFINE(SYSV) @@ -30,7 +22,7 @@ AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)) case "${target_os}" in aix3.2*) -@@ -871,10 +872,9 @@ +@@ -1269,10 +1270,9 @@ AC_DEFINE(HAVE_SOCKLEN_T) AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) USE_IPV6=1 @@ -42,9 +34,10 @@ AIX_WRAP='$(DIST)/lib/aixwrap.o' AIX_TMP='./_aix_tmp.o' if test -n "$USE_64"; then ---- a/a/nspr/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500 -+++ b/b/nspr/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500 -@@ -110,7 +110,6 @@ +diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in +--- a/a/nspr/pr/src/Makefile.in 2014-09-29 16:46:35.281395079 +0100 ++++ b/b/nspr/pr/src/Makefile.in 2014-09-29 16:50:33.909375948 +0100 +@@ -74,7 +74,6 @@ endif ifeq ($(OS_ARCH),AIX) @@ -52,9 +45,58 @@ OS_LIBS = -lodm -lcfg ifeq ($(CLASSIC_NSPR),1) ifeq ($(OS_RELEASE),4.1) ---- a/a/nss/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500 -+++ b/b/nss/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500 -@@ -62,35 +62,30 @@ +diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/a/nss/cmd/platlibs.mk 2014-09-29 16:47:42.987012253 +0100 ++++ b/b/nss/cmd/platlibs.mk 2014-09-29 16:50:33.910375955 +0100 +@@ -134,7 +134,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) +@@ -180,7 +180,7 @@ + $(NULL) + + ifeq ($(OS_ARCH), AIX) +-EXTRA_SHARED_LIBS += -brtl ++EXTRA_SHARED_LIBS += -Wl,-brtl + endif + + # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) +diff -ru a/nss/cmd/shlibsign/Makefile b/nss/cmd/shlibsign/Makefile +--- a/a/nss/cmd/shlibsign/Makefile 2014-09-29 16:46:35.139393785 +0100 ++++ b/b/nss/cmd/shlibsign/Makefile 2014-09-29 16:50:33.910375955 +0100 +@@ -43,6 +43,9 @@ + + endif + ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif + + # sign any and all shared libraries that contain the word freebl + ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1) +diff -ru a/nss/cmd/shlibsign/mangle/Makefile b/nss/cmd/shlibsign/mangle/Makefile +--- a/a/nss/cmd/shlibsign/mangle/Makefile 2014-09-29 16:46:35.139393785 +0100 ++++ b/b/nss/cmd/shlibsign/mangle/Makefile 2014-09-29 16:50:33.910375955 +0100 +@@ -43,7 +43,9 @@ + + endif + +- ++ifeq ($(OS), AIX) ++EXTRA_SHARED_LIBS += -lpthreads ++endif + + ####################################################################### + # (5) Execute "global" rules. (OPTIONAL) # +diff -ru a/nss/coreconf/AIX.mk b/nss/coreconf/AIX.mk +--- a/a/nss/coreconf/AIX.mk 2014-09-29 16:46:35.040392883 +0100 ++++ b/b/nss/coreconf/AIX.mk 2014-09-29 16:50:33.909375948 +0100 +@@ -30,35 +30,30 @@ DEFAULT_COMPILER = xlc_r @@ -96,48 +138,3 @@ ifeq ($(USE_64), 1) OS_CFLAGS += -DAIX_64BIT OBJECT_MODE=64 ---- a/a/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500 -+++ b/b/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500 -@@ -136,7 +136,7 @@ - $(NULL) - - ifeq ($(OS_ARCH), AIX) --EXTRA_SHARED_LIBS += -brtl -+EXTRA_SHARED_LIBS += -Wl,-brtl - endif - - # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) -@@ -186,7 +186,7 @@ - $(NULL) - - ifeq ($(OS_ARCH), AIX) --EXTRA_SHARED_LIBS += -brtl -+EXTRA_SHARED_LIBS += -Wl,-brtl - endif - - # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) ---- a/a/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500 -+++ b/b/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500 -@@ -75,7 +75,9 @@ - - endif - -- -+ifeq ($(OS), AIX) -+EXTRA_SHARED_LIBS += -lpthreads -+endif - - ####################################################################### - # (5) Execute "global" rules. (OPTIONAL) # ---- a/a/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500 -+++ b/b/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500 -@@ -45,6 +45,9 @@ - - endif - -+ifeq ($(OS), AIX) -+EXTRA_SHARED_LIBS += -lpthreads -+endif - - # sign any and all shared libraries that contain the word freebl - ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1) diff --git a/external/nss/nss.patch b/external/nss/nss.patch index 37caae09aeb7..1dbd07db74dd 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -1,6 +1,7 @@ ---- a/a/nspr/configure 2010-02-08 19:41:35.000000000 +0100 -+++ b/b/nspr/configure 2010-06-11 16:35:54.960188991 +0200 -@@ -3900,7 +3900,7 @@ +diff -ru a/nspr/configure b/nspr/configure +--- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100 ++++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100 +@@ -7018,7 +7018,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC @@ -9,9 +10,61 @@ _OPTIMIZE_FLAGS=-O2 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that # combo is not yet good at debugging inlined ---- a/a/nss/coreconf/FreeBSD.mk 2009-11-23 05:06:29.000000000 -0500 -+++ b/b/nss/coreconf/FreeBSD.mk 2012-08-28 20:27:20.000000000 -0400 -@@ -57,6 +57,7 @@ +diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/a/nss/cmd/platlibs.mk 2014-09-29 16:46:38.306422654 +0100 ++++ b/b/nss/cmd/platlibs.mk 2014-09-29 16:47:42.987012253 +0100 +@@ -10,17 +10,22 @@ + + ifeq ($(OS_ARCH), SunOS) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' ++#In OOo we would probable put the executables next to libs ++EXTRA_SHARED_LIBS += -R '$$ORIGIN' + else +-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' ++EXTRA_SHARED_LIBS += -R '$$ORIGIN' + endif + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' ++endif ++ + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' + endif + endif + +diff -ru a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +--- a/a/nss/coreconf/arch.mk 2014-09-29 16:46:38.175421471 +0100 ++++ b/b/nss/coreconf/arch.mk 2014-09-29 16:47:42.986012244 +0100 +@@ -280,10 +280,15 @@ + # IMPL_STRATEGY may be defined too. + # + +-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++# OBJDIR_NAME is used to build the directory containing the built objects, for ++# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ ++# We need to deliver the contents of that folder into the solver. To make that easier ++# in the makefile we rename this directory to "out". ++#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ ++OBJDIR_NAME = out + + ifeq (,$(filter-out WIN%,$(OS_TARGET))) +-ifndef BUILD_OPT ++ifdef THIS_HAS_BEEN_DISABLED_TO_GET_out + # + # Define USE_DEBUG_RTL if you want to use the debug runtime library + # (RTL) in the debug build +diff -ru a/nss/coreconf/FreeBSD.mk b/nss/coreconf/FreeBSD.mk +--- a/a/nss/coreconf/FreeBSD.mk 2014-09-29 16:46:38.189421588 +0100 ++++ b/b/nss/coreconf/FreeBSD.mk 2014-09-29 16:47:42.984012225 +0100 +@@ -25,6 +25,7 @@ DSO_CFLAGS = -fPIC DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) @@ -19,9 +72,10 @@ # # The default implementation strategy for FreeBSD is pthreads. ---- a/a/nss/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 -+++ b/b/nss/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 -@@ -46,8 +46,11 @@ +diff -ru a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +--- a/a/nss/coreconf/Linux.mk 2014-09-29 16:46:38.189421588 +0100 ++++ b/b/nss/coreconf/Linux.mk 2014-09-29 16:47:42.985012235 +0100 +@@ -16,8 +16,11 @@ IMPL_STRATEGY = _PTH endif @@ -35,7 +89,7 @@ RANLIB = ranlib DEFAULT_COMPILER = gcc -@@ -147,7 +150,7 @@ +@@ -145,7 +148,7 @@ # incorrectly reports undefined references in the libraries we link with, so # we don't use -z defs there. ZDEFS_FLAG = -Wl,-z,defs @@ -44,7 +98,7 @@ LDFLAGS += $(ARCHFLAG) # On Maemo, we need to use the -rpath-link flag for even the standard system -@@ -158,8 +161,13 @@ +@@ -176,8 +179,13 @@ endif endif @@ -58,9 +112,22 @@ # The -rpath '$$ORIGIN' linker option instructs this library to search for its # dependencies in the same directory where it resides. ---- a/a/nss/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 -+++ b/b/nss/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 -@@ -89,8 +89,12 @@ +diff -ru a/nss/coreconf/rules.mk b/nss/coreconf/rules.mk +--- a/a/nss/coreconf/rules.mk 2014-09-29 16:46:38.188421578 +0100 ++++ b/b/nss/coreconf/rules.mk 2014-09-29 16:47:42.986012244 +0100 +@@ -261,7 +261,7 @@ + ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) + $(AR) $(subst /,\\,$(OBJS)) + else +- $(AR) $(OBJS) ++ $(AR) cr $@ $(OBJS) + endif + $(RANLIB) $@ + +diff -ru a/nss/coreconf/SunOS5.mk b/nss/coreconf/SunOS5.mk +--- a/a/nss/coreconf/SunOS5.mk 2014-09-29 16:46:38.175421471 +0100 ++++ b/b/nss/coreconf/SunOS5.mk 2014-09-29 16:47:42.985012235 +0100 +@@ -48,8 +48,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif else @@ -75,71 +142,12 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- a/a/nss/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 -+++ b/b/nss/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 -@@ -324,10 +324,15 @@ - # IMPL_STRATEGY may be defined too. - # - --OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ -+# OBJDIR_NAME is used to build the directory containing the built objects, for -+# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ -+# We need to deliver the contents of that folder into the solver. To make that easier -+# in the makefile we rename this directory to "out". -+#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ -+OBJDIR_NAME = out - - ifeq (,$(filter-out WIN%,$(OS_TARGET))) --ifndef BUILD_OPT -+ifdef THIS_HAS_BEEN_DISABLED_TO_GET_out - # - # Define USE_DEBUG_RTL if you want to use the debug runtime library - # (RTL) in the debug build ---- a/a/nss/coreconf/rules.mk -+++ b/b/nss/coreconf/rules.mk -@@ -293,7 +293,7 @@ - ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) - $(AR) $(subst /,\\,$(OBJS)) - else -- $(AR) $(OBJS) -+ $(AR) cr $@ $(OBJS) - endif - $(RANLIB) $@ - ---- a/a/nss/Makefile -+++ b/b/nss/Makefile +diff -ru a/nss/Makefile b/nss/Makefile +--- a/a/nss/Makefile 2014-09-29 16:46:38.171421425 +0100 ++++ b/b/nss/Makefile 2014-09-29 16:47:42.987012253 +0100 @@ -1,3 +1,5 @@ +export AR +export RANLIB #! gmake # # This Source Code Form is subject to the terms of the Mozilla Public ---- a/a/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 -+++ b/b/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 -@@ -41,17 +41,22 @@ - - ifeq ($(OS_ARCH), SunOS) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' -+#In OOo we would probable put the executables next to libs -+EXTRA_SHARED_LIBS += -R '$$ORIGIN' - else --EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps' -+EXTRA_SHARED_LIBS += -R '$$ORIGIN' - endif - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' -+endif -+ - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN' - endif - endif - diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index 853cd34d4f6b..7c099bca2740 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -1,19 +1,8 @@ ---- a/a/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 -+++ b/b/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 -@@ -104,6 +104,9 @@ - ifeq ($(OS_TARGET),WIN95) - NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 - endif -+ifdef MACOS_SDK_DIR -+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) -+endif - ifdef USE_DEBUG_RTL - NSPR_CONFIGURE_OPTS += --enable-debug-rtl - endif ---- a/a/nspr/configure -+++ b/b/nspr/configure -@@ -3888,7 +3889,7 @@ - fi +diff -ru a/nspr/configure b/nspr/configure +--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100 ++++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100 +@@ -6577,7 +6579,7 @@ + DSO_CFLAGS=-fPIC - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' @@ -21,9 +10,10 @@ _OPTIMIZE_FLAGS=-O2 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' STRIP="$STRIP -x -S" ---- a/a/nss/coreconf/Darwin.mk -+++ b/b/nss/coreconf/Darwin.mk -@@ -39,8 +39,12 @@ +diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk +--- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100 ++++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100 +@@ -7,8 +7,12 @@ DEFAULT_COMPILER = gcc @@ -91,3 +81,16 @@ MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) DLL_SUFFIX = dylib +diff -ru a/nss/Makefile b/nss/Makefile +--- a/a/nss/Makefile 2014-09-29 16:50:22.990304789 +0100 ++++ b/b/nss/Makefile 2014-09-29 16:51:59.207931908 +0100 +@@ -72,6 +72,9 @@ + ifeq ($(OS_TARGET),WIN95) + NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 + endif ++ifdef MACOS_SDK_DIR ++NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) ++endif + ifdef USE_DEBUG_RTL + NSPR_CONFIGURE_OPTS += --enable-debug-rtl + endif -- cgit v1.2.3