Skip to content
Snippets Groups Projects
Commit e30d08b4 authored by Steve Lhomme's avatar Steve Lhomme Committed by Duncan McNamara
Browse files

buildsystem: disable sqlite3 binary during make

This is how it's done in VLC without patching:
vlc@38e96f27

No need to autoreconf anymore.
parent 1aaa4ef9
No related branches found
No related tags found
1 merge request!1980Aar release 3.6.0-eap13, 4.0.0-eap16, 0.13.13-rc13, and 0.13.13-vlc4-rc13
......@@ -60,9 +60,7 @@ if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}" ]; then
tar -xozf ${SQLITE_RELEASE}.tar.gz
rm -f ${SQLITE_RELEASE}.tar.gz
cd ${SQLITE_RELEASE}
patch -p1 < ${SRC_DIR}/buildsystem/patches/sqlite/sqlite-no-shell.patch
patch -p1 < ${SRC_DIR}/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
autoreconf -vif
fi
cd ${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}
if [ ! -d "build-$ANDROID_ABI" ]; then
......@@ -82,10 +80,10 @@ if [ ! -e ./config.status -o "$RELEASE" = "1" ]; then
CXX="${CROSS_CLANG}++"
fi
make $MAKEFLAGS
make $MAKEFLAGS bin_PROGRAMS=
avlc_checkfail "sqlite build failed"
make install
make bin_PROGRAMS= install
avlc_checkfail "sqlite installation failed"
cd ${SRC_DIR}
......
--- sqlite/configure.ac.noshell 2020-04-09 10:07:14.127078500 +0200
+++ sqlite/configure.ac 2020-04-09 10:03:50.435193500 +0200
@@ -203,6 +203,16 @@ fi
AC_SUBST(EXTRA_SHELL_OBJ)
#-----------------------------------------------------------------------
+#-----------------------------------------------------------------------
+# --disable-shell
+#
+AC_ARG_ENABLE(shell, [AS_HELP_STRING(
+ [--enable-shell],
+ [build the shell tool [default=yes]])],
+ [], [enable_shell=yes])
+AM_CONDITIONAL([BUILD_SHELL], [test x"$enable_shell" = "xyes"])
+#-----------------------------------------------------------------------
+
AC_CHECK_FUNCS(posix_fallocate)
AC_CHECK_HEADERS(zlib.h,[
AC_SEARCH_LIBS(deflate,z,[BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_HAVE_ZLIB"])
--- sqlite/Makefile.am.noshell 2020-04-09 10:07:10.055569100 +0200
+++ sqlite/Makefile.am 2020-04-09 10:04:00.028577700 +0200
@@ -4,7 +4,9 @@ lib_LTLIBRARIES = libsqlite3.la
libsqlite3_la_SOURCES = sqlite3.c
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
+if BUILD_SHELL
bin_PROGRAMS = sqlite3
+endif
sqlite3_SOURCES = shell.c sqlite3.h
EXTRA_sqlite3_SOURCES = sqlite3.c
sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment