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
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 \
))