diff --git a/.gitignore b/.gitignore index 43dacec..cc47929 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/hans-gpg-key.asc -SOURCES/lldb-10.0.1.src.tar.xz +SOURCES/lldb-11.0.0.src.tar.xz diff --git a/.lldb.metadata b/.lldb.metadata index f8b435e..4d1285a 100644 --- a/.lldb.metadata +++ b/.lldb.metadata @@ -1,2 +1,2 @@ 32fa4b0193960f05064f2ab31b5a89c7cf48a0b9 SOURCES/hans-gpg-key.asc -90b946ff7b850bcded598509a10d0795e7da3f63 SOURCES/lldb-10.0.1.src.tar.xz +6bdb22e6b5e4700269f23452d66b0bddee93e008 SOURCES/lldb-11.0.0.src.tar.xz diff --git a/SOURCES/lldb-10.0.1.src.tar.xz.sig b/SOURCES/lldb-10.0.1.src.tar.xz.sig deleted file mode 100644 index 92465de..0000000 Binary files a/SOURCES/lldb-10.0.1.src.tar.xz.sig and /dev/null differ diff --git a/SOURCES/lldb-11.0.0.src.tar.xz.sig b/SOURCES/lldb-11.0.0.src.tar.xz.sig new file mode 100644 index 0000000..b0e362a Binary files /dev/null and b/SOURCES/lldb-11.0.0.src.tar.xz.sig differ diff --git a/SPECS/lldb.spec b/SPECS/lldb.spec index 643d687..af40163 100644 --- a/SPECS/lldb.spec +++ b/SPECS/lldb.spec @@ -2,23 +2,24 @@ %global baserelease 1 %global lldb_srcdir %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src +# Too many threads causes OOM errors. +%global _smp_mflags -j8 + Name: lldb -Version: 10.0.1 +Version: 11.0.0 Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: Next generation high-performance debugger License: NCSA URL: http://lldb.llvm.org/ -%if 0%{?rc_ver:1} -Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lldb_srcdir}.tar.xz -Source1: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{lldb_srcdir}.tar.xz.sig -%else -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lldb_srcdir}.tar.xz -Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{lldb_srcdir}.tar.xz.sig -%endif +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{lldb_srcdir}.tar.xz +Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{lldb_srcdir}.tar.xz.sig Source2: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: ninja-build BuildRequires: llvm-devel = %{version} BuildRequires: llvm-test = %{version} BuildRequires: clang-devel = %{version} @@ -30,7 +31,7 @@ BuildRequires: zlib-devel BuildRequires: libxml2-devel BuildRequires: libedit-devel BuildRequires: python3-lit -BuildRequires: multilib-rpm-config +BuildRequires: multilib-rpm-config Requires: python3-lldb @@ -52,6 +53,7 @@ The package contains header files for the LLDB debugger. Summary: Python module for LLDB BuildRequires: python3-devel Requires: python3-six +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python3-lldb The package contains the LLDB Python module. @@ -64,14 +66,15 @@ The package contains the LLDB Python module. mkdir -p _build cd _build -# Python version detection is broken -LDFLAGS="%{__global_ldflags} -lpthread -ldl" +## Python version detection is broken +#LDFLAGS="%{__global_ldflags} -lpthread -ldl" CFLAGS="%{optflags} -Wno-error=format-security" CXXFLAGS="%{optflags} -Wno-error=format-security" -%cmake .. \ +%cmake .. -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ -DLLVM_CONFIG:FILEPATH=/usr/bin/llvm-config-%{__isa_bits} \ \ @@ -92,11 +95,11 @@ CXXFLAGS="%{optflags} -Wno-error=format-security" -DLLVM_LIT_ARGS="-sv \ --path %{_libdir}/llvm" \ -make %{?_smp_mflags} +%ninja_build %install cd _build -make install DESTDIR=%{buildroot} +%ninja_install %multilib_fix_c_header --file %{_includedir}/lldb/Host/Config.h @@ -113,7 +116,11 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %ldconfig_scriptlets +%check + + %files +%license LICENSE.TXT %{_bindir}/lldb* %{_libdir}/liblldb.so.* %{_libdir}/liblldbIntelFeatures.so.* @@ -126,6 +133,12 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-1 +- 11.0.0 final + +* Fri Sep 18 2020 sguelton@redhat.com - 11.0.0-0.1.rc2 +- 11.0.0-rc2 Release + * Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1 - 10.0.1