Kaydet (Commit) 6e7991df authored tarafından Michael Stahl's avatar Michael Stahl

nss: upgrade to release 3.19.2

- drop nss-linux-x86-patch.0:
  this was actually patching OS/2-specific code so is evidently obsolete
- drop nspr-build-config.patch:
  there does not appear to be any justification why this huge patch exists
  at all, so the only reasonable thing to do is to drop it
- nss_macosx.patch:
  drop several hunks relevant only to unuspported MacOSX/PPC platform

Change-Id: Id55fcb8eaa637c10a42203f1897480df8a6ec0fa
üst 65327d61
...@@ -110,7 +110,7 @@ export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2 ...@@ -110,7 +110,7 @@ export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz export NSS_TARBALL := 2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz
export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc
export ODFGEN_VERSION_MICRO := 4 export ODFGEN_VERSION_MICRO := 4
export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
......
...@@ -16,13 +16,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ ...@@ -16,13 +16,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.aix.patch \ external/nss/nss.aix.patch \
external/nss/nss-3.13.5-zlib-werror.patch \ external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \ external/nss/nss_macosx.patch \
external/nss/nss-linux-x86.patch.0 \
external/nss/nss-win32-make.patch.1 \ external/nss/nss-win32-make.patch.1 \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \ $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \ $(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \ external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \ external/nss/nss.mingw.patch.3) \
external/nss/nspr-build-config.patch \
external/nss/ubsan.patch.0 \ external/nss/ubsan.patch.0 \
$(if $(filter IOS,$(OS)), \ $(if $(filter IOS,$(OS)), \
external/nss/nss-chromium-nss-static.patch \ external/nss/nss-chromium-nss-static.patch \
......
This diff is collapsed.
--- nss/lib/freebl/Makefile 2014-09-29 16:52:50.356265282 +0100
+++ nss/lib/freebl/Makefile 2014-09-29 16:53:01.823340024 +0100
@@ -110,6 +110,7 @@
ifeq (OS2,$(OS_TARGET))
ASFILES = mpi_x86_os2.s
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+ DEFINES += -DMP_USE_UINT_DIGIT
DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
DEFINES += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
...@@ -50,8 +50,8 @@ diff -ru a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk ...@@ -50,8 +50,8 @@ diff -ru a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ -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 +# OBJDIR_NAME is used to build the directory containing the built objects, for
+# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ +# 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 +# We need to deliver the contents of that folder into instdir. To make that
+# in the makefile we rename this directory to "out". +# 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 = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+OBJDIR_NAME = out +OBJDIR_NAME = out
...@@ -105,7 +105,7 @@ diff -ru a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk ...@@ -105,7 +105,7 @@ diff -ru a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
+ifneq ($(SYSTEM_ZLIB),) +ifneq ($(SYSTEM_ZLIB),)
+# Currently (3.12.4) only the tools modutil and signtool are linked with libz +# Currently (3.12.4) only the tools modutil and signtool are linked with libz
+# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which +# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which
+# is also build in nss. +# is also built in nss.
USE_SYSTEM_ZLIB = 1 USE_SYSTEM_ZLIB = 1
ZLIB_LIBS = -lz ZLIB_LIBS = -lz
+endif +endif
......
diff -ru a/nspr/configure b/nspr/configure diff -ru a/nspr/configure b/nspr/configure
--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100 --- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +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
- CC="$CC -arch $CPU_ARCH"
+ if test "$CPU_ARCH" != "ppc"; then
+ CC="$CC -arch $CPU_ARCH"
+ fi
fi
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 @@ @@ -6577,7 +6579,7 @@
...@@ -21,20 +10,6 @@ diff -ru a/nspr/configure b/nspr/configure ...@@ -21,20 +10,6 @@ diff -ru a/nspr/configure b/nspr/configure
_OPTIMIZE_FLAGS=-O2 _OPTIMIZE_FLAGS=-O2
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
STRIP="$STRIP -x -S" 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
- CC="$CC -arch $CPU_ARCH"
+ if test "$CPU_ARCH" != "ppc"; then
+ CC="$CC -arch $CPU_ARCH"
+ fi
fi
AC_CHECK_HEADER(crt_externs.h)
DSO_CFLAGS=-fPIC
diff -ru a/nss/coreconf/Darwin.mk 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 --- 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 +++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100
...@@ -69,12 +44,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk ...@@ -69,12 +44,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
override CPU_ARCH = x86 override CPU_ARCH = x86
endif endif
else else
@@ -31,17 +39,20 @@ @@ -31,12 +39,16 @@
# Nothing set for arm currently.
else
OS_REL_CFLAGS = -Dppc
-CC += -arch ppc
endif
endif endif
ifneq (,$(MACOS_SDK_DIR)) ifneq (,$(MACOS_SDK_DIR))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment