RepositoryExternal.mk | 2 ++ external/python3/ExternalProject_python3.mk | 2 +- external/sqlite3/Module_sqlite3.mk | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit e4421ce01df12b4630c4244c8357e2b2147a52e3 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Nov 10 22:35:22 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Nov 11 10:40:34 2025 +0100 sqlite3: don't create a static library on Windows sqlite3 is later compiled on Windows by sqlite3.vcxproj Change-Id: I77662cb5add82e812e2523a89a3d44b3ae05e095 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193772 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 57946597d5f6..7ced885056f9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -146,6 +146,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ )) endif +ifneq ($(OS),WNT) ifneq ($(filter SQLITE3,$(BUILD_TYPE)),) ifneq ($(SYSTEM_SQLITE3),) @@ -185,6 +186,7 @@ endef endif # SYSTEM_SQLITE3 endif # SQLITE3 +endif # !WNT ifeq (SANE,$(filter SANE,$(BUILD_TYPE))) diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 97bc6b787abc..20754553b443 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 \ - $(call gb_Helper_optional,SQLITE3,sqlite3) \ + $(if $(filter LINUX,$(OS)),$(call gb_Helper_optional,SQLITE3,sqlite3)) \ zlib \ )) diff --git a/external/sqlite3/Module_sqlite3.mk b/external/sqlite3/Module_sqlite3.mk index 03c1db345806..9b471834c2ac 100644 --- a/external/sqlite3/Module_sqlite3.mk +++ b/external/sqlite3/Module_sqlite3.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,sqlite3)) $(eval $(call gb_Module_add_targets,sqlite3,\ - StaticLibrary_sqlite3 \ + $(if $(filter LINUX,$(OS)),StaticLibrary_sqlite3) \ UnpackedTarball_sqlite3 \ ))
