nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests 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-13 02:10:11 -05:00
parent 0e82998eec
commit e991ec6e9e
7 changed files with 10 additions and 6 deletions
repo.diff.show_diff_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 #elifdef XP_OS2
@BINPATH@/plugins/npnulos2.dll @BINPATH@/plugins/npnulos2.dll
#endif #endif
@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
@BINPATH@/README.txt @BINPATH@/README.txt
@BINPATH@/LICENSE @BINPATH@/LICENSE
@BINPATH@/blocklist.xml @BINPATH@/blocklist.xml

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

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

2
configure.in
View file

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

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

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

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

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

3
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 += NO_MDUPDATE=1
DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
DEFAULT_GMAKE_FLAGS += IMPORT_LIB_SUFFIX=".$(IMPORT_LIB_SUFFIX)" 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 ifdef NSS_DISABLE_DBM
DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
endif endif

2
xpcom/stub/Makefile.in
View file

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