diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-12 10:30:19 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-11-13 10:57:02 +0100 |
| commit | 93b4928dddf9cdd55450450995fefe324d771221 (patch) | |
| tree | 09b8166c277680281e41995b859cd2e4cfa28d27 /configure.ac | |
| parent | 285a3e8d8b77b44da3dcc767877f878fe0e0493e (diff) | |
Re-introduce build config to version info reported by LOK
... as an opt-in --with-buildconfig-recorded configure option.
This allows to have the data in the admin console, as implemented in
commit cbfac11330882c7d0a817b6c37a08b2ace2b66f4 (Send build config
(configure options) in LOKit version info JSON, 2022-11-07), when
reprobuilds are not required. The default is no build config, which
is compatible with reprobuilds.
This reverts commit 389def871853c885289627452f40b3ae0a8dabc8.
Change-Id: I7f0be489a1c82268d0ca38cb761843c9d432a14b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159344
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 303f143df198..0234537eb02b 100644 --- a/configure.ac +++ b/configure.ac @@ -2862,6 +2862,25 @@ AC_ARG_WITH(coredumpctl, [Use coredumpctl (together with systemd-run) to retrieve core dumps of crashing test processes.])) +AC_ARG_WITH(buildconfig-recorded, + AS_HELP_STRING([--with-buildconfig-recorded], + [Put build config into version info reported by LOK. Incompatible with reproducible builds.]), +) + +AC_MSG_CHECKING([whether to record build config]) +if test -z "$with_buildconfig_recorded"; then + with_buildconfig_recorded=no +fi +if test "$with_buildconfig_recorded" = no; then + AC_MSG_RESULT([no]) +else + AC_MSG_RESULT([yes]) + # replace backslashes, to get a valid c++ string + config_args=$(echo $ac_configure_args | tr '\\' '/') + AC_DEFINE_UNQUOTED([BUILDCONFIG],[["$config_args"]],[Options passed to configure script]) + AC_DEFINE([BUILDCONFIG_RECORDED],[1],[Options passed to configure script]) +fi + dnl =================================================================== dnl Do we want to use pre-build binary tarball for recompile dnl =================================================================== @@ -15070,6 +15089,7 @@ AC_CONFIG_FILES([config_host.mk vs-code.code-workspace.template:.vscode/vs-code-template.code-workspace.in]) AC_CONFIG_HEADERS([config_host/config_atspi.h]) +AC_CONFIG_HEADERS([config_host/config_buildconfig.h]) AC_CONFIG_HEADERS([config_host/config_buildid.h]) AC_CONFIG_HEADERS([config_host/config_box2d.h]) AC_CONFIG_HEADERS([config_host/config_clang.h]) |