X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=2b090a966c702164bfa07ce38b813fe5deb065c8;hp=175fdfffed66debb686c396bbaaa09e6a2a4e4df;hb=6a85fe7b14e34db5aac7fa905c32358c02ec9812;hpb=13999e6629314adc20c14472b919b9857ea11e9e

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 175fdff..2b090a9 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -12,12 +12,13 @@
 %endif
 Name: lldb-experimental
 Version: 11.0.0
-Release: 0.20200704snap0%{?dist}
+Release: 0.20200721snap2%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
+Patch1: cmake-old.patch
 ExclusiveArch: x86_64
-BuildRequires: gcc-c++ git libedit-devel libatomic ninja-build libxml2-devel zlib-devel valgrind-devel libpfm-devel
+BuildRequires: gcc-c++ git libedit-devel libatomic libxml2-devel zlib-devel valgrind-devel libpfm-devel
 # https://src.fedoraproject.org/rpms/epydoc
 #BuildRequires: epydoc
 %if 0%{?rhel:1} && 0%{?rhel} <= 7
@@ -26,7 +27,6 @@ BuildRequires: llvm-toolset-7-cmake devtoolset-8-gcc-c++ python-devel python2-py
 BuildRequires: swig3
 # https://bugzilla.redhat.com/show_bug.cgi?id=1511892
 %global __cmake /opt/rh/llvm-toolset-7/root/usr/bin/cmake3
-%global ninjabuild ninja-build
 %else
 %if !0%{?rhel:1} || 0%{?rhel} > 8
 BuildRequires: z3-devel
@@ -35,7 +35,6 @@ BuildRequires: cmake swig
 BuildRequires: python3-devel python3-pygments python3-pyyaml
 # removed in F31+
 #BuildRequires: xar-devel
-%global ninjabuild ninja
 %endif
 
 %description
@@ -92,6 +91,7 @@ git merge jankratochvil/dwz
 # '-c merge.renameLimit=0' has no effect.
 git -c merge.renameLimit=1 merge jankratochvil/rust
 %endif
+%patch1 -p1
 
 %build
 mkdir build-release
@@ -126,7 +126,6 @@ CXXFLAGS="$FLAGS"
 # -fdebug-types-section && -DLLVM_USE_LINKER=gold:
 # ../../../../lib64/libclangLex.a(PreprocessingRecord.cpp.o)(.debug_types+0xfe): error: undefined reference to 'clang::SourceRange::getBegin() const'
 %cmake ../llvm \
-  -GNinja \
   -DCMAKE_INSTALL_PREFIX=%{buildroot}%{pkg_prefix} \
   -DBUILD_SHARED_LIBS=OFF \
 %if %{fast}
@@ -148,7 +147,9 @@ CXXFLAGS="$FLAGS"
   -DLLDB_DISABLE_LIBEDIT=OFF \
   -DLLDB_DISABLE_PYTHON=OFF \
   #
-%{ninjabuild} -v
+# Only Rawhide cmake creates this subdirectory.
+cd *-redhat-linux-gnu || :
+%make_build
 
 %install
 mkdir -p %{buildroot}%{pkg_prefix}
@@ -164,7 +165,9 @@ mkdir -p %{buildroot}%{pkg_prefix}
 %endif
 ) >%{buildroot}%{pkg_prefix}/HEAD
 cd build-release
-%{ninjabuild} -v install
+# Only Rawhide cmake creates this subdirectory.
+cd *-redhat-linux-gnu || :
+%make_install
 mkdir -p %{buildroot}%{_bindir}
 # lldb-mi
 for i in lldb;do