diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-11-05 00:34:46 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-11-05 21:25:18 +0100 |
| commit | 389def871853c885289627452f40b3ae0a8dabc8 (patch) | |
| tree | 00f870253a2ab65adca65680a8116150d1f3eb8b | |
| parent | d2b0c48ca0f0ba8ef3049ebcd5f93ae420c22c46 (diff) | |
reprobuild: don't include build machine setup in binaries
The configure line can leak data from the building machine (path
names, level of parallelism etc), which leads to non-reproducible
build results.
Change-Id: I042afc3d7bad19e8e274147be2a9eb0abcf5436e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158871
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
| -rw-r--r-- | config_host/config_buildconfig.h.in | 8 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
3 files changed, 1 insertions, 16 deletions
diff --git a/config_host/config_buildconfig.h.in b/config_host/config_buildconfig.h.in deleted file mode 100644 index 0c93d6e02f84..000000000000 --- a/config_host/config_buildconfig.h.in +++ /dev/null @@ -1,8 +0,0 @@ -/* Options passed to configure script */ - -#ifndef CONFIG_BUILDCONFIG_H -#define CONFIG_BUILDCONFIG_H - -#define BUILDCONFIG "" - -#endif diff --git a/configure.ac b/configure.ac index cb2f975bdd97..7b821c6343d5 100644 --- a/configure.ac +++ b/configure.ac @@ -523,10 +523,6 @@ git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>&/dev/null` LIBO_THIS_YEAR=${git_date:-2023} AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR) -# 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]) - dnl =================================================================== dnl Product version dnl =================================================================== @@ -15045,7 +15041,6 @@ 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]) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 71eeabcbc380..3283cf7731e5 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -12,7 +12,6 @@ #include <svx/sdr/contact/viewcontact.hxx> #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include <config_buildconfig.h> #include <config_cairo_rgba.h> #include <config_features.h> @@ -7243,8 +7242,7 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/) "\"ProductName\": \"%PRODUCTNAME\", " "\"ProductVersion\": \"%PRODUCTVERSION\", " "\"ProductExtension\": \"%PRODUCTEXTENSION\", " - "\"BuildId\": \"%BUILDID\", " - "\"BuildConfig\": \"" BUILDCONFIG "\" " + "\"BuildId\": \"%BUILDID\" " "}"_ustr)); } |