configure.ac | 1 +
1 file changed, 1 insertion(+)
New commits:
commit fdfc6eb3fd37f87d51d1836d01259a14a4346a45
Author: Christian Lohmaier <[email protected]>
AuthorDate: Thu Jun 29 14:59:38 2023 +0200
Commit: Christian Lohmaier <[email protected]>
CommitDate: Thu Jun 29 17:39:11 2023 +0200
fix cross-compilation with frozen headers
FROZEN wasn't part of the PERMITTED_BUILD_TARGETS in configure.ac, that
in turn means it is not part of BUILD_TYPE when building the crossbuild
build-tools.
That in turn means gb_Helper_optional in external/Module_external.mk
doesn't add it to the external module dirs, and that means the makefiles
from external/frozen aren't read, more specifically there won't be any
gb_UnpackedTarball_UnpackedTarball,frozen definition.
The UnpackedTarball definitions don't error out in this case, and the
gb_Library_use_extenals,module,frozen then doesn't work as expected. It
happily depends on the UnpackedTarball_get_final_target for frozen, but
since there is nothing to unpack (since the makefiles with the
definitions are skipped) that is a noop/it goes straight to just touch
workdir_for_build/UnpackedTarball/frozen.update to fulfill the
dependency without actually extracting any files.
This patch deals with the first problem only, adding it to the
PERMITTED_BUILD_TARGETS will allow the mechanism to work as intended.
Change-Id: Ie9e8ad47ba4c281fb3246daf67450a16f792b908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153747
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <[email protected]>
diff --git a/configure.ac b/configure.ac
index eca7a5ad5cad..59703a6932e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5789,6 +5789,7 @@ if test "$cross_compiling" = "yes"; then
DYNLOADING
EPOXY
EXPAT
+ FROZEN
GLM
GRAPHITE
HARFBUZZ
