RepositoryExternal.mk | 4 ++-- config_host.mk.in | 1 - configure.ac | 5 +---- external/Module_external.mk | 2 +- external/python3/ExternalProject_python3.mk | 2 +- external/sqlite3/UnpackedTarball_sqlite3.mk | 2 -- 6 files changed, 5 insertions(+), 11 deletions(-)
New commits: commit 71d738ed1434c908c94469ad27d778c00901db86 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Nov 3 14:20:12 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Nov 3 17:15:50 2025 +0100 some janitorial work after commit f98ce0f91b9d1a71d224390847d3d7f80df631fa Author: Xisco Fauli <[email protected]> Date: Mon Oct 27 14:39:23 2025 +0100 external: Add sqlite3 and commit 1dfb0c99365857a32c5a8bb613882ffa656a207a Author: Xisco Fauli <[email protected]> Date: Tue Sep 23 13:17:41 2025 +0200 tdf#168512: python3: bundle sqlite3 Based on https://gerrit.libreoffice.org/c/core/+/193225/comments/b7f0a403_822adc42 Change-Id: I82f9dd6b9238df94b5c4619d003f67871885945c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193351 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8d3077e69a4c..c71d534a6211 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -146,7 +146,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ )) endif -ifneq ($(ENABLE_SQLITE3),) +ifneq ($(filter SQLITE3,$(BUILD_TYPE)),) ifneq ($(SYSTEM_SQLITE3),) define gb_LinkTarget__use_sqlite3_impl @@ -184,7 +184,7 @@ $(call gb_ExternalProject_use_static_libraries,$(1),sqlite3) endef endif # SYSTEM_SQLITE3 -endif # ENABLE_SQLITE3 +endif # SQLITE3 ifeq (SANE,$(filter SANE,$(BUILD_TYPE))) diff --git a/config_host.mk.in b/config_host.mk.in index d5c46192c5f1..72c3f6c6038f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -250,7 +250,6 @@ export ENABLE_CUSTOMTARGET_COMPONENTS=@ENABLE_CUSTOMTARGET_COMPONENTS@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@ export ENABLE_SKIA=@ENABLE_SKIA@ export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@ -export ENABLE_SQLITE3=@ENABLE_SQLITE3@ export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@ export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP_ACCESSIBILITY@ diff --git a/configure.ac b/configure.ac index d97666e32610..60ca6bd52f5a 100644 --- a/configure.ac +++ b/configure.ac @@ -6337,7 +6337,6 @@ if test "$cross_compiling" = "yes"; then REPORTBUILDER SCRIPTING SKIA - SQLITE3 ZLIB ZSTD ZXCVBN @@ -14481,12 +14480,10 @@ AC_SUBST(BZIP2_LIBS) dnl =================================================================== dnl Test whether we need sqlite3 dnl =================================================================== -ENABLE_SQLITE3= if test "$_os" != "Darwin" -a $enable_python = internal; then - ENABLE_SQLITE3="TRUE" + BUILD_TYPE="$BUILD_TYPE SQLITE3" libo_CHECK_SYSTEM_MODULE([sqlite3], [SQLITE3], [sqlite3]) fi -AC_SUBST(ENABLE_SQLITE3) dnl =================================================================== dnl Test whether to enable extension update diff --git a/external/Module_external.mk b/external/Module_external.mk index 0bd6a99993d3..8884e375c6b1 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -96,7 +96,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,REVENGE,librevenge) \ $(call gb_Helper_optional,RHINO,rhino) \ $(call gb_Helper_optional,SKIA,skia) \ - $(if $(ENABLE_SQLITE3),sqlite3) \ + $(call gb_Helper_optional,SQLITE3,sqlite3) \ $(call gb_Helper_optional,STAROFFICE,libstaroffice) \ $(if $(filter WNT,$(OS)),twain_dsm) \ $(call gb_Helper_optional,VISIO,libvisio) \ diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 6175e7a7efb5..97bc6b787abc 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -14,7 +14,7 @@ $(eval $(call gb_ExternalProject_use_externals,python3,\ expat \ $(if $(filter WNT LINUX,$(OS)),libffi) \ openssl \ - $(if $(ENABLE_SQLITE3),sqlite3) \ + $(call gb_Helper_optional,SQLITE3,sqlite3) \ zlib \ )) diff --git a/external/sqlite3/UnpackedTarball_sqlite3.mk b/external/sqlite3/UnpackedTarball_sqlite3.mk index ccbeb78ef203..00ed0bf6ade3 100644 --- a/external/sqlite3/UnpackedTarball_sqlite3.mk +++ b/external/sqlite3/UnpackedTarball_sqlite3.mk @@ -11,6 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,sqlite3)) $(eval $(call gb_UnpackedTarball_set_tarball,sqlite3,$(SQLITE3_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,sqlite3,0)) - # vim: set noet sw=4 ts=4:
