X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=2051dcf8092e2f8118d41376fd12394bbd6bc539;hp=6c58f04aa042dad59be256b567bfab58f34a8e95;hb=7bf987842cc0c4c61188ad18d8512a5b29c2222b;hpb=8545ccaff27d8095fbcbc11851d46536b50d9d3e

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 6c58f04..2051dcf 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -12,11 +12,12 @@
 %endif
 Name: lldb-experimental
 Version: 11.0.0
-Release: 0.20200722snap1%{?dist}
+Release: 0.20200723snap0%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
-Patch1: cmake-old.patch
+Patch1: cmake-old1.patch
+Patch2: cmake-old2.patch
 ExclusiveArch: x86_64
 BuildRequires: gcc-c++ git libedit-devel libatomic libxml2-devel zlib-devel valgrind-devel libpfm-devel
 # https://src.fedoraproject.org/rpms/epydoc
@@ -97,7 +98,8 @@ git merge jankratochvil/dwz
 # '-c merge.renameLimit=0' has no effect.
 git -c merge.renameLimit=1 merge jankratochvil/rust
 %endif
-%patch1 -p1
+%patch2 -p1 -R
+%patch1 -p1 -R
 
 %build
 FLAGS="%{optflags}"
@@ -118,7 +120,7 @@ FLAGS="$FLAGS -g0"
 # -fno-reorder-blocks-and-partition:
 # -gsplit-dwarf: Error: can't resolve `.text.unlikely' - `.LVL414'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1573647
-FLAGS="$FLAGS -gsplit-dwarf -fno-reorder-blocks-and-partition"
+FLAGS="$FLAGS -fdebug-types-section"
 %endif
 
 CFLAGS="$FLAGS"
@@ -170,7 +172,8 @@ mkdir -p %{buildroot}%{pkg_prefix}
 %endif
 ) >%{buildroot}%{pkg_prefix}/HEAD
 %if 0%{?rhel:1} && 0%{?rhel} <= 8
-DESTDIR="%{buildroot}" %__cmake --install .
+# It runs a new configure without installing anything: DESTDIR="%{buildroot}" #__cmake --install .
+%make_install
 %else
 %cmake_install
 %endif