From d272f94ac383c090254477aa8641ec75433989e1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 25 2021 00:17:44 +0000 Subject: import llvm-12.0.1-1.module+el8.5.0+11871+08d0eab5 --- diff --git a/.gitignore b/.gitignore index 0affb0a..52fbb9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/llvm-12.0.0.src.tar.xz +SOURCES/llvm-12.0.1.src.tar.xz diff --git a/.llvm.metadata b/.llvm.metadata index 99855af..99ec298 100644 --- a/.llvm.metadata +++ b/.llvm.metadata @@ -1 +1 @@ -dbc1cf6aa2dbdeccd7ad26c9215b56963a5686d3 SOURCES/llvm-12.0.0.src.tar.xz +619fe668e0972d11d0fa2db670a57a42d02fb8ca SOURCES/llvm-12.0.1.src.tar.xz diff --git a/SOURCES/0001-PATCH-llvm-Do-not-set-CMAKE_CXX_VISIBILITY_PRESET-to.patch b/SOURCES/0001-PATCH-llvm-Do-not-set-CMAKE_CXX_VISIBILITY_PRESET-to.patch deleted file mode 100644 index 3a48faf..0000000 --- a/SOURCES/0001-PATCH-llvm-Do-not-set-CMAKE_CXX_VISIBILITY_PRESET-to.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f3eb34e388017c4207c7c8cc29e2222aefe7471e Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Wed, 12 May 2021 18:09:03 +0200 -Subject: [PATCH] bla bla - ---- - llvm/include/llvm/ADT/Any.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/llvm/include/llvm/ADT/Any.h b/llvm/include/llvm/ADT/Any.h -index 0aded62..6fa403b 100644 ---- a/llvm/include/llvm/ADT/Any.h -+++ b/llvm/include/llvm/ADT/Any.h -@@ -23,7 +23,7 @@ - - namespace llvm { - --class Any { -+class LLVM_EXTERNAL_VISIBILITY Any { - template struct TypeId { static const char Id; }; - - struct StorageBase { --- -1.8.3.1 - diff --git a/SOURCES/llvm-12.0.0.src.tar.xz.sig b/SOURCES/llvm-12.0.0.src.tar.xz.sig deleted file mode 100644 index f6fad36..0000000 Binary files a/SOURCES/llvm-12.0.0.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/llvm-12.0.1.src.tar.xz.sig b/SOURCES/llvm-12.0.1.src.tar.xz.sig new file mode 100644 index 0000000..efeaeb8 Binary files /dev/null and b/SOURCES/llvm-12.0.1.src.tar.xz.sig differ diff --git a/SPECS/llvm.spec b/SPECS/llvm.spec index 56c9e89..cbc0bdd 100644 --- a/SPECS/llvm.spec +++ b/SPECS/llvm.spec @@ -14,7 +14,7 @@ %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src %global maj_ver 12 %global min_ver 0 -%global patch_ver 0 +%global patch_ver 1 %if %{with compat_build} %global pkg_name llvm%{maj_ver} @@ -70,7 +70,6 @@ Source4: lit.fedora.cfg.py %endif Patch0: 0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch -Patch1: 0001-PATCH-llvm-Do-not-set-CMAKE_CXX_VISIBILITY_PRESET-to.patch # RHEL-specific patches. Patch101: 0001-Deactivate-markdown-doc.patch @@ -176,14 +175,6 @@ Static libraries for the LLVM compiler infrastructure. Summary: LLVM regression tests Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: python3-lit -# The regression tests need gold. -Requires: binutils -# This is for llvm-config -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -# Bugpoint tests require gcc -Requires: gcc -Requires: findutils Provides: llvm-test(major) = %{maj_ver} @@ -343,50 +334,6 @@ cp -R utils/unittest %{install_srcdir}/utils/ cp utils/update_cc_test_checks.py %{install_srcdir}/utils/ cp -R utils/UpdateTestChecks %{install_srcdir}/utils/ -# One of the lit tests references this file -install -d %{install_srcdir}/docs/CommandGuide/ -install -m 0644 docs/CommandGuide/dsymutil.rst %{install_srcdir}/docs/CommandGuide/ - -# Generate lit config files. Strip off the last lines that initiates the -# test run, so we can customize the configuration. -head -n -2 %{_vpath_builddir}/test/lit.site.cfg.py >> %{lit_cfg} -head -n -2 %{_vpath_builddir}/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg} - -# Install custom fedora config file -cp %{SOURCE4} %{buildroot}%{lit_fedora_cfg} - -# Patch lit config files to load custom fedora config: -for f in %{lit_cfg} %{lit_unit_cfg}; do - echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> $f -done - -install -d %{buildroot}%{_libexecdir}/tests/llvm -install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/llvm - -# Install lit tests. We need to put these in a tarball otherwise rpm will complain -# about some of the test inputs having the wrong object file format. -install -d %{buildroot}%{_datadir}/llvm/ - -# The various tar options are there to make sur the archive is the same on 32 and 64 bit arch, i.e. -# the archive creation is reproducible. Move arch-specific content out of the tarball -mv %{lit_cfg} %{install_srcdir}/%{_arch}.site.cfg.py -mv %{lit_unit_cfg} %{install_srcdir}/%{_arch}.Unit.site.cfg.py -tar --sort=name --mtime='UTC 2020-01-01' -c test/ | gzip -n > %{install_srcdir}/test.tar.gz - -# Install the unit test binaries -mkdir -p %{build_llvm_libdir} -cp -R %{_vpath_builddir}/unittests %{build_llvm_libdir}/ -rm -rf `find %{build_llvm_libdir} -iname 'cmake*'` - -# Install libraries used for testing -install -m 0755 %{build_libdir}/BugpointPasses.so %{buildroot}%{_libdir} -install -m 0755 %{build_libdir}/LLVMHello.so %{buildroot}%{_libdir} - -# Install test inputs for PDB tests -echo "%{_datadir}/llvm/src/unittests/DebugInfo/PDB" > %{build_llvm_libdir}/unittests/DebugInfo/PDB/llvm.srcdir.txt -mkdir -p %{buildroot}%{_datadir}/llvm/src/unittests/DebugInfo/PDB/ -cp -R unittests/DebugInfo/PDB/Inputs %{buildroot}%{_datadir}/llvm/src/unittests/DebugInfo/PDB/ - %if %{with gold} # Add symlink to lto plugin in the binutils plugin directory. %{__mkdir_p} %{buildroot}%{_libdir}/bfd-plugins/ @@ -551,22 +498,12 @@ fi %files test %license LICENSE.TXT -%{_libexecdir}/tests/llvm/ -%{llvm_libdir}/unittests/ -%{_datadir}/llvm/src/unittests -%{_datadir}/llvm/src/test.tar.gz -%{_datadir}/llvm/src/%{_arch}.site.cfg.py -%{_datadir}/llvm/src/%{_arch}.Unit.site.cfg.py -%{_datadir}/llvm/lit.fedora.cfg.py -%{_datadir}/llvm/src/docs/CommandGuide/dsymutil.rst %{_bindir}/not %{_bindir}/count %{_bindir}/yaml-bench %{_bindir}/lli-child-target %{_bindir}/llvm-isel-fuzzer %{_bindir}/llvm-opt-fuzzer -%{_libdir}/BugpointPasses.so -%{_libdir}/LLVMHello.so %files googletest %license LICENSE.TXT @@ -576,6 +513,12 @@ fi %endif %changelog +* Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1 +- 12.0.1 release + +* Fri Jul 02 2021 Tom Stellard - 12.0.0-2 +- Stop installing lit tests + * Tue May 25 2021 sguelton@redhat.com - 12.0.0-1 - Remove obsolete patch