From 47f1602b2681130e1400a37909fac3dfa7f667bb Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 14 Jun 2022 14:10:04 +0200 Subject: [PATCH] Fix with-vendor for cross-build targets some more Regression from be2252c8d3e5d892ec1e6b12a2b55c2026597cb9 where spaces in --with-vendor end up being poorly quoted. Opted to pass down --with-vendor to sub-configure unconditionally even if empty, due to the need of word splitting generally being needed for the sub_conf_opts variable. Change-Id: Id3740255bc8fbf98adf7464de7e2836fcde9f2fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135826 Reviewed-by: Balazs Varga Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f2dded1c65c8..8c24eb84fd5e 100644 --- a/configure.ac +++ b/configure.ac @@ -5651,7 +5651,6 @@ 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 @@ -5689,6 +5688,7 @@ if test "$cross_compiling" = "yes"; then $sub_conf_defaults \ --with-parallelism="'$with_parallelism'" \ --with-theme="'$with_theme'" \ + --with-vendor="'$with_vendor'" \ $sub_conf_opts \ $with_build_platform_configure_options \ --srcdir=$srcdir @@ -5697,6 +5697,7 @@ if test "$cross_compiling" = "yes"; then $sub_conf_defaults \ --with-parallelism="$with_parallelism" \ --with-theme="$with_theme" \ + "--with-vendor=$with_vendor" \ $sub_conf_opts \ $with_build_platform_configure_options \ --srcdir=$srcdir \