9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bandb: remove embedded sqlite

Browse source
This commit is contained in:
Doug Freed 2020-11-23 03:12:36 +00:00
parent 11f8fd4526
commit 31f9d9b2f3
5 changed files with 5 additions and 198027 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -48,8 +48,8 @@ cache:
script: script:
- bash autogen.sh - bash autogen.sh
- "if [ ${TRAVIS_OS_NAME} != 'osx' ]; then CFLAGS=\"-Werror -Wno-unused-value -Wno-unused-parameter\" ./configure --with-shared-sqlite --enable-assert=hard --enable-warnings; fi" - "if [ ${TRAVIS_OS_NAME} != 'osx' ]; then CFLAGS=\"-Werror -Wno-unused-value -Wno-unused-parameter\" ./configure --enable-assert=hard --enable-warnings; fi"
- "if [ ${TRAVIS_OS_NAME} = 'osx' ]; then ./configure --with-shared-sqlite; fi" - "if [ ${TRAVIS_OS_NAME} = 'osx' ]; then ./configure; fi"
- make -j4 - make -j4
- "if [ ${TRAVIS_OS_NAME} != 'osx' ]; then make check; fi" - "if [ ${TRAVIS_OS_NAME} != 'osx' ]; then make check; fi"
- make install - make install

9
bandb/Makefile.am
View file

@ -3,14 +3,9 @@ bin_PROGRAMS = solanum-bantool
AM_CFLAGS=$(WARNFLAGS) AM_CFLAGS=$(WARNFLAGS)
AM_CPPFLAGS = -I../include -I../librb/include @SQLITE_INCLUDES@ AM_CPPFLAGS = -I../include -I../librb/include @SQLITE_INCLUDES@
AM_CPPFLAGS += -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
bandb_SOURCES = bandb.c rsdb_sqlite3.c rsdb_snprintf.c bandb_SOURCES = bandb.c rsdb_sqlite3.c rsdb_snprintf.c
EXTRA_bandb_SOURCES = sqlite3.c bandb_LDADD = ../librb/src/librb.la @SQLITE_LD@
bandb_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
bandb_DEPENDENCIES = @SQLITE_OBJ@
solanum_bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.c solanum_bantool_SOURCES = bantool.c rsdb_sqlite3.c rsdb_snprintf.c
EXTRA_solanum_bantool_SOURCES = sqlite3.c solanum_bantool_LDADD = ../librb/src/librb.la @SQLITE_LD@
solanum_bantool_LDADD = ../librb/src/librb.la @SQLITE_LD@ @SQLITE_OBJ@
solanum_bantool_DEPENDENCIES = @SQLITE_OBJ@

189270
bandb/sqlite3.c
View file

File diff suppressed because it is too large Load diff

8733
bandb/sqlite3.h
View file

File diff suppressed because it is too large Load diff

16
configure.ac
View file

@ -384,24 +384,10 @@ fi
dnl Check for shared sqlite dnl Check for shared sqlite
dnl ====================== dnl ======================
AC_ARG_WITH(shared-sqlite, PKG_CHECK_MODULES(SQLITE, [sqlite3], [], AC_ERROR([sqlite3 is required]))
AC_HELP_STRING([--with-shared-sqlite],[Use shared sqlite]),
[shared_sqlite=$withval],[shared_sqlite=no])
if test "$shared_sqlite" = yes; then
PKG_CHECK_MODULES(SQLITE, [sqlite3],
[
shared_sqlite=yes
], shared_sqlite=no)
fi
if test "$shared_sqlite" = no; then
SQLITE_OBJ='sqlite3.$(OBJEXT)'
fi
AC_SUBST(SQLITE_LD, "$SQLITE_LIBS") AC_SUBST(SQLITE_LD, "$SQLITE_LIBS")
AC_SUBST(SQLITE_INCLUDES, "$SQLITE_CFLAGS") AC_SUBST(SQLITE_INCLUDES, "$SQLITE_CFLAGS")
AC_SUBST(SQLITE_OBJ)
dnl ********************************************************************** dnl **********************************************************************
dnl Check for --with-confdir [deprecated, use --sysconfdir instead] dnl Check for --with-confdir [deprecated, use --sysconfdir instead]