From ab84d46730f3c4c6be98d197a1aaf4ac4af531c5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 11 Jan 2022 04:07:33 -0500 Subject: [PATCH] Backport 46c947af7 reproducibility fix --- 46c947af7.patch | 29 +++++++++++++++++++++++++++++ llvm.spec | 1 + 2 files changed, 30 insertions(+) create mode 100644 46c947af7.patch diff --git a/46c947af7.patch b/46c947af7.patch new file mode 100644 index 0000000..dac203f --- /dev/null +++ b/46c947af7.patch @@ -0,0 +1,29 @@ +From 46c947af7ead0a939fbd7a93c370e7ead2128d07 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Wed, 18 Aug 2021 23:48:14 +0200 +Subject: [PATCH] Have lit preserve SOURCE_DATE_EPOCH + +This environment variable has been standardized for reproducible builds. Setting +it can help to have reproducible tests too, so keep it as part of the testing +env when set. + +See https://reproducible-builds.org/docs/source-date-epoch/ + +Differential Revision: https://reviews.llvm.org/D108332 +--- + llvm/utils/lit/lit/TestingConfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/utils/lit/lit/TestingConfig.py b/llvm/utils/lit/lit/TestingConfig.py +index d534d895e4bae..37558bd5059c0 100644 +--- a/llvm/utils/lit/lit/TestingConfig.py ++++ b/llvm/utils/lit/lit/TestingConfig.py +@@ -28,7 +28,7 @@ def fromdefaults(litConfig): + 'TMPDIR', 'TMP', 'TEMP', 'TEMPDIR', 'AVRLIT_BOARD', + 'AVRLIT_PORT', 'FILECHECK_OPTS', 'VCINSTALLDIR', + 'VCToolsinstallDir', 'VSINSTALLDIR', 'WindowsSdkDir', +- 'WindowsSDKLibVersion'] ++ 'WindowsSDKLibVersion', 'SOURCE_DATE_EPOCH'] + + if sys.platform == 'win32': + pass_vars.append('INCLUDE') diff --git a/llvm.spec b/llvm.spec index f73cfc8..8b63e2d 100644 --- a/llvm.spec +++ b/llvm.spec @@ -86,6 +86,7 @@ Source4: lit.fedora.cfg.py Patch0: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch %endif Patch2: 0001-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch +Patch3: 46c947af7.patch BuildRequires: gcc BuildRequires: gcc-c++