Skip to content

C
core
Kaydet (Commit) 726172e3 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

bump nss from 3.15.3 to 3.16.5 

Change-Id: I8318982eb1cee1a694dbdd504e0ca106a29d807e
Reviewed-on: https://gerrit.libreoffice.org/11700Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e0b14b92
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 184 deletions
download.lst
Dosyayı görüntüle @ 726172e3
...@@ -105,7 +105,7 @@ export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2 ...@@ -105,7 +105,7 @@ export MWAW_TARBALL := libmwaw-0.3.1.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 := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz export NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7 export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7
export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2 export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
......
external/nss/ExternalProject_nss.mk
Dosyayı görüntüle @ 726172e3
...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\ ...@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
$(call gb_ExternalProject_get_state_target,nss,configure): $(call gb_ExternalProject_get_state_target,nss,configure):
$(call gb_ExternalProject_run,configure,\ $(call gb_ExternalProject_run,configure,\
$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \ $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" LIB="$(ILIB)") \
$(if $(CROSS_COMPILING),\ $(if $(CROSS_COMPILING),\
NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
......
external/nss/nspr-build-config.patch
Dosyayı görüntüle @ 726172e3
This source diff could not be displayed because it is too large. You can view the blob instead.
external/nss/nss-linux-x86.patch.0
Dosyayı görüntüle @ 726172e3
--- nss/lib/freebl/Makefile --- nss/lib/freebl/Makefile 2014-09-29 16:52:50.356265282 +0100
+++ nss/lib/freebl/Makefile +++ nss/lib/freebl/Makefile 2014-09-29 16:53:01.823340024 +0100
@@ -195,6 +195,7 @@ @@ -110,6 +110,7 @@
ifeq ($(CPU_ARCH),x86) ifeq (OS2,$(OS_TARGET))
ASFILES = mpi_x86.s ASFILES = mpi_x86_os2.s
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
+ DEFINES += -DMP_USE_UINT_DIGIT + DEFINES += -DMP_USE_UINT_DIGIT
DEFINES += -DMP_ASSEMBLY_DIV_2DX1D DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
DEFINES += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
# The floating point ECC code doesn't work on Linux x86 (bug 311432).
external/nss/nss-pem.patch
Dosyayı görüntüle @ 726172e3
...@@ -5230,7 +5230,7 @@ new file mode 100644 ...@@ -5230,7 +5230,7 @@ new file mode 100644
index 0000000..1179f2a index 0000000..1179f2a
--- /dev/null --- /dev/null
+++ b/b/nss/lib/ckfw/pem/rsawrapr.c +++ b/b/nss/lib/ckfw/pem/rsawrapr.c
@@ -0,0 +1,808 @@ @@ -0,0 +1,823 @@
+/* +/*
+ * PKCS#1 encoding and decoding functions. + * PKCS#1 encoding and decoding functions.
+ * This file is believed to contain no code licensed from other parties. + * This file is believed to contain no code licensed from other parties.
...@@ -5435,6 +5435,21 @@ index 0000000..1179f2a ...@@ -5435,6 +5435,21 @@ index 0000000..1179f2a
+} +}
+ +
+/* +/*
+ * RSA block types
+ *
+ * The actual values are important -- they are fixed, *not* arbitrary.
+ * The explicit value assignments are not needed (because C would give
+ * us those same values anyway) but are included as a reminder...
+ */
+typedef enum {
+ RSA_BlockPrivate0 = 0, /* unused, really */
+ RSA_BlockPrivate = 1, /* pad for a private-key operation */
+ RSA_BlockPublic = 2, /* pad for a public-key operation */
+ RSA_BlockRaw = 4, /* simply justify the block appropriately */
+ RSA_BlockTotal
+} RSA_BlockType;
+
+/*
+ * Format one block of data for public/private key encryption using + * Format one block of data for public/private key encryption using
+ * the rules defined in PKCS #1. + * the rules defined in PKCS #1.
+ */ + */
......
external/nss/nss.aix.patch
Dosyayı görüntüle @ 726172e3
--- a/a/nspr/configure 2010-08-18 07:23:01.000000000 -0500 diff -ru a/nspr/configure b/nspr/configure
+++ b/b/nspr/configure 2010-08-18 07:33:11.000000000 -0500 --- a/a/nspr/configure 2014-09-29 16:47:42.984012225 +0100
@@ -2973,7 +2973,8 @@ +++ b/b/nspr/configure 2014-09-29 16:50:33.907375937 +0100
#define SYSV 1 @@ -6369,7 +6369,6 @@
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 @@
AIX_LINK_OPTS='-brtl -bnso -berok' AIX_LINK_OPTS='-brtl -bnso -berok'
;; ;;
esac esac
...@@ -18,9 +9,10 @@ ...@@ -18,9 +9,10 @@
AIX_WRAP='$(DIST)/lib/aixwrap.o' AIX_WRAP='$(DIST)/lib/aixwrap.o'
AIX_TMP='./_aix_tmp.o' AIX_TMP='./_aix_tmp.o'
if test -n "$USE_64"; then if test -n "$USE_64"; then
--- a/a/nspr/configure.in 2010-08-18 07:23:01.000000000 -0500 diff -ru a/nspr/configure.in b/nspr/configure.in
+++ b/b/nspr/configure.in 2010-08-18 07:32:36.000000000 -0500 --- a/a/nspr/configure.in 2014-09-29 16:46:35.257394860 +0100
@@ -831,7 +831,8 @@ +++ b/b/nspr/configure.in 2014-09-29 16:50:33.908375942 +0100
@@ -1229,7 +1229,8 @@
AC_DEFINE(XP_UNIX) AC_DEFINE(XP_UNIX)
AC_DEFINE(AIX) AC_DEFINE(AIX)
AC_DEFINE(SYSV) AC_DEFINE(SYSV)
...@@ -30,7 +22,7 @@ ...@@ -30,7 +22,7 @@
AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H)) AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
case "${target_os}" in case "${target_os}" in
aix3.2*) aix3.2*)
@@ -871,10 +872,9 @@ @@ -1269,10 +1270,9 @@
AC_DEFINE(HAVE_SOCKLEN_T) AC_DEFINE(HAVE_SOCKLEN_T)
AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
USE_IPV6=1 USE_IPV6=1
...@@ -42,9 +34,10 @@ ...@@ -42,9 +34,10 @@
AIX_WRAP='$(DIST)/lib/aixwrap.o' AIX_WRAP='$(DIST)/lib/aixwrap.o'
AIX_TMP='./_aix_tmp.o' AIX_TMP='./_aix_tmp.o'
if test -n "$USE_64"; then if test -n "$USE_64"; then
--- a/a/nspr/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500 diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
+++ b/b/nspr/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500 --- a/a/nspr/pr/src/Makefile.in 2014-09-29 16:46:35.281395079 +0100
@@ -110,7 +110,6 @@ +++ b/b/nspr/pr/src/Makefile.in 2014-09-29 16:50:33.909375948 +0100
@@ -74,7 +74,6 @@
endif endif
ifeq ($(OS_ARCH),AIX) ifeq ($(OS_ARCH),AIX)
...@@ -52,9 +45,58 @@ ...@@ -52,9 +45,58 @@
OS_LIBS = -lodm -lcfg OS_LIBS = -lodm -lcfg
ifeq ($(CLASSIC_NSPR),1) ifeq ($(CLASSIC_NSPR),1)
ifeq ($(OS_RELEASE),4.1) ifeq ($(OS_RELEASE),4.1)
--- a/a/nss/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500 diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
+++ b/b/nss/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500 --- a/a/nss/cmd/platlibs.mk 2014-09-29 16:47:42.987012253 +0100
@@ -62,35 +62,30 @@ +++ 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 DEFAULT_COMPILER = xlc_r
...@@ -96,48 +138,3 @@ ...@@ -96,48 +138,3 @@
ifeq ($(USE_64), 1) ifeq ($(USE_64), 1)
OS_CFLAGS += -DAIX_64BIT OS_CFLAGS += -DAIX_64BIT
OBJECT_MODE=64 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)
external/nss/nss.patch
Dosyayı görüntüle @ 726172e3
--- a/a/nspr/configure 2010-02-08 19:41:35.000000000 +0100 diff -ru a/nspr/configure b/nspr/configure
+++ b/b/nspr/configure 2010-06-11 16:35:54.960188991 +0200 --- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100
@@ -3900,7 +3900,7 @@ +++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100
@@ -7018,7 +7018,7 @@
PR_MD_CSRCS=linux.c PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC DSO_CFLAGS=-fPIC
...@@ -9,9 +10,61 @@ ...@@ -9,9 +10,61 @@
_OPTIMIZE_FLAGS=-O2 _OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
# combo is not yet good at debugging inlined # combo is not yet good at debugging inlined
--- a/a/nss/coreconf/FreeBSD.mk 2009-11-23 05:06:29.000000000 -0500 diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
+++ b/b/nss/coreconf/FreeBSD.mk 2012-08-28 20:27:20.000000000 -0400 --- a/a/nss/cmd/platlibs.mk 2014-09-29 16:46:38.306422654 +0100
@@ -57,6 +57,7 @@ +++ 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_CFLAGS = -fPIC
DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
...@@ -19,9 +72,10 @@ ...@@ -19,9 +72,10 @@
# #
# The default implementation strategy for FreeBSD is pthreads. # The default implementation strategy for FreeBSD is pthreads.
--- a/a/nss/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 diff -ru a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
+++ b/b/nss/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 --- a/a/nss/coreconf/Linux.mk 2014-09-29 16:46:38.189421588 +0100
@@ -46,8 +46,11 @@ +++ b/b/nss/coreconf/Linux.mk 2014-09-29 16:47:42.985012235 +0100
@@ -16,8 +16,11 @@
IMPL_STRATEGY = _PTH IMPL_STRATEGY = _PTH
endif endif
...@@ -35,7 +89,7 @@ ...@@ -35,7 +89,7 @@
RANLIB = ranlib RANLIB = ranlib
DEFAULT_COMPILER = gcc DEFAULT_COMPILER = gcc
@@ -147,7 +150,7 @@ @@ -145,7 +148,7 @@
# incorrectly reports undefined references in the libraries we link with, so # incorrectly reports undefined references in the libraries we link with, so
# we don't use -z defs there. # we don't use -z defs there.
ZDEFS_FLAG = -Wl,-z,defs ZDEFS_FLAG = -Wl,-z,defs
...@@ -44,7 +98,7 @@ ...@@ -44,7 +98,7 @@
LDFLAGS += $(ARCHFLAG) LDFLAGS += $(ARCHFLAG)
# On Maemo, we need to use the -rpath-link flag for even the standard system # 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
endif endif
...@@ -58,9 +112,22 @@ ...@@ -58,9 +112,22 @@
# The -rpath '$$ORIGIN' linker option instructs this library to search for its # The -rpath '$$ORIGIN' linker option instructs this library to search for its
# dependencies in the same directory where it resides. # dependencies in the same directory where it resides.
--- a/a/nss/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 diff -ru a/nss/coreconf/rules.mk b/nss/coreconf/rules.mk
+++ b/b/nss/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 --- a/a/nss/coreconf/rules.mk 2014-09-29 16:46:38.188421578 +0100
@@ -89,8 +89,12 @@ +++ 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 # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
endif endif
else else
...@@ -75,71 +142,12 @@ ...@@ -75,71 +142,12 @@
ASFLAGS += -Wa,-P ASFLAGS += -Wa,-P
OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
ifndef BUILD_OPT ifndef BUILD_OPT
--- a/a/nss/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 diff -ru a/nss/Makefile b/nss/Makefile
+++ b/b/nss/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 --- a/a/nss/Makefile 2014-09-29 16:46:38.171421425 +0100
@@ -324,10 +324,15 @@ +++ b/b/nss/Makefile 2014-09-29 16:47:42.987012253 +0100
# 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
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+export AR +export AR
+export RANLIB +export RANLIB
#! gmake #! gmake
# #
# This Source Code Form is subject to the terms of the Mozilla Public # 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
external/nss/nss_macosx.patch
Dosyayı görüntüle @ 726172e3
--- a/a/nss/Makefile diff -ru a/nspr/configure b/nspr/configure
+++ b/b/nss/Makefile --- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
@@ -69,6 +69,9 @@ +++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100
ifeq ($(OS_TARGET),WIN95) @@ -6568,7 +6568,9 @@
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 @@
;; ;;
esac esac
if test "`echo $CC | grep -c '\-arch '`" = "0"; then if test "`echo $CC | grep -c '\-arch '`" = "0"; then
...@@ -21,11 +10,21 @@ ...@@ -21,11 +10,21 @@
+ CC="$CC -arch $CPU_ARCH" + CC="$CC -arch $CPU_ARCH"
+ fi + fi
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 DSO_CFLAGS=-fPIC
--- a/a/nspr/configure - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
+++ b/b/nspr/configure + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names'
@@ -3864,7 +3864,9 @@ _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 esac
if test "`echo $CC | grep -c '\-arch '`" = "0"; then if test "`echo $CC | grep -c '\-arch '`" = "0"; then
...@@ -34,19 +33,11 @@ ...@@ -34,19 +33,11 @@
+ CC="$CC -arch $CPU_ARCH" + CC="$CC -arch $CPU_ARCH"
+ fi + fi
fi fi
ac_safe=`echo "crt_externs.h" | sed 'y%./+-%__p_%'` AC_CHECK_HEADER(crt_externs.h)
echo $ac_n "checking for crt_externs.h""... $ac_c" 1>&6
@@ -3900,7 +3902,7 @@
fi
DSO_CFLAGS=-fPIC DSO_CFLAGS=-fPIC
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names' diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names' --- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100
_OPTIMIZE_FLAGS=-O2 +++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
STRIP="$STRIP -x -S"
--- a/a/nss/coreconf/Darwin.mk
+++ b/b/nss/coreconf/Darwin.mk
@@ -7,8 +7,12 @@ @@ -7,8 +7,12 @@
DEFAULT_COMPILER = gcc DEFAULT_COMPILER = gcc
...@@ -110,3 +101,16 @@ ...@@ -110,3 +101,16 @@
MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
DLL_SUFFIX = dylib 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
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