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/0001-PATCH-lld-CMake-Check-for-gtest-headers-even-if-lit..patch b/SOURCES/0001-PATCH-lld-CMake-Check-for-gtest-headers-even-if-lit..patch index ea10149..ac8ed67 100644 --- a/SOURCES/0001-PATCH-lld-CMake-Check-for-gtest-headers-even-if-lit..patch +++ b/SOURCES/0001-PATCH-lld-CMake-Check-for-gtest-headers-even-if-lit..patch @@ -14,7 +14,7 @@ diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index d4e561b..a7406d1c 100644 --- a/lld/CMakeLists.txt +++ b/lld/CMakeLists.txt -@@ -65,6 +65,15 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +@@ -68,6 +68,15 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(LLVM_UTILS_PROVIDED ON) endif() @@ -30,7 +30,7 @@ index d4e561b..a7406d1c 100644 if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) # Note: path not really used, except for checking if lit was found set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py) -@@ -74,12 +83,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) +@@ -77,12 +86,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(LLVM_UTILS_PROVIDED ON) set(LLD_TEST_DEPS FileCheck not) endif() 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 497ac4b..c783e72 100644 --- a/SPECS/lld.spec +++ b/SPECS/lld.spec @@ -1,8 +1,11 @@ -#%%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 baserelease 1 +%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/.*$ @@ -12,7 +15,7 @@ Name: lld Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: The LLVM Linker License: NCSA @@ -30,6 +33,7 @@ Patch0: 0001-PATCH-lld-CMake-Check-for-gtest-headers-even-if-lit..patch # Bundle libunwind header need during build for MachO support Patch1: 0002-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake @@ -83,11 +87,9 @@ Requires: lld-libs = %{version}-%{release} LLVM regression tests. %prep - %autosetup -n %{lld_srcdir} -p2 - %build # Disable lto since it causes the COFF/libpath.test lit test to crash. @@ -196,6 +198,7 @@ cd %{_vpath_builddir} %{_bindir}/ld.lld %{_bindir}/ld64.lld %{_bindir}/ld64.lld.darwinnew +%{_bindir}/ld64.lld.darwinold %{_bindir}/wasm-ld %files devel @@ -215,6 +218,9 @@ cd %{_vpath_builddir} %{_datadir}/lld/lit.lld-test.cfg.py %changelog +* Fri Oct 15 2021 Tom Stellard - 13.0.0-1 +- 13.0.0 Release + * Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1 - 12.0.1 release