[gentoo-commits] gentoo-x86 commit in dev-libs/nss/files: nss-3.14.2-x32.patch nss-3.14.2-solaris-gcc.patch nss-3.14.2-sqlite.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/nss/files: nss-3.14.2-x32.patch nss-3.14.2-solaris-gcc.patch nss-3.14.2-sqlite.patch

[Lars Wendler (polynomial-c)]

polynomial-c    13/02/15 13:30:12

  Added:                nss-3.14.2-x32.patch nss-3.14.2-solaris-gcc.patch
                        nss-3.14.2-sqlite.patch
  Log:
  Version bump
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

Revision  Changes    Path
1.1                  dev-libs/nss/files/nss-3.14.2-x32.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.14.2-x32.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.14.2-x32.patch?rev=1.1&content-type=text/plain

Index: nss-3.14.2-x32.patch
===================================================================
--- nss-3.14.2/mozilla/security/coreconf/Linux.mk
+++ nss-3.14.2/mozilla/security/coreconf/Linux.mk
@@ -50,21 +50,28 @@
 else
 ifeq ($(OS_TEST),alpha)
         OS_REL_CFLAGS   = -D_ALPHA_
 	CPU_ARCH	= alpha
 else
 ifeq ($(OS_TEST),x86_64)
 ifeq ($(USE_64),1)
 	CPU_ARCH	= x86_64
+	ARCHFLAG	= -m64
+else
+ifeq ($(USE_x32),1)
+	OS_REL_CFLAGS	= -Di386
+	CPU_ARCH	= x86
+	ARCHFLAG	= -mx32
 else
 	OS_REL_CFLAGS	= -Di386
 	CPU_ARCH	= x86
 	ARCHFLAG	= -m32
 endif
+endif
 else
 ifeq ($(OS_TEST),sparc64)
 	CPU_ARCH        = sparc
 else
 ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
 	CPU_ARCH        = arm
 else
 ifeq (,$(filter-out parisc%,$(OS_TEST)))
--- nss-3.14.2/mozilla/security/nss/lib/freebl/Makefile
+++ nss-3.14.2/mozilla/security/nss/lib/freebl/Makefile
@@ -188,22 +188,26 @@
     # comment the next two lines to turn off intel HW accelleration
     DEFINES += -DUSE_HW_AES
     ASFILES += intel-aes.s intel-gcm.s
     EXTRA_SRCS += intel-gcm-wrap.c
     INTEL_GCM = 1
     MPI_SRCS += mpi_amd64.c mp_comba.c
 endif
 ifeq ($(CPU_ARCH),x86)
-    ASFILES  = mpi_x86.s
-    DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
-    DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
-    DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
-    # The floating point ECC code doesn't work on Linux x86 (bug 311432).
-    #ECL_USE_FP = 1
+    ifeq ($(USE_x32),1)
+	DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+    else
+	ASFILES  = mpi_x86.s
+	DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
+	DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
+	DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+	# The floating point ECC code doesn't work on Linux x86 (bug 311432).
+	#ECL_USE_FP = 1
+    endif
 endif
 ifeq ($(CPU_ARCH),arm)
     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE 
     DEFINES += -DMP_USE_UINT_DIGIT
     DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512
     MPI_SRCS += mpi_arm.c
 endif
 endif # Linux



1.1                  dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch?rev=1.1&content-type=text/plain

Index: nss-3.14.2-solaris-gcc.patch
===================================================================
--- nss-3.14.2/mozilla/security/coreconf/SunOS5.mk
+++ nss-3.14.2/mozilla/security/coreconf/SunOS5.mk
@@ -5,6 +5,9 @@
 
 include $(CORE_DEPTH)/coreconf/UNIX.mk
 
+NS_USE_GCC = 1
+GCC_USE_GNU_LD = 1
+
 # Sun's WorkShop defines v8, v8plus and v9 architectures.
 # gcc on Solaris defines v8 and v9 "cpus".  
 # gcc's v9 is equivalent to Workshop's v8plus.
@@ -71,11 +74,6 @@
 NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
 
 MKSHLIB  = $(CC) $(DSO_LDOPTS) $(RPATH)
-ifdef NS_USE_GCC
-ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1)))
-	GCC_USE_GNU_LD = 1
-endif
-endif
 ifdef MAPFILE
 ifdef NS_USE_GCC
 ifdef GCC_USE_GNU_LD



1.1                  dev-libs/nss/files/nss-3.14.2-sqlite.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.14.2-sqlite.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/nss/files/nss-3.14.2-sqlite.patch?rev=1.1&content-type=text/plain

Index: nss-3.14.2-sqlite.patch
===================================================================
Index: mozilla/security/nss/lib/softoken/sdb.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sdb.c,v
retrieving revision 1.30
diff -u -u -r1.30 sdb.c
--- mozilla/security/nss/lib/softoken/sdb.c	16 Jan 2013 18:13:25 -0000	1.30
+++ mozilla/security/nss/lib/softoken/sdb.c	4 Feb 2013 19:15:58 -0000
@@ -254,6 +254,10 @@
 #error "sdb_getFallbackTempDir not implemented"
 #endif
 
+#ifndef SQLITE_FCNTL_TEMPFILENAME
+#define SQLITE_FCNTL_TEMPFILENAME 16
+#endif
+
 static char *
 sdb_getTempDir(sqlite3 *sqlDB)
 {