configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 9b2d1301fcd75a6d33437a4b0ca99abbb4a95ff6
Author: Christian Lohmaier <[email protected]>
AuthorDate: Mon Jul 7 18:52:36 2025 +0200
Commit: Christian Lohmaier <[email protected]>
CommitDate: Tue Jul 8 13:08:03 2025 +0200
fix windows/aarch64 cross-compilation wrt skia
skia had been made mandatory for windows and along with that some
conditionals skipping skia headers were removed/those skia headers were
also made mandatory:
C:/cygwin64/home/tdf/jenkins/workspace/lo_daily_src/vcl/inc\skia/utils.hxx(34):
fatal error C1083: Cannot open include file: 'SkRegion.h': No such file or
directory
So also enable skia when building the cross-toolset when cross-compiling
for windows/aarch64 (not necessary for win/32 since the builder can run
the tools like gengal that are built for the host)
Change-Id: Ifa7cdf568dab7c9ea941548b1f4d64454241b0e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187499
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <[email protected]>
diff --git a/configure.ac b/configure.ac
index 83ec1725adce..e75eab6b6d27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6198,7 +6198,8 @@ if test "$cross_compiling" = "yes"; then
fi
# windows uses full-internal python and that in turn relies on openssl, so
also enable openssl
# when cross-compiling for aarch64, overriding the defaults below
- test "${PLATFORMID}" = "windows_aarch64" && sub_conf_opts="$sub_conf_opts
--enable-openssl --with-tls=openssl"
+ # similarly: at least skia headers need to be available in the
cross-toolset
+ test "${PLATFORMID}" = "windows_aarch64" && sub_conf_opts="$sub_conf_opts
--enable-openssl --with-tls=openssl --enable-skia"
# cross-compilations don't necessarily enable python support in the
product/the sub-configure needs to know
# that the minimum supported python version is 3.7 or later...
test "$with_system_harfbuzz" != "yes" && sub_conf_opts="$sub_conf_opts
NEED_MESON=TRUE"
@@ -6296,6 +6297,7 @@ if test "$cross_compiling" = "yes"; then
PYTHON
REPORTBUILDER
SCRIPTING
+ SKIA
ZLIB
ZSTD
ZXCVBN
