ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

build sqlite3 and lzma on Windows anyway

Browse Source 
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 e4421ce01d
Author: Xisco Fauli <xiscofauli@libreoffice.org>
Date:   Mon Nov 10 22:35:22 2025 +0100

    sqlite3: don't create a static library on Windows

and part of

commit 1cb84d60d9
Author: Xisco Fauli <xiscofauli@libreoffice.org>
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 <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2025-11-14 15:20:30 +01:00
parent 6d12de282e
commit 27d0c9a3db
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RepositoryExternal.mk
-2
View File
@@ -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)))
external/lzma/Module_lzma.mk
Vendored
+1 -1
View File
@@ -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 \
))
external/lzma/StaticLibrary_lzma.mk
Vendored
+3 -1
View File
@@ -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,\
external/python3/ExternalProject_python3.mk
Vendored
+2 -2
View File
@@ -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 \
))
external/sqlite3/Module_sqlite3.mk
Vendored
+1 -1
View File
@@ -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 \
))