File nss-sqlitename.patch of Package mingw32-mozilla-nss

Overview Repositories Revisions Requests Users Attributes Meta

File nss-sqlitename.patch of Package mingw32-mozilla-nss (Revision 0c99b8a2f07434ed97042a13bf2a9790)

Currently displaying revision 0c99b8a2f07434ed97042a13bf2a9790 , Show latest

--- mozilla/security/nss/cmd/platlibs.mk	2009-06-18 01:01:48.000000000 +0200
+++ mozilla/security/nss/cmd/platlibs.mk	2009-11-11 17:37:26.000000000 +0100
@@ -80,7 +80,11 @@
 endif
 endif
 
+ifdef NSS_USE_SYSTEM_SQLITE
 SQLITE=-lsqlite3
+else
+SQLITE=-lnsssqlite3
+endif
 
 ifdef NSS_DISABLE_DBM
 DBMLIB = $(NULL)
--- mozilla/security/nss/lib/softoken/config.mk	2009-06-11 02:55:48.000000000 +0200
+++ mozilla/security/nss/lib/softoken/config.mk	2009-11-11 17:37:26.000000000 +0100
@@ -83,12 +83,16 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
-	-lsqlite3 \
 	-L$(NSPR_LIB_DIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
+ifdef NSS_USE_SYSTEM_SQLITE
+EXTRA_SHARED_LIBS += -lsqlite3
+else
+EXTRA_SHARED_LIBS += -lnsssqlite3
+endif
 endif
 
 ifeq ($(OS_TARGET),AIX)
--- mozilla/security/nss/lib/sqlite/manifest.mn	2007-08-15 17:30:05.000000000 +0200
+++ mozilla/security/nss/lib/sqlite/manifest.mn	2009-11-11 17:37:26.000000000 +0100
@@ -38,9 +38,10 @@
 
 MODULE = nss
 
-LIBRARY_NAME = sqlite
+LIBRARY_NAME = nsssqlite
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/sqlite.def
+MAPFILE_SOURCE = sqlite.def
 DEFINES += -DTHREADSAFE=1
 
 EXPORTS = \

Places

File nss-sqlitename.patch of Package mingw32-mozilla-nss (Revision 0c99b8a2f07434ed97042a13bf2a9790)

Places