diff --git a/.gitignore b/.gitignore index 5b68c90..9aa46b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/lldb-13.0.1.src.tar.xz +SOURCES/lldb-14.0.6.src.tar.xz SOURCES/tstellar-gpg-key.asc diff --git a/.lldb.metadata b/.lldb.metadata index 9a9196a..fe0b5bb 100644 --- a/.lldb.metadata +++ b/.lldb.metadata @@ -1,2 +1,2 @@ -23b6e1dd5295965ec0adfe4447787f95d24b07c3 SOURCES/lldb-13.0.1.src.tar.xz +1d5b26df4c008adeb484b76caf115f7ac692c7b0 SOURCES/lldb-14.0.6.src.tar.xz b8d2648a01d36ed0186fd2c5af325fd28797f9a0 SOURCES/tstellar-gpg-key.asc diff --git a/SOURCES/lldb-13.0.1.src.tar.xz.sig b/SOURCES/lldb-13.0.1.src.tar.xz.sig deleted file mode 100644 index 5856c4d..0000000 Binary files a/SOURCES/lldb-13.0.1.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/lldb-14.0.6.src.tar.xz.sig b/SOURCES/lldb-14.0.6.src.tar.xz.sig new file mode 100644 index 0000000..fd1e071 Binary files /dev/null and b/SOURCES/lldb-14.0.6.src.tar.xz.sig differ diff --git a/SPECS/lldb.spec b/SPECS/lldb.spec index 76d957b..d677192 100644 --- a/SPECS/lldb.spec +++ b/SPECS/lldb.spec @@ -1,10 +1,13 @@ -#%%global rc_ver 5 -%global lldb_version 13.0.1 +%global lldb_version 14.0.6 +#global rc_ver 2 %global lldb_srcdir %{name}-%{lldb_version}%{?rc_ver:rc%{rc_ver}}.src +# LTO disabled for now to fix the build +%global _lto_cflags %{nil} + Name: lldb Version: %{lldb_version}%{?rc_ver:~rc%{rc_ver}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Next generation high-performance debugger License: NCSA @@ -14,10 +17,16 @@ Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{lldb_v Source2: tstellar-gpg-key.asc # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2052982 -Patch0: increase-m_hwp_regs-size.patch +Patch0: increase-m_hwp_regs-size.patch + -BuildRequires: gcc -BuildRequires: gcc-c++ +# RHEL only: We build LLVM with clang, which now defaults to using the +# libstdc++ from gcc-toolset-12. Since we're linking some clang +# tools statically to some static libraries from LLVM, we +# need to use libstdc++12 as well. So, use gcc-toolset-12 +# to compile clang. +BuildRequires: gcc-toolset-12-gcc-c++ +BuildRequires: gcc-toolset-12-annobin-plugin-gcc BuildRequires: cmake BuildRequires: ninja-build BuildRequires: llvm-devel = %{version} @@ -67,11 +76,9 @@ The package contains the LLDB Python module. %autosetup -n %{lldb_srcdir} -p2 %build - -CFLAGS="%{optflags} -Wno-error=format-security" -CXXFLAGS="%{optflags} -Wno-error=format-security" - %cmake -GNinja \ + -DCMAKE_C_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/gcc \ + -DCMAKE_CXX_COMPILER=/opt/rh/gcc-toolset-12/root/usr/bin/g++ \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ @@ -131,10 +138,16 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog -* Mon May 30 2022 Timm Bäder - 13.0.1-3 -- Properly apply ppc64le patch +* Fri Jul 22 2022 Timm Bäder - 14.0.6-1 +- 14.0.6 Release + +* Wed Jun 22 2022 Timm Bäder - 14.0.5-1 +- 14.0.5 Release + +* Tue Apr 26 2022 Timm Bäder - 14.0.0-1 +- 14.0.0 Release -* Fri May 27 2022 Timm Bäder - 13.0.1-2 +* Wed Mar 30 2022 Timm Bäder - 13.0.1-2 - Work around a lldb-server crash on ppc64le * Thu Feb 03 2022 Tom Stellard - 13.0.1-1