configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 004bddf2a0484c6f6ea6b7c6a67834f4912ae39e
Author: Balazs Varga <[email protected]>
AuthorDate: Mon Jun 13 14:49:56 2022 +0200
Commit: Xisco Fauli <[email protected]>
CommitDate: Wed Jun 15 09:46:10 2022 +0200
Fix some cross-build targets errors
1. error - if disable JAVA is configured, set '--without-java',
otherwise it breaks python for the build part.
2. error - forward '--with-vendor' setting to sub config,
to avoid stupid windows system variable error.
Change-Id: Icebdfc5d6d2816fa53538d83d3ea206a6e99ddd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135724
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <[email protected]>
(cherry picked from commit be2252c8d3e5d892ec1e6b12a2b55c2026597cb9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135835
Reviewed-by: Xisco Fauli <[email protected]>
diff --git a/configure.ac b/configure.ac
index 1b7ed4e2b513..a36fb02c7fc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5653,7 +5653,7 @@ if test "$cross_compiling" = "yes"; then
;;
esac
else
- sub_conf_opts="$sub_conf_opts --disable-scripting"
+ sub_conf_opts="$sub_conf_opts --without-java"
fi
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts
--with-external-tar=$TARFILE_LOCATION"
test "$with_galleries" = "no" -o -z "$WITH_GALLERY_BUILD" &&
sub_conf_opts="$sub_conf_opts --with-galleries=no
--disable-database-connectivity"
@@ -5664,6 +5664,7 @@ if test "$cross_compiling" = "yes"; then
test "$enable_wasm_strip" = "yes" && sub_conf_opts="$sub_conf_opts
--enable-wasm-strip"
test "${with_system_lockfile+set}" = set && sub_conf_opts="$sub_conf_opts
--with-system-lockfile=${with_system_lockfile}"
test "${enable_fuzzers}" = yes && sub_conf_opts="$sub_conf_opts
--without-system-libxml"
+ test -n "$with_vendor" -a "$with_vendor" != "no" &&
sub_conf_opts="$sub_conf_opts --with-vendor=$with_vendor"
if test "$_os" = "Emscripten"; then
sub_conf_opts="$sub_conf_opts --without-system-libxml
--without-system-fontconfig --without-system-freetype --without-system-zlib"
fi
