vlc | branch: master | Steve Lhomme <[email protected]> | Thu Apr 9 10:33:02 2020 +0200| [a2ca9416a7f48a2de2793b5e971ccf862cb5c4e6] | committer: Hugo Beauzée-Luyssen
contrib: sqlite: don't build the shell exe in winstore builds It's using (formerly) forbidden patches and we don't need it. Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a2ca9416a7f48a2de2793b5e971ccf862cb5c4e6 --- contrib/src/sqlite/rules.mak | 4 +++- contrib/src/sqlite/sqlite-no-shell.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/contrib/src/sqlite/rules.mak b/contrib/src/sqlite/rules.mak index e6564abca4..8423408a44 100644 --- a/contrib/src/sqlite/rules.mak +++ b/contrib/src/sqlite/rules.mak @@ -14,7 +14,7 @@ ifdef HAVE_WINSTORE SQLITE_CFLAGS += -DSQLITE_OS_WINRT=1 endif -SQLITE_CONF = $(HOSTCONF) --disable-readline +SQLITE_CONF = $(HOSTCONF) --disable-readline --disable-shell $(TARBALLS)/sqlite-autoconf-$(SQLITE_VERSION).tar.gz: $(call download_pkg,$(SQLITE_URL),sqlite) @@ -23,10 +23,12 @@ $(TARBALLS)/sqlite-autoconf-$(SQLITE_VERSION).tar.gz: sqlite: sqlite-autoconf-$(SQLITE_VERSION).tar.gz .sum-sqlite $(UNPACK) + $(APPLY) $(SRC)/sqlite/sqlite-no-shell.patch $(call pkg_static, "sqlite3.pc.in") $(MOVE) .sqlite: sqlite + $(RECONF) cd $< && $(HOSTVARS) CFLAGS="$(SQLITE_CFLAGS)" ./configure $(SQLITE_CONF) cd $< && $(MAKE) && $(MAKE) install touch $@ diff --git a/contrib/src/sqlite/sqlite-no-shell.patch b/contrib/src/sqlite/sqlite-no-shell.patch new file mode 100644 index 0000000000..1277061c79 --- /dev/null +++ b/contrib/src/sqlite/sqlite-no-shell.patch @@ -0,0 +1,31 @@ +--- 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@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
