Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-24 13:52:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename sqlite3 library to mozsqlite3, fixes compile problems and crashes on Mac OS X. b=513747 r=sdwilsh

Browse Source
This commit is contained in:
Ted Mielczarek 2009-12-15 01:52:57 -05:00
parent 36e2b6dc94
commit 58a909f898
7 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/installer/package-manifest.in
View File

@ -87,7 +87,7 @@
#elifdef XP_OS2
@BINPATH@/plugins/npnulos2.dll
#endif
@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
@BINPATH@/README.txt
@BINPATH@/LICENSE
@BINPATH@/blocklist.xml

1
browser/installer/removed-files.in
View File

@ -843,4 +843,5 @@ components/brwsrcmp.dll
components/nsUpdateService.js
components/nsUpdateServiceStub.js
#endif
@DLL_PREFIX@sqlite3@DLL_SUFFIX@
old-homepage-default.properties

2
configure.in
View File

@ -6142,7 +6142,7 @@ MOZ_NATIVE_SQLITE= )
if test -z "$MOZ_NATIVE_SQLITE"
then
SQLITE_CFLAGS=
SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)'
else
PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
fi

2
db/sqlite3/src/Makefile.in
View File

@ -46,7 +46,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = sqlite3
LIBRARY_NAME = sqlite3
LIBRARY_NAME = mozsqlite3
FORCE_SHARED_LIB = 1
VISIBILITY_FLAGS =
LIB_IS_C_ONLY = 1

2
db/sqlite3/src/sqlite.def
View File

@ -33,7 +33,7 @@
;
; ***** END LICENSE BLOCK *****
LIBRARY sqlite3.dll
LIBRARY mozsqlite3.dll
EXPORTS
sqlite3_aggregate_context

5
security/manager/Makefile.in
View File

@ -183,6 +183,9 @@ DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
DEFAULT_GMAKE_FLAGS += IMPORT_LIB_SUFFIX=".$(IMPORT_LIB_SUFFIX)"
ifndef MOZ_NATIVE_SQLITE
DEFAULT_GMAKE_FLAGS += SQLITE=$(call EXPAND_LIBNAME,mozsqlite3)
endif
ifdef NSS_DISABLE_DBM
DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
endif
@ -320,7 +323,7 @@ ifndef NSS_DISABLE_DBM
endif
$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
ifdef ENABLE_TESTS
# Need certutil binary for mochitest certificates generation
# Need certutil binary for mochitest certificates generation
$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS)
$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS)

2
xpcom/stub/Makefile.in
View File

@ -83,7 +83,7 @@ DEPENDENT_LIBS_LIST += \
ifdef MOZ_ENABLE_LIBXUL
DEPENDENT_LIBS_LIST += \
$(LIB_PREFIX)sqlite3$(DLL_SUFFIX) \
$(LIB_PREFIX)mozsqlite3$(DLL_SUFFIX) \
$(LIB_PREFIX)nssutil3$(DLL_SUFFIX) \
$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
$(LIB_PREFIX)nss3$(DLL_SUFFIX) \