[Android] buildsystem: disable sqlite3 binary during make

[Steve Lhomme]

vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Sep  4 15:20:21 2024 +0200| [e30d08b4c039a8717b2d50a29f8a384583edbea9] | committer: Duncan McNamara

buildsystem: disable sqlite3 binary during make

This is how it's done in VLC without patching:
https://code.videolan.org/videolan/vlc/-/commit/38e96f275ebbfb646c25b2f4866f789c1fa43ce5

No need to autoreconf anymore.

> https://code.videolan.org/videolan/vlc-android/commit/e30d08b4c039a8717b2d50a29f8a384583edbea9
---

 buildsystem/compile-medialibrary.sh              |  6 ++---
 buildsystem/patches/sqlite/sqlite-no-shell.patch | 31 ------------------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index 6342380173..b599b41643 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -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}
diff --git a/buildsystem/patches/sqlite/sqlite-no-shell.patch b/buildsystem/patches/sqlite/sqlite-no-shell.patch
deleted file mode 100644
index 1277061c79..0000000000
--- a/buildsystem/patches/sqlite/sqlite-no-shell.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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@