RepositoryExternal.mk | 2 -- external/lzma/Module_lzma.mk | 2 +- external/lzma/StaticLibrary_lzma.mk | 4 +++- external/python3/ExternalProject_python3.mk | 4 ++-- external/sqlite3/Module_sqlite3.mk | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 27d0c9a3db9fd499622349e5ec9cd4caddcbeb69 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Nov 14 12:40:57 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 14 15:20:30 2025 +0100 build sqlite3 and lzma on Windows anyway and use the same config.h in all platforms. Compiling these libraries only takes a few seconds so no need to exclude Windows here it should also fix the win arm64 build This patch reverts commit e4421ce01df12b4630c4244c8357e2b2147a52e3 Author: Xisco Fauli <[email protected]> Date: Mon Nov 10 22:35:22 2025 +0100 sqlite3: don't create a static library on Windows and part of commit 1cb84d60d991804547cd962eda3a0cd00e958667 Author: Xisco Fauli <[email protected]> Date: Thu Oct 30 20:11:23 2025 +0100 external: add lzma Change-Id: Ia66242d4fef78cf8d99f853db4c9eee2e24c62ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194023 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index cbb47bb0a6e4..616498bc02c5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -146,7 +146,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ )) endif -ifneq ($(OS),WNT) ifneq ($(filter LZMA,$(BUILD_TYPE)),) ifneq ($(SYSTEM_LZMA),) @@ -226,7 +225,6 @@ endef endif # SYSTEM_SQLITE3 endif # SQLITE3 -endif # !WNT ifeq (SANE,$(filter SANE,$(BUILD_TYPE))) diff --git a/external/lzma/Module_lzma.mk b/external/lzma/Module_lzma.mk index 72beb1d10231..759df57eed1e 100644 --- a/external/lzma/Module_lzma.mk +++ b/external/lzma/Module_lzma.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,lzma)) $(eval $(call gb_Module_add_targets,lzma,\ - $(if $(filter-out WNT,$(OS)),StaticLibrary_lzma) \ + StaticLibrary_lzma \ UnpackedTarball_lzma \ )) diff --git a/external/lzma/StaticLibrary_lzma.mk b/external/lzma/StaticLibrary_lzma.mk index d35296cebd05..887f2dc947bc 100644 --- a/external/lzma/StaticLibrary_lzma.mk +++ b/external/lzma/StaticLibrary_lzma.mk @@ -14,6 +14,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,lzma,lzma)) $(eval $(call gb_StaticLibrary_set_warnings_disabled,lzma)) $(eval $(call gb_StaticLibrary_set_include,lzma,\ + -I$(gb_UnpackedTarball_workdir)/lzma/dos \ -I$(gb_UnpackedTarball_workdir)/lzma/src/common \ -I$(gb_UnpackedTarball_workdir)/lzma/src/liblzma/api \ -I$(gb_UnpackedTarball_workdir)/lzma/src/liblzma/check \ @@ -29,7 +30,8 @@ $(eval $(call gb_StaticLibrary_set_include,lzma,\ $(eval $(call gb_StaticLibrary_add_cflags,lzma,\ -DHAVE_STDINT_H \ -DHAVE_STDBOOL_H \ - -DMYTHREAD_POSIX \ + -DHAVE_CONFIG_H \ + $(if $(filter WNT,$(OS)),-DMYTHREAD_VISTA,-DMYTHREAD_POSIX) \ )) $(eval $(call gb_StaticLibrary_add_generated_cobjects,lzma,\ diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index fec57e264307..3e8c07663850 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -12,10 +12,10 @@ $(eval $(call gb_ExternalProject_ExternalProject,python3)) $(eval $(call gb_ExternalProject_use_externals,python3,\ bzip2 \ expat \ - $(if $(filter-out WNT,$(OS)),$(call gb_Helper_optional,LZMA,lzma)) \ + $(call gb_Helper_optional,LZMA,lzma) \ $(if $(filter WNT LINUX,$(OS)),libffi) \ openssl \ - $(if $(filter LINUX,$(OS)),$(call gb_Helper_optional,SQLITE3,sqlite3)) \ + $(call gb_Helper_optional,SQLITE3,sqlite3) \ zlib \ )) diff --git a/external/sqlite3/Module_sqlite3.mk b/external/sqlite3/Module_sqlite3.mk index 9b471834c2ac..03c1db345806 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,\ - $(if $(filter LINUX,$(OS)),StaticLibrary_sqlite3) \ + StaticLibrary_sqlite3 \ UnpackedTarball_sqlite3 \ ))
