diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 16:58:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-09 16:29:45 +0000 |
| commit | 726172e3eb8370125b89f853cebb1fb901547ebe (patch) | |
| tree | 0fb42f4d5d45cc0ec79214f87c34fdeef54c3a17 /external/nss/nss_macosx.patch | |
| parent | e0b14b922204acf541bedf658236d30dc5878fca (diff) | |
bump nss from 3.15.3 to 3.16.5
Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e
Reviewed-on: https://gerrit.libreoffice.org/11700
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/nss/nss_macosx.patch')
| -rw-r--r-- | external/nss/nss_macosx.patch | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index 348d42be6d92..cb0ec688f45a 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -1,18 +1,7 @@ ---- a/a/nss/Makefile -+++ b/b/nss/Makefile -@@ -69,6 +69,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.in -+++ b/b/nspr/configure.in -@@ -1374,7 +1374,9 @@ +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 +@@ -6568,7 +6568,9 @@ ;; esac if test "`echo $CC | grep -c '\-arch '`" = "0"; then @@ -21,11 +10,21 @@ + CC="$CC -arch $CPU_ARCH" + fi fi - AC_CHECK_HEADER(crt_externs.h) + ac_fn_c_check_header_mongrel "$LINENO" "crt_externs.h" "ac_cv_header_crt_externs_h" "$ac_includes_default" + if test "x$ac_cv_header_crt_externs_h" = xyes; then : +@@ -6577,7 +6579,7 @@ + + DSO_CFLAGS=-fPIC ---- a/a/nspr/configure -+++ b/b/nspr/configure -@@ -3864,7 +3864,9 @@ +- 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" +diff -ru a/nspr/configure.in b/nspr/configure.in +--- a/a/nspr/configure.in 2014-09-29 16:50:33.908375942 +0100 ++++ b/b/nspr/configure.in 2014-09-29 16:51:59.209931921 +0100 +@@ -1402,7 +1402,9 @@ ;; esac if test "`echo $CC | grep -c '\-arch '`" = "0"; then @@ -34,19 +33,11 @@ + CC="$CC -arch $CPU_ARCH" + fi fi - ac_safe=`echo "crt_externs.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for crt_externs.h""... $ac_c" 1>&6 -@@ -3900,7 +3902,7 @@ - fi - + AC_CHECK_HEADER(crt_externs.h) 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" ---- a/a/nss/coreconf/Darwin.mk -+++ b/b/nss/coreconf/Darwin.mk +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 @@ -110,3 +101,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 |