config_host.mk.in | 1 +
configure.ac | 9 +++++++++
2 files changed, 10 insertions(+)
New commits:
commit a750517ca8b6dcd330c8ca7bbe63e47b2dc868bf
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Aug 19 16:37:34 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Aug 19 21:42:31 2020 +0200
Allow to set LO_ELFCHECK_ALLOWLIST in autogen.input
(To minimize disruption with other people's potential use of the variable,
when
it is not set during configuration make sure not to export it as empty from
config_host.mk, so that it can then still be passed as an environment
variable
to individual `make` invocations.)
Change-Id: I785910f1076c05905e354ef846d16ffb7ea0a081
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101002
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/config_host.mk.in b/config_host.mk.in
index d62afe8e796f..bcebdb669e29 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -395,6 +395,7 @@ export LIBXML_JAR=@LIBXML_JAR@
export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
+@x_LO_ELFCHECK_ALLOWLIST@ export LO_ELFCHECK_ALLOWLIST=@LO_ELFCHECK_ALLOWLIST@
@x_Cygwin@ export LS=@WIN_LS@
export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
diff --git a/configure.ac b/configure.ac
index 62052bb63a58..00fd6d7a50b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13570,6 +13570,15 @@ fi
AC_SUBST(LO_PATH)
+# Allow to pass LO_ELFCHECK_ALLOWLIST from autogen.input to
bin/check-elf-dynamic-objects:
+if test "$LO_ELFCHECK_ALLOWLIST" = x || test "${LO_ELFCHECK_ALLOWLIST-x}" !=
x; then
+ x_LO_ELFCHECK_ALLOWLIST=
+else
+ x_LO_ELFCHECK_ALLOWLIST=[\#]
+fi
+AC_SUBST(x_LO_ELFCHECK_ALLOWLIST)
+AC_SUBST(LO_ELFCHECK_ALLOWLIST)
+
libo_FUZZ_SUMMARY
# Generate a configuration sha256 we can use for deps
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
