Search
j0ke.net Open Build Service
>
Projects
>
mozilla
>
mozilla-nss
> nss-sqlitename.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File nss-sqlitename.patch of Package mozilla-nss
Index: security/nss/cmd/platlibs.mk =================================================================== RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v retrieving revision 1.55 diff -u -p -6 -r1.55 platlibs.mk --- security/nss/cmd/platlibs.mk 12 Oct 2007 01:44:40 -0000 1.55 +++ security/nss/cmd/platlibs.mk 23 Jan 2008 08:25:42 -0000 @@ -69,13 +69,17 @@ EXTRA_SHARED_LIBS += \ else EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib' endif endif endif +ifdef NSS_USE_SYSTEM_SQLITE SQLITE=-lsqlite3 +else +SQLITE=-lnsssqlite3 +endif ifdef USE_STATIC_LIBS # can't do this in manifest.mn because OS_ARCH isn't defined there. ifeq ($(OS_ARCH), WINNT) Index: security/nss/lib/sqlite/manifest.mn =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/sqlite/manifest.mn,v retrieving revision 1.3 diff -u -p -6 -r1.3 manifest.mn --- security/nss/lib/sqlite/manifest.mn 15 Aug 2007 15:30:05 -0000 1.3 +++ security/nss/lib/sqlite/manifest.mn 23 Jan 2008 08:39:29 -0000 @@ -35,15 +35,16 @@ # # ***** END LICENSE BLOCK ***** CORE_DEPTH = ../../.. MODULE = nss -LIBRARY_NAME = sqlite +LIBRARY_NAME = nsssqlite LIBRARY_VERSION = 3 MAPFILE = $(OBJDIR)/sqlite.def +MAPFILE_SOURCE = sqlite.def DEFINES += -DTHREADSAFE=1 EXPORTS = \ $(NULL) PRIVATE_EXPORTS = \ Index: security/nss/lib/softoken/config.mk =================================================================== RCS file: /cvsroot/mozilla/security/nss/lib/softoken/config.mk,v retrieving revision 1.23 diff -u -p -r1.23 config.mk --- security/nss/lib/softoken/config.mk 5 Feb 2008 05:33:37 -0000 1.23 +++ security/nss/lib/softoken/config.mk 19 Feb 2008 11:50:02 -0000 @@ -86,12 +86,16 @@ else EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ -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)
