From 28303100580486ab8fa6544def6aafb7086806f1 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Tue, 11 Jan 2022 03:46:12 -0500 Subject: [PATCH] Backport patch 46c947af7 for build reproducibility --- 46c947af7.patch | 29 +++++++++++++++++++++++++++++ python-lit.spec | 6 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) 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/python-lit.spec b/python-lit.spec index 72d7dfa..0435ecf 100644 --- a/python-lit.spec +++ b/python-lit.spec @@ -9,13 +9,14 @@ Name: python-%{srcname} Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 3%{?dist} BuildArch: noarch License: NCSA Summary: Tool for executing llvm test suites URL: https://pypi.python.org/pypi/lit Source0: %{pypi_source %{srcname} %{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}}} +Patch0: 46c947af7.patch # for file check %if %{with check} @@ -60,6 +61,9 @@ sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/%{srcna %{_bindir}/lit %changelog +* Tue Jan 11 2022 Nikita Popov - 13.0.0-3 +- Backport patch 46c947af7 for build reproducibility + * Thu Oct 21 2021 Konrad Kleine - 13.0.0-2 - Remove python 2 support