diff --git a/.gitignore b/.gitignore index 665858f..299a81d 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,5 @@ /lld-12.0.0.src.tar.xz.sig /lld-12.0.1.src.tar.xz /lld-12.0.1.src.tar.xz.sig +/lld-13.0.0.src.tar.xz +/lld-13.0.0.src.tar.xz.sig diff --git a/lld.spec b/lld.spec index f4a343e..55f383a 100644 --- a/lld.spec +++ b/lld.spec @@ -1,8 +1,10 @@ -#%%global rc_ver 5 -%global lld_srcdir lld-%{version}%{?rc_ver:rc%{rc_ver}}.src -%global maj_ver 12 +%bcond_without check + +#global rc_ver 4 +%global lld_srcdir lld-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src +%global maj_ver 13 %global min_ver 0 -%global patch_ver 1 +%global patch_ver 0 # Don't include unittests in automatic generation of provides or requires. %global __provides_exclude_from ^%{_libdir}/lld/.*$ @@ -10,7 +12,7 @@ Name: lld Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The LLVM Linker License: NCSA @@ -120,8 +122,8 @@ LLVM regression tests. # Generate lit config files. Strip off the last line that initiates the # test run, so we can customize the configuration. -head -n -1 %{_target_platform}/test/lit.site.cfg.py >> %{lit_cfg} -head -n -1 %{_target_platform}/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg} +head -n -1 %{__cmake_builddir}/test/lit.site.cfg.py >> %{lit_cfg} +head -n -1 %{__cmake_builddir}/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg} # Patch lit config files to load custom config: for f in %{lit_cfg} %{lit_unit_cfg}; do @@ -143,11 +145,11 @@ install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/lld # Install unit test binaries install -d %{buildroot}%{_libdir}/lld/ -cp -R %{_target_platform}/unittests %{buildroot}%{_libdir}/lld/ +cp -R %{__cmake_builddir}/unittests %{buildroot}%{_libdir}/lld/ rm -rf `find %{buildroot}%{_libdir}/lld/ -iname '*make*'` # Install gtest libraries -cp %{_target_platform}/%{_lib}/libgtest*so* %{buildroot}%{_libdir}/lld/ +cp %{__cmake_builddir}/%{_lib}/libgtest*so* %{buildroot}%{_libdir}/lld/ # Install libraries and binaries %cmake_install @@ -171,8 +173,10 @@ fi # armv7lhl tests disabled because of arm issue, see https://koji.fedoraproject.org/koji/taskinfo?taskID=33660162 %ifnarch %{arm} +%if %{with check} %cmake_build --target check-lld %endif +%endif %ldconfig_scriptlets libs @@ -183,6 +187,7 @@ fi %{_bindir}/ld.lld %{_bindir}/ld64.lld %{_bindir}/ld64.lld.darwinnew +%{_bindir}/ld64.lld.darwinold %{_bindir}/wasm-ld %files devel @@ -202,11 +207,14 @@ fi %{_datadir}/lld/lit.lld-test.cfg.py %changelog +* Tue Oct 12 2021 Timm Bäder - 13.0.0-1 +- Release 13.0.0 + * Mon Aug 09 2021 Mohan Boddu - 12.0.1-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 -* Tue Jul 12 2021 Tom Stellard -12.0.1-1 +* Tue Jul 13 2021 Tom Stellard -12.0.1-1 - 12.0.1 Release * Fri Apr 16 2021 Tom Stellard - 12.0.0-1 diff --git a/sources b/sources index b78343b..ea33ec7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (lld-12.0.1.src.tar.xz) = 4292e45c54f61b8bf8b0a412f1423e062fb7c88ab3d143de3bccf010ea84fcf672ec432068a6adc461f605993d5c4e7e720e9b719d7bf8cbe670115f75e1fb2a -SHA512 (lld-12.0.1.src.tar.xz.sig) = 3494fee1f706451e9e25558d9ee8c155967a7b2b725a0b8e2bd88f1020116e7d2cfc9c3fd7505494e158ac77161f457f847addea8ea13a3b7b01494eecf39d9c +SHA512 (lld-13.0.0.src.tar.xz) = bec719dd7349eb5e9d2d5f2dcbb3f63c4756b0ee82aef228f9fa2bf4e6913596aacb4a0dd8d66146b7e81432c51d811ec8cf211fe67d2de74747938d3543d54d +SHA512 (lld-13.0.0.src.tar.xz.sig) = e56c13e95c702b35dc2c9036cad236b10d8f205615f5cb68682a122f9b68c4c84807cb1e02f6fc727b1e835cbf84e387a1a500e8ef98502fad7ab776d34cd51f