external_deps.lst | 7 - nss/makefile.mk | 8 - nss/nspr-4.8.4-clang.patch | 194 -------------------------------- nss/nss.patch | 96 ++++++--------- nss/nss.patch.mingw | 64 +++------- nss/nss_linux.patch | 43 +------ nss/nss_macosx.patch | 21 ++- nss/readme.txt | 14 +- solenv/bin/modules/installer/control.pm | 2 9 files changed, 106 insertions(+), 343 deletions(-)
New commits: commit c2a4fb6bc7a55ef268633761ebf0aa7edab8c711 Author: Herbert Dürr <[email protected]> Date: Thu Nov 7 13:40:56 2013 +0000 #i123637# remove the now unused nspr-4.8.4-clang.patch diff --git a/nss/nspr-4.8.4-clang.patch b/nss/nspr-4.8.4-clang.patch deleted file mode 100644 index 974ec68..0000000 --- a/nss/nspr-4.8.4-clang.patch +++ /dev/null @@ -1,194 +0,0 @@ ---- misc/nss-3.12.6/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2006-12-11 10:45:30.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86.s 2013-03-28 17:11:50.919079879 +0100 -@@ -1,4 +1,4 @@ --/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- - / - / ***** BEGIN LICENSE BLOCK ***** - / Version: MPL 1.1/GPL 2.0/LGPL 2.1 -@@ -40,7 +40,8 @@ - / - / Atomically increment the integer pointed to by 'val' and return - / the result of the increment. --/ -+/ */ -+ - .text - .globl _PR_x86_AtomicIncrement - .align 4 -@@ -52,11 +53,11 @@ - incl %eax - ret - --/ PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val) -+/* PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val) - / - / Atomically decrement the integer pointed to by 'val' and return - / the result of the decrement. --/ -+/ */ - .text - .globl _PR_x86_AtomicDecrement - .align 4 -@@ -68,7 +69,7 @@ - decl %eax - ret - --/ PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval) -+/* PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval) - / - / Atomically set the integer pointed to by 'val' to the new - / value 'newval' and return the old value. -@@ -86,7 +87,7 @@ - / cmpxchgl %edx, (%ecx) - / jne retry - / ret --/ -+/ */ - .text - .globl _PR_x86_AtomicSet - .align 4 -@@ -96,11 +97,11 @@ - xchgl %eax, (%ecx) - ret - --/ PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val) -+/* PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val) - / - / Atomically add 'val' to the integer pointed to by 'ptr' - / and return the result of the addition. --/ -+/ */ - .text - .globl _PR_x86_AtomicAdd - .align 4 -@@ -113,5 +114,5 @@ - addl %edx, %eax - ret - --/ Magic indicating no need for an executable stack -+/* Magic indicating no need for an executable stack */ - .section .note.GNU-stack, "", @progbits ; .previous ---- misc/nss-3.12.6/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2006-12-11 10:45:30.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/md/unix/os_Linux_x86_64.s 2013-03-28 17:12:00.215016941 +0100 -@@ -1,4 +1,4 @@ --/ -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- - / - / ***** BEGIN LICENSE BLOCK ***** - / Version: MPL 1.1/GPL 2.0/LGPL 2.1 -@@ -40,7 +40,8 @@ - / - / Atomically increment the integer pointed to by 'val' and return - / the result of the increment. --/ -+/ */ -+ - .text - .globl _PR_x86_64_AtomicIncrement - .align 4 -@@ -51,11 +52,11 @@ - incl %eax - ret - --/ PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val) -+/* PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val) - / - / Atomically decrement the integer pointed to by 'val' and return - / the result of the decrement. --/ -+/ */ - .text - .globl _PR_x86_64_AtomicDecrement - .align 4 -@@ -66,11 +67,11 @@ - decl %eax - ret - --/ PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval) -+/* PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval) - / - / Atomically set the integer pointed to by 'val' to the new - / value 'newval' and return the old value. --/ -+/ */ - .text - .globl _PR_x86_64_AtomicSet - .align 4 -@@ -79,11 +80,11 @@ - xchgl %eax, (%rdi) - ret - --/ PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val) -+/* PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val) - / - / Atomically add 'val' to the integer pointed to by 'ptr' - / and return the result of the addition. --/ -+/ */ - .text - .globl _PR_x86_64_AtomicAdd - .align 4 -@@ -94,5 +95,5 @@ - addl %esi, %eax - ret - --/ Magic indicating no need for an executable stack -+/* Magic indicating no need for an executable stack */ - .section .note.GNU-stack, "", @progbits ; .previous ---- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/mpi/mp_comba.c 2008-03-09 07:06:27.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/mpi/mp_comba.c 2013-03-28 17:17:58.895379167 +0100 -@@ -49,7 +49,7 @@ - "addq %%rax,%0 \n\t" \ - "adcq %%rdx,%1 \n\t" \ - "adcq $0,%2 \n\t" \ -- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","%cc"); -+ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx"); - - - -@@ -76,7 +76,7 @@ - "addq %%rax,%0 \n\t" \ - "adcq %%rdx,%1 \n\t" \ - "adcq $0,%2 \n\t" \ -- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","%cc"); -+ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx"); - - #define SQRADD2(i, j) \ - __asm__ ( \ -@@ -88,7 +88,7 @@ - "addq %%rax,%0 \n\t" \ - "adcq %%rdx,%1 \n\t" \ - "adcq $0,%2 \n\t" \ -- :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx","%cc"); -+ :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j) :"%rax","%rdx"); - - #define SQRADDSC(i, j) \ - __asm__ ( \ -@@ -97,7 +97,7 @@ - "movq %%rax,%0 \n\t" \ - "movq %%rdx,%1 \n\t" \ - "xorq %2,%2 \n\t" \ -- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "g"(i), "g"(j) :"%rax","%rdx","%cc"); -+ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "g"(i), "g"(j) :"%rax","%rdx"); - - #define SQRADDAC(i, j) \ - __asm__ ( \ -@@ -106,7 +106,7 @@ - "addq %%rax,%0 \n\t" \ - "adcq %%rdx,%1 \n\t" \ - "adcq $0,%2 \n\t" \ -- :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","%cc"); -+ :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx"); - - #define SQRADDDB \ - __asm__ ( \ -@@ -116,7 +116,7 @@ - "addq %6,%0 \n\t" \ - "adcq %7,%1 \n\t" \ - "adcq %8,%2 \n\t" \ -- :"=&r"(c0), "=&r"(c1), "=&r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc"); -+ :"=&r"(c0), "=&r"(c1), "=&r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2)); - - - commit b7a25449d30ad88b4c84e035b344f38c2ffd54cc Author: Herbert Dürr <[email protected]> Date: Thu Nov 7 13:35:53 2013 +0000 #i123637# updated the nss_linux.patch for nss-3.14.4 diff --git a/nss/nss_linux.patch b/nss/nss_linux.patch index 98f9cf7..80dd2294c 100644 --- a/nss/nss_linux.patch +++ b/nss/nss_linux.patch @@ -1,22 +1,11 @@ -diff -uNrp misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk ---- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2011-12-14 14:06:50.112354384 -0300 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2011-12-14 14:07:30.978358265 -0300 -@@ -174,3 +174,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr - endif - endif +--- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:28.195966851 +0100 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:10.246610849 +0100 +@@ -131,7 +131,7 @@ + # -ansi on platforms like Android where the system headers are C99 and do + # not build with -ansi. + STANDARDS_CFLAGS = -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE +-OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR ++OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR -DHAVE_UNISTD_H + OS_LIBS = $(OS_PTHREAD) -ldl -lc -+OS_REL_CFLAGS += -DLINUX2_1 -+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH) -+ -+ifdef MAPFILE -+ MKSHLIB += -Wl,--version-script,$(MAPFILE) -+endif -+PROCESS_MAP_FILE = grep -v ';-' $< | \ -+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ -+ -+ifeq ($(OS_RELEASE),2.4) -+# Softoken 3.13 uses NO_FORK_CHECK only. -+# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK. -+# Don't use NO_CHECK_FORK in new code. -+DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK -+endif + ifdef USE_PTHREADS commit fd9cb0195429b116874064acbfa9641c12ea811d Author: Herbert Dürr <[email protected]> Date: Thu Nov 7 13:32:21 2013 +0000 #i123637# nss-3.14 has fixed the assembler-problems that stopped clang diff --git a/nss/makefile.mk b/nss/makefile.mk index b9390b0..cf8b7b1 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -89,7 +89,7 @@ BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# && moz#513024# .IF "$(OS)"=="LINUX" BUILD_ACTION+=FREEBL_NO_DEPEND=1 -PATCH_FILES+=nss_linux.patch nspr-4.8.4-clang.patch +PATCH_FILES+=nss_linux.patch .ENDIF .ENDIF # "$(GUI)"=="UNX" commit b6a7e1940929c557bfbddb2bc8dbd5588d6df329 Author: Herbert Dürr <[email protected]> Date: Thu Nov 7 13:30:35 2013 +0000 #i123637# fix nss build for OSX<10.5 targets on newer OSX hosts change the check from host OS version to the OSX deployment target diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch index 4b13e4c..3fdf020 100644 --- a/nss/nss_macosx.patch +++ b/nss/nss_macosx.patch @@ -10,3 +10,18 @@ ifdef USE_DEBUG_RTL NSPR_CONFIGURE_OPTS += --enable-debug-rtl endif +--- misc/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2012-12-12 13:30:51.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2013-10-31 15:45:49.000000000 +0100 +@@ -39,9 +39,9 @@ + # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5 + # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable + # that code for older versions of Mac OS X. See bug 820374. +-DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.) +-DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true) +-ifeq ($(DARWIN_LT_9),true) ++OSX_TARGET_MINOR := $(shell echo $(MACOSX_DEPLOYMENT_TARGET) | cut -f2 -d.) ++OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true) ++ifeq ($(OSX_MINOR_LT_5),true) + OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC + endif # Darwin + endif commit 5429a50ffc37fa214426a74d86d234ebf0991616 Author: Herbert Dürr <[email protected]> Date: Thu Nov 7 13:27:38 2013 +0000 #i123637# update nss libraries to 3.14.4 Patch by: Pedro Giffuni <[email protected]> diff --git a/external_deps.lst b/external_deps.lst index 78b694a..717cf9d 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -305,9 +305,10 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && ENABLE_JAVASCRIPT==YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES) - MD5 = b92261a5679276c400555004937af965 - name = nss-3.12.6-with-nspr-4.8.4.tar.gz - URL1 = $(OOO_EXTRAS)$(MD5)-$(name) + MD5 = 067a04150b1d8b64f7da3019688a7547 + name = nss-3.14.4-with-nspr-4.9.5.tar.gz + URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_4_RTM/src/nss-3.14.4-with-nspr-4.9.5.tar.gz + URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE) MD5 = 24be19595acad0a2cae931af77a0148a diff --git a/nss/makefile.mk b/nss/makefile.mk index 8240082..b9390b0 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -39,9 +39,9 @@ all: .ELSE -TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4 -TARFILE_MD5=b92261a5679276c400555004937af965 -TARFILE_ROOTDIR=nss-3.12.6 +TARFILE_NAME=nss-3.14.4-with-nspr-4.9.5 +TARFILE_MD5=067a04150b1d8b64f7da3019688a7547 +TARFILE_ROOTDIR=nss-3.14.4 PATCH_FILES=nss.patch .IF "$(OS)"=="MACOSX" diff --git a/nss/nss.patch b/nss/nss.patch index b5f871d..604ffd8 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -1,6 +1,6 @@ ---- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 -@@ -345,7 +345,12 @@ +--- misc/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 +@@ -377,7 +377,12 @@ ifdef NS_USE_GCC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -14,9 +14,9 @@ endif # GCC @echo $(RES) finished endif ---- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 -@@ -3900,7 +3900,7 @@ +--- misc/nss-3.14.4/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 +@@ -4443,7 +4443,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC @@ -25,26 +25,27 @@ _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 ---- misc/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 -@@ -39,8 +39,12 @@ +--- misc/nss-3.14.4/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 +@@ -5,10 +5,12 @@ - DEFAULT_COMPILER = cc + include $(CORE_DEPTH)/coreconf/UNIX.mk --CC = cc --CCC = c++ +-DEFAULT_COMPILER = gcc ++DEFAULT_COMPILER = cc ++ +# CC is taken from environment automatically. +#CC = cc -+# Use CCC from environment. -+#CCC = c++ +CCC = $(CXX) -+ + +-CC = gcc +-CCC = g++ RANLIB = ranlib ifndef CPU_ARCH ---- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 -@@ -46,8 +46,11 @@ +--- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 +@@ -16,8 +16,11 @@ IMPL_STRATEGY = _PTH endif @@ -58,7 +59,7 @@ RANLIB = ranlib DEFAULT_COMPILER = gcc -@@ -147,7 +150,7 @@ +@@ -143,7 +146,7 @@ # incorrectly reports undefined references in the libraries we link with, so # we don't use -z defs there. ZDEFS_FLAG = -Wl,-z,defs @@ -66,10 +67,10 @@ +DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN' LDFLAGS += $(ARCHFLAG) - # INCLUDES += -I/usr/include -Y/usr/include/linux -@@ -158,8 +161,13 @@ - # - CPU_TAG = _$(CPU_ARCH) + # On Maemo, we need to use the -rpath-link flag for even the standard system +@@ -174,8 +177,13 @@ + endif + endif +ifeq ($(SYSTEM_ZLIB),YES) +# Currently (3.12.4) only the tools modutil and signtool are linked with libz @@ -81,9 +82,9 @@ # The -rpath '$$ORIGIN' linker option instructs this library to search for its # dependencies in the same directory where it resides. ---- misc/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 -@@ -89,8 +89,12 @@ +--- misc/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 +@@ -48,8 +48,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif else @@ -98,9 +99,9 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- misc/nss-3.12.6/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 -@@ -324,7 +324,12 @@ +--- misc/nss-3.14.4/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 +@@ -302,7 +302,12 @@ # IMPL_STRATEGY may be defined too. # @@ -114,9 +115,9 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) ifndef BUILD_OPT ---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 -@@ -355,7 +355,12 @@ +--- misc/nss-3.14.4/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 +@@ -318,7 +318,12 @@ ifdef NS_USE_GCC $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -130,27 +131,22 @@ endif @echo $(RES) finished endif ---- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 -@@ -41,27 +41,28 @@ +--- misc/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 +@@ -10,17 +10,18 @@ + ifeq ($(OS_ARCH), SunOS) - ifeq ($(BUILD_SUN_PKG), 1) 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 ++#In AOO 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 - else --EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -R '$$ORIGIN' - endif endif ifeq ($(OS_ARCH), Linux) - ifeq ($(BUILD_SUN_PKG), 1) ifeq ($(USE_64), 1) -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' @@ -158,19 +154,11 @@ -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' endif - else - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - endif endif - endif ---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 -@@ -78,10 +78,15 @@ + +--- misc/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 ++++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 +@@ -46,10 +46,15 @@ # sign any and all shared libraries that contain the word freebl diff --git a/nss/nss.patch.mingw b/nss/nss.patch.mingw index 89edd56..bc1375c 100644 --- a/nss/nss.patch.mingw +++ b/nss/nss.patch.mingw @@ -1,5 +1,5 @@ ---- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-04 07:04:23.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2010-06-17 08:42:08.010625000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-04 07:04:23.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/config/autoconf.mk.in 2010-06-17 08:42:08.010625000 +0900 @@ -22,6 +22,7 @@ RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@ OBJDIR_NAME = @OBJDIR_NAME@ @@ -8,8 +8,8 @@ OBJ_SUFFIX = @OBJ_SUFFIX@ LIB_SUFFIX = @LIB_SUFFIX@ DLL_SUFFIX = @DLL_SUFFIX@ ---- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-12-10 06:24:37.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2010-06-17 08:42:08.057500000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/config/rules.mk 2009-12-10 06:24:37.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/config/rules.mk 2010-06-17 08:42:08.057500000 +0900 @@ -113,9 +113,9 @@ # other platforms do not. # @@ -22,8 +22,8 @@ SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb else LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) ---- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-02-09 03:41:35.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-06-17 08:42:10.000000000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/configure 2010-02-09 03:41:35.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/configure 2010-06-17 08:42:10.000000000 +0900 @@ -2770,6 +2770,7 @@ LIB_SUFFIX=a DLL_SUFFIX=so @@ -48,8 +48,8 @@ s%@MKSHLIB@%$MKSHLIB%g s%@DSO_CFLAGS@%$DSO_CFLAGS%g s%@DSO_LDOPTS@%$DSO_LDOPTS%g ---- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-12-19 18:06:07.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-06-17 08:42:08.151250000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in 2009-12-19 18:06:07.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in 2010-06-17 08:42:08.151250000 +0900 @@ -195,7 +195,7 @@ ifeq ($(OS_ARCH),WINNT) @@ -59,8 +59,8 @@ else OS_LIBS = advapi32.lib wsock32.lib winmm.lib endif ---- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 09:15:46.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2010-06-17 08:42:08.198125000 +0900 +--- misc/nss-3.13.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 09:15:46.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/coreconf/WIN32.mk 2010-06-17 08:42:08.198125000 +0900 @@ -43,8 +43,8 @@ DEFAULT_COMPILER = cl @@ -72,8 +72,8 @@ LINK = ld AR = ar AR += cr $@ ---- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 14:51:10.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2010-06-17 08:42:08.245000000 +0900 +--- misc/nss-3.13.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 14:51:10.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/coreconf/WIN95.mk 2010-06-17 08:42:08.245000000 +0900 @@ -44,4 +44,8 @@ DEFINES += -DWIN95 @@ -85,8 +85,8 @@ + NSPR31_LIB_PREFIX = $(NULL) +endif \ No newline at end of file ---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-12-08 10:33:36.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2010-06-17 08:42:08.291875000 +0900 +--- misc/nss-3.13.6/mozilla/security/coreconf/rules.mk 2009-12-08 10:33:36.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/coreconf/rules.mk 2010-06-17 08:42:08.291875000 +0900 @@ -281,8 +281,12 @@ fi endif # MSVC with manifest tool @@ -100,8 +100,8 @@ get_objs: @echo $(OBJS) ---- misc/nss-3.12.6/mozilla/security/nss/Makefile 2009-12-09 01:47:03.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2010-06-17 08:42:08.338750000 +0900 +--- misc/nss-3.13.6/mozilla/security/nss/Makefile 2009-12-09 01:47:03.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/nss/Makefile 2010-06-17 08:42:08.338750000 +0900 @@ -108,7 +108,7 @@ NSPR_CONFIGURE_OPTS += --enable-debug-rtl endif @@ -111,8 +111,8 @@ endif # ---- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 09:17:21.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2010-06-17 08:42:08.370000000 +0900 +--- misc/nss-3.13.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 09:17:21.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/nss/cmd/crmftest/Makefile 2010-06-17 08:42:08.370000000 +0900 @@ -90,7 +90,7 @@ LDDIST = $(DIST)/lib @@ -122,8 +122,8 @@ endif include ../platrules.mk ---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-08 04:06:37.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-17 08:42:10.000000000 +0900 +--- misc/nss-3.13.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-08 04:06:37.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-17 08:42:10.000000000 +0900 @@ -115,10 +115,16 @@ $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) @@ -141,27 +141,3 @@ libs install :: $(CHECKLOC) ---- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-04-12 06:18:42.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2010-06-17 08:42:08.557500000 +0900 -@@ -84,10 +84,6 @@ - RES = $(OBJDIR)/$(LIBRARY_NAME).res - RESNAME = freebl.rc - --ifndef WINCE --OS_LIBS += shell32.lib --endif -- - ifdef NS_USE_GCC - EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib \ -@@ -97,6 +93,10 @@ - -lnspr4 \ - $(NULL) - else # ! NS_USE_GCC -+ifndef WINCE -+OS_LIBS += shell32.lib -+endif -+ - EXTRA_SHARED_LIBS += \ - $(DIST)/lib/nssutil3.lib \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \ diff --git a/nss/nss_linux.patch b/nss/nss_linux.patch index 0464b38..98f9cf7 100644 --- a/nss/nss_linux.patch +++ b/nss/nss_linux.patch @@ -1,19 +1,7 @@ -diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/config.mk misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk ---- misc/nss-3.12.6/mozilla/security/coreconf/config.mk 2009-08-25 19:35:11.000000000 -0300 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk 2011-12-14 14:07:30.979358265 -0300 -@@ -63,7 +63,7 @@ endif - ####################################################################### - - TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ -- AIX RISCOS WINNT WIN95 WINCE -+ AIX RISCOS WINNT WIN95 WINCE Linux - - ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) - include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk -diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk ---- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:06:50.112354384 -0300 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:07:30.978358265 -0300 -@@ -179,3 +179,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr +diff -uNrp misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk +--- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2011-12-14 14:06:50.112354384 -0300 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2011-12-14 14:07:30.978358265 -0300 +@@ -174,3 +174,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr endif endif diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch index 5a02283..4b13e4c 100644 --- a/nss/nss_macosx.patch +++ b/nss/nss_macosx.patch @@ -1,6 +1,6 @@ ---- misc/nss-3.12.6/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 -+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 -@@ -104,6 +104,9 @@ +--- misc/nss-3.14.4/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 ++++ misc/build/nss-3.14.4/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 +@@ -73,6 +73,9 @@ ifeq ($(OS_TARGET),WIN95) NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 endif diff --git a/nss/readme.txt b/nss/readme.txt index df65908..3dbe118 100644 --- a/nss/readme.txt +++ b/nss/readme.txt @@ -1,13 +1,13 @@ Relation between nss, moz, moz_prebuilt --------------------------------------- -nss containes the security libraries which are also part of moz. However nss is -meant to be more current, that is it to be updated more often. This should be -easier than doing this with moz. +nss contains the security libraries which are also part of moz. However nss is +meant to be more current, that is, it to be updated more often. This +should be easier than updating moz. -If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which -is per default set to YES. In this case nss is build before moz. The nss +When nss is build, it depends on an environment variable (ENABLE_NSS_MODULE) +which is by default set to YES. In this case nss is build before moz. The nss libraries/lib files/headers built in moz are then not delivered. Otherwise they -would overwrite those from nss. That is, the nss libraries build in moz are +would overwrite those from nss. The nss libraries build in moz are then removed from mozruntime.zip (build in moz/solver/bin), they are removed from the lib directory (for example moz/unxlngi6.pro/lib), and the nss and nspr headers are also removed (inc/nss and inc/nspr). The nss libraries from the nss module @@ -27,7 +27,7 @@ checksums for the cryptographic module are not delivered into solver and will not be part of the OOo installation sets. Signing has been turned off because -- we change the rpath (install names) after signing which breaks the signatures +- we change the rpath (install names) after signing which breaks the signatures (Mac) - sqlite conflicts with the system sqlite when signing which breaks the build commit 1b536905308599e0bbf8833ab6e0e057c0bdddc5 Author: Andre Fischer <[email protected]> Date: Thu Nov 7 12:58:49 2013 +0000 123595: Added missing .idl extension to exclude from error messages. diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 2974b94..a188073 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -321,7 +321,7 @@ sub filter_log_error ($$$$) # Remove all filenames that contain the word "Error". my $work_string = $message; - $work_string =~ s/Error\.(idt|mlf|ulf|html|hpp|ipp)//g; + $work_string =~ s/Error\.(idt|mlf|ulf|idl|html|hpp|ipp)//g; if ($work_string =~ /\bError\b/i) {
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
