From b700c93b64cbe8eaf45a4c91d0b6dc45f398d4d1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 20 Oct 2020 06:15:48 +0000 Subject: [PATCH] import lldb-11.0.0-0.1.rc2.module+el8.4.0+8195+484edabc --- .gitignore | 2 +- .lldb.metadata | 2 +- SOURCES/lldb-10.0.1.src.tar.xz.sig | Bin 566 -> 0 bytes SOURCES/lldb-11.0.0rc2.src.tar.xz.sig | Bin 0 -> 566 bytes SPECS/lldb.spec | 39 +++++++++++++++----------- 5 files changed, 25 insertions(+), 18 deletions(-) delete mode 100644 SOURCES/lldb-10.0.1.src.tar.xz.sig create mode 100644 SOURCES/lldb-11.0.0rc2.src.tar.xz.sig diff --git a/.gitignore b/.gitignore index 43dacec..77113c2 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.0rc2.src.tar.xz diff --git a/.lldb.metadata b/.lldb.metadata index f8b435e..9e04b0f 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 +c6d6bee98ca1a390337505a5b1a938a706e19de1 SOURCES/lldb-11.0.0rc2.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 92465def5dba0bebae1ab7bf5013dea31d432d22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j*jP9iaCzek0rjBbvi$CRmtL7j>P0$&%0k^l+`5TeJF zsfIzFiV#W<{yx%0ty4HyCTFhuUC?+@(LNzsia|#Pm!Q~s)%a^UN26&cb?IKPpE4MU z;|%=3qpf>JY4@bUh@%x4cB^vDWkr#LpXz|V3^j7C1rSHIgkqnW)*w1^noQ$NF9G^!MW+)gg!FgU8N(?;B%q0EOSdof~H-N$|A ztZ}ie2p8(=BBjF!RUyWuHEHO&bYNKuc<~tbi3y|#@GJ{uaUD=p=90+60cX%N*oj9= zI111~2$Zl(1sZh7KhqB(HLjJgZ=Jy?FqD_`Q_6z<&hPcJ(4P}v=M6P!^%rGpx$may zOq^f06b)H#pCnj!j||KPSrZo=6M(IX%FC0_I6X1kMVgPLGMe?W(xgB*qd;vV-;@W83rAW6nK^*K34@j$z2|@V^jg?wcuuDm&u&S*g`7FhKIYp6BqYlu(iQ_IuC- zj7jfbd4Z|PV)iCBp(*AM$eqM!ql;^DZ-+5OuI!rePSPnVqj~-ZhK3k_*M#2^@-1N$ zWL=G{kZ68Ok0=d4Ym{laU1XDlf(HvKp8hGIv|=zZ$R6;78@50ZV;b!sh1Y8V_KQ+a)) z4A*Caq*3~X#-a#-nnZA);kD3XUvK#K5hHS|sWcOn@^3&GAd+#FvUTfquIl$ARf{4u zdQS6RuL`)hV;KS9rl)XXOzR{d?(*LCn})6CTKrk1FUgdVaT^WrIgwCw-0{l42{S#x zVpY6qar$=4wp;qe7AU>9nx?Gxyc{ewSoY=qOOy-#U;-IO_U)134&`Rqya92Iy2m+} zqqZNhH7=OK0$cu zCZfAIJ(mhH%CAw3I+Tp^^_ENe2nlT1OIEU*oTH+LDnOdK0lw{v-giH5jHsxPG!GUW zZjBu=IS`y0YH9hKO3fk~kqigGt^ak7RD zzi*UIMU3_5S3{6QVsCe$W~{$tdgwBmhWsvZx_9B8VYB=^8(juUY;MfFD5)ajo&&aG zI+dC7Y1Ezlc}!(s5}9gTbNM$kiH*AFGk6U3foSz(HAj;@Od9!Icf4IL$lUK?Sww^m E#zGtrs{jB1 literal 0 HcmV?d00001 diff --git a/SPECS/lldb.spec b/SPECS/lldb.spec index 643d687..2c2dc34 100644 --- a/SPECS/lldb.spec +++ b/SPECS/lldb.spec @@ -1,24 +1,25 @@ -#%%global rc_ver 6 -%global baserelease 1 +%global rc_ver 2 +%global baserelease 0.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 @@ -114,6 +117,7 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %ldconfig_scriptlets %files +%license LICENSE.TXT %{_bindir}/lldb* %{_libdir}/liblldb.so.* %{_libdir}/liblldbIntelFeatures.so.* @@ -126,6 +130,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* 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