diff --git a/.gitignore b/.gitignore index ad335a7..f9be554 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/lld-12.0.1.src.tar.xz +SOURCES/lld-13.0.0.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/.lld.metadata b/.lld.metadata index 184b2a9..65c174e 100644 --- a/.lld.metadata +++ b/.lld.metadata @@ -1,2 +1,2 @@ -3b7e4908f6cf3a51590e37b4194180582cc1c32c SOURCES/lld-12.0.1.src.tar.xz +30623cfe669c801fe5147d33a045d14a4e029d81 SOURCES/lld-13.0.0.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/lld-12.0.1.src.tar.xz.sig b/SOURCES/lld-12.0.1.src.tar.xz.sig deleted file mode 100644 index 204df67..0000000 Binary files a/SOURCES/lld-12.0.1.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/lld-13.0.0.src.tar.xz.sig b/SOURCES/lld-13.0.0.src.tar.xz.sig new file mode 100644 index 0000000..f77a950 Binary files /dev/null and b/SOURCES/lld-13.0.0.src.tar.xz.sig differ diff --git a/SPECS/lld.spec b/SPECS/lld.spec index f4a343e..55f383a 100644 --- a/SPECS/lld.spec +++ b/SPECS/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