diff options
Diffstat (limited to 'security/nss/files')
| -rw-r--r-- | security/nss/files/patch-..::coreconf::FreeBSD.mk | 38 | ||||
| -rw-r--r-- | security/nss/files/sqlite3-builtin.patch | 6 |
2 files changed, 22 insertions, 22 deletions
diff --git a/security/nss/files/patch-..::coreconf::FreeBSD.mk b/security/nss/files/patch-..::coreconf::FreeBSD.mk index 4c2afa5e5489..7722e4a95f9d 100644 --- a/security/nss/files/patch-..::coreconf::FreeBSD.mk +++ b/security/nss/files/patch-..::coreconf::FreeBSD.mk @@ -1,6 +1,6 @@ ---- ../../security/coreconf/FreeBSD.mk.orig 2008-07-12 07:28:59.000000000 -0700 -+++ ../../security/coreconf/FreeBSD.mk 2009-11-19 19:29:23.000000000 -0800 -@@ -37,16 +37,33 @@ +--- ../../security/coreconf/FreeBSD.mk.orig 2009-08-22 07:33:09.000000000 +0200 ++++ ../../security/coreconf/FreeBSD.mk 2010-03-28 23:01:33.000000000 +0200 +@@ -37,9 +37,9 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk @@ -12,32 +12,32 @@ +CCC = $(CXX) RANLIB = ranlib - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else + CPU_ARCH = $(OS_TEST) +@@ -50,7 +50,22 @@ + CPU_ARCH = x86 + endif + ifeq ($(CPU_ARCH),amd64) +-CPU_ARCH = x86_64 ++CPU_ARCH = amd64 ++USE_64 = 1 ++endif ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++endif +ifeq ($(OS_TEST),powerpc) +CPU_ARCH = powerpc -+else ++endif +ifeq ($(OS_TEST),sparc64) +CPU_ARCH = sparc64 +USE_64 = 1 -+else ++endif +ifeq ($(OS_TEST),ia64) +CPU_ARCH = ia64 +USE_64 = 1 -+else -+ifeq ($(OS_TEST),amd64) -+USE_64 = 1 -+endif - CPU_ARCH = x86 endif -+endif -+endif -+endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -60,20 +77,18 @@ +@@ -65,20 +80,18 @@ USE_PTHREADS = 1 DEFINES += -D_THREAD_SAFE -D_REENTRANT OS_LIBS += -pthread @@ -63,7 +63,7 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -82,4 +97,5 @@ +@@ -87,4 +100,5 @@ G++INCLUDES = -I/usr/include/g++ diff --git a/security/nss/files/sqlite3-builtin.patch b/security/nss/files/sqlite3-builtin.patch index 29bd152dfa6e..80a65db348c8 100644 --- a/security/nss/files/sqlite3-builtin.patch +++ b/security/nss/files/sqlite3-builtin.patch @@ -18,8 +18,8 @@ $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ ---- lib/sqlite/manifest.mn.orig 2009-08-31 17:54:32.000000000 +0200 -+++ lib/sqlite/manifest.mn 2009-08-31 17:54:44.000000000 +0200 +--- lib/sqlite/manifest.mn.orig 2010-01-09 06:04:37.000000000 +0100 ++++ lib/sqlite/manifest.mn 2010-03-28 22:52:27.000000000 +0200 @@ -38,9 +38,9 @@ MODULE = nss @@ -29,7 +29,7 @@ LIBRARY_VERSION = 3 -MAPFILE = $(OBJDIR)/sqlite.def +MAPFILE = $(OBJDIR)/nsssqlite.def - DEFINES += -DTHREADSAFE=1 + DEFINES += -DSQLITE_THREADSAFE=1 EXPORTS = \ --- lib/softoken/config.mk.orig 2009-08-31 17:55:03.000000000 +0200 |