diff --git a/lldb.spec b/lldb.spec index f758d653bc166bdd2d33f52ed239339722083d04..46e88f4c7f0f680672f0443775fdaffad81c8fe7 100644 --- a/lldb.spec +++ b/lldb.spec @@ -1,8 +1,9 @@ +%undefine __cmake_in_source_build %bcond_without bisheng_autotuner Name: lldb Version: 17.0.6 -Release: 2 +Release: 3 Summary: Next generation high-performance debugger License: NCSA @@ -59,16 +60,13 @@ The package contains the LLDB Python module. %build -mkdir -p _build -cd _build - # Python version detection is broken -LDFLAGS="%{__global_ldflags} -lpthread -ldl" +LDFLAGS="%{build_ldflags} -lpthread -ldl" CFLAGS="%{optflags} -Wno-error=format-security" CXXFLAGS="%{optflags} -Wno-error=format-security" -%cmake .. \ +%cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ @@ -95,11 +93,10 @@ CXXFLAGS="%{optflags} -Wno-error=format-security" -DLLVM_LIT_ARGS="-sv \ --path %{_libdir}/llvm" \ -make %{?_smp_mflags} +%cmake_build %install -cd _build -make install DESTDIR=%{buildroot} +%cmake_install # remove static libraries rm -fv %{buildroot}%{_libdir}/*.a @@ -112,11 +109,6 @@ ln -vsf "../../../${liblldb}" %{buildroot}%{python3_sitearch}/lldb/_lldb.so # remove bundled six.py rm -f %{buildroot}%{python3_sitearch}/six.* -%ldconfig_scriptlets - -%check - - %files %license LICENSE.TXT %{_bindir}/lldb* @@ -131,6 +123,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* Wed Nov 13 2024 Funda Wang - 17.0.6-3 +- adopt to new cmake macro + * Tue Aug 20 2024 liyunfei - 17.0.6-2 - Add BiSheng Autotuner support. diff --git a/lldb.yaml b/lldb.yaml index 7d98bd835f0acc97da741f20f900a6ebae1512c5..c7c50f6ac87dd806f0574c6b3a4fd97b11d3e479 100644 --- a/lldb.yaml +++ b/lldb.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: llvm/llvm-project tag_prefix: ^llvmorg- -seperator: . +separator: .