diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2020-06-15 23:59:47 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2020-06-15 23:59:47 -0700 |
| commit | 8f429e0dafc8bdb0a731497a5def1751c7bc7301 (patch) | |
| tree | 398d099793c12402a0c7845ef08f987e327964e5 /config | |
| parent | 0af0100030be9f2569d3dbf5ab746c2b97c009d0 (diff) | |
| download | UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar.gz UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar.lz UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.tar.xz UXP-8f429e0dafc8bdb0a731497a5def1751c7bc7301.zip | |
Revert "Issue #1342 - Remove support for system sqlite"
This reverts commit d41ba28f5257f7c1425a0bde210e69fc5bb34a37.
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/nss/Makefile.in | 6 | ||||
| -rw-r--r-- | config/external/sqlite/moz.build | 22 |
2 files changed, 28 insertions, 0 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 7289e57f4..2a8c9ec82 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -119,9 +119,15 @@ DEFAULT_GMAKE_FLAGS += NSS_ENABLE_TLS_1_3=1 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_1) DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS='-static-libgcc' NSPR31_LIB_PREFIX=lib endif +ifndef MOZ_SYSTEM_SQLITE +ifdef MOZ_FOLD_LIBS +DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=nss3 +else DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3 DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../db/sqlite3/src +endif # MOZ_FOLD_LIBS DEFAULT_GMAKE_FLAGS += SQLITE_INCLUDE_DIR=$(ABS_DIST)/include +endif ifdef NSS_DISABLE_DBM DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 endif diff --git a/config/external/sqlite/moz.build b/config/external/sqlite/moz.build new file mode 100644 index 000000000..76908d902 --- /dev/null +++ b/config/external/sqlite/moz.build @@ -0,0 +1,22 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['MOZ_SYSTEM_SQLITE']: + Library('sqlite') + OS_LIBS += CONFIG['SQLITE_LIBS'] +else: + DIRS += ['../../../db/sqlite3/src'] + if CONFIG['MOZ_FOLD_LIBS']: + Library('sqlite') + # When folding libraries, sqlite is actually in the nss library. + USE_LIBS += [ + 'nss', + ] + else: + SharedLibrary('sqlite') + SHARED_LIBRARY_NAME = 'mozsqlite3' + + SYMBOLS_FILE = '/db/sqlite3/src/sqlite.symbols' |