From 577c1c105e251575bdde969a8662d1b3265c42c9 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 4 Oct 2023 11:06:24 +0200 Subject: [PATCH] Update to LLVM 17.0.2 Resolves: RHEL-9028 --- .gitignore | 1 + python-lit.spec | 42 ++++++++++++++++++++++++++++++++++-------- sources | 3 +-- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b68d766..c8166a8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ SOURCES/lit-15.0.7.tar.gz /lit-16.0.0.tar.gz /LICENSE.TXT /lit-16.0.6.tar.gz +/lit-17.0.2.tar.gz diff --git a/python-lit.spec b/python-lit.spec index 40a4116..d135625 100644 --- a/python-lit.spec +++ b/python-lit.spec @@ -1,20 +1,39 @@ -%global lit_version 16.0.6 -#global rc_ver 1 -#%%global post_ver 1 +%bcond_with snapshot_build + +%if %{with snapshot_build} +# Unlock LLVM Snapshot LUA functions +%{llvm_sb_verbose} +%{llvm_sb} +%endif + +%global lit_version 17.0.2 +#global rc_ver 4 +#global post_ver 0 + +%global python_lit_srcdir %{srcname}-%{version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}} + +%if %{with snapshot_build} +%undefine rc_ver +%global lit_version %{llvm_snapshot_version} +%global python_lit_srcdir llvm-%{lit_version}.src/utils/lit +%endif %bcond_without check Name: python-lit -Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}} +Version: %{lit_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} Release: 1%{?dist} BuildArch: noarch License: NCSA Summary: Tool for executing llvm test suites URL: https://pypi.python.org/pypi/lit +%if %{without snapshot_build} Source0: %{pypi_source lit %{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}}} -# Remove the license file if it gets included in the tarball again. -Source1: https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{lit_version}%{?rc_ver:rc%{rc_ver}}/llvm/utils/lit/LICENSE.TXT +%else +Source0: %{llvm_snapshot_source_prefix}llvm-%{llvm_snapshot_yyyymmdd}.src.tar.xz +%{llvm_snapshot_extra_source_tags} +%endif # for file check %if %{with check} @@ -30,13 +49,17 @@ lit is a tool used by the LLVM project for executing its test suites. Summary: LLVM lit test runner for Python 3 Requires: python3-setuptools +Recommends: python3-psutil %description -n python3-lit lit is a tool used by the LLVM project for executing its test suites. %prep +%if %{with snapshot_build} +%autosetup -n %{python_lit_srcdir} -p4 +%else %autosetup -n lit-%{lit_version}%{?rc_ver:rc%{rc_ver}}%{?post_ver:.post%{post_ver}} -p4 -cp %{SOURCE1} ./ +%endif %build %py3_build @@ -47,7 +70,7 @@ cp %{SOURCE1} ./ # Strip out #!/usr/bin/env python sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/lit/*.py -%if %{with check} +%if %{with check} && %{without snapshot_build} %check %{__python3} lit.py -v tests %endif @@ -59,6 +82,9 @@ sed -i -e '1{\@^#!/usr/bin/env python@d}' %{buildroot}%{python3_sitelib}/lit/*.p %{_bindir}/lit %changelog +* Wed Oct 04 2023 Nikita Popov - 17.0.2-1 +- Update to LLVM 17.0.2 + * Sat Jun 17 2023 Tom Stellard - 16.0.6-1 - 16.0.6 Release diff --git a/sources b/sources index 3ccc9e4..9bee1ac 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (lit-16.0.6.tar.gz) = 994140c36aa8140fc28e41f47f9cb8fff0a9e6caa43ccb19e1d7b93f01a2c77b007bd85bb44ca29c47432abf3151845f2e1c5883b6f410109702bae0f975f773 -SHA512 (LICENSE.TXT) = 4a3325224ec2c86de08cf6f9320f1c95a6de061e45b53841df8fcab755d77341c27e0e064e4330d096b413c4fbb5310362b2f6c9b5c60e907bdceb2ff9b956d0 +SHA512 (lit-17.0.2.tar.gz) = 702ade65ce1bd57578bc169d6dd975fc11233bcf6f31ec449673d57fcd676fa77885bce3306dcd0ad628ee5c3f507fe26c0debb6866f32c1a22857dcf95ae221