(no commit message)

diff --git a/cmake-old.patch b/cmake-old.patch
new file mode 100644 (file)
index 0000000..c6493ce
--- /dev/null
+++ b/cmake-old.patch
@@ -0,0 +1,35 @@
+revert:
+
+commit 1d3f61f8a799489f7f4d81e46d9e6b31a954ea4e
+Author: Louis Dionne <ldionne@apple.com>
+Date:   Wed Apr 22 11:16:27 2020 -0400
+
+    [CMake] Enforce the minimum CMake version to be at least 3.13.4
+    
+    This commit changes the warning for CMake < 3.13.4 into a fatal error.
+    The intent is to revert and re-apply this simple commit until all build
+    bots are migrated to CMake >= 3.13.4.
+    
+    This is part of the effort discussed on llvm-dev here:
+    
+            http://lists.llvm.org/pipermail/llvm-dev/2020-April/140578.html
+    
+    Differential Revision: https://reviews.llvm.org/D78646
+
+--- a/llvm/CMakeLists.txt
++++ b/llvm/CMakeLists.txt
+@@ -3,9 +3,11 @@
+ cmake_minimum_required(VERSION 3.4.3)
+ 
+ if ("${CMAKE_VERSION}" VERSION_LESS "3.13.4")
+-  message(FATAL_ERROR
+-    "Your CMake version is ${CMAKE_VERSION}. The minimum version of CMake "
+-    "required to build LLVM is now 3.13.4.")
++  message(WARNING
++    "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 12.0.0, the "
++    "minimum version of CMake required to build LLVM will become 3.13.4, and "
++    "using an older CMake will become an error. Please upgrade your CMake to "
++    "at least 3.13.4 now to avoid issues in the future!")
+ endif()
+ 
+ if(POLICY CMP0068)

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 62c963a..b51dc94 100644 (file)
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -12,12 +12,13 @@
 %endif
 Name: lldb-experimental
 Version: 11.0.0
-Release: 0.20200721snap0%{?dist}
+Release: 0.20200721snap1%{?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,8 @@ CXXFLAGS="$FLAGS"
   -DLLDB_DISABLE_LIBEDIT=OFF \
   -DLLDB_DISABLE_PYTHON=OFF \
   #
-%{ninjabuild} -v
+cd *-redhat-linux-gnu
+%make_build
 
 %install
 mkdir -p %{buildroot}%{pkg_prefix}
@@ -163,8 +163,8 @@ mkdir -p %{buildroot}%{pkg_prefix}
  revline . jankratochvil/rust
 %endif
 ) >%{buildroot}%{pkg_prefix}/HEAD
-cd build-release
-%{ninjabuild} -v install
+cd build-release/*-redhat-linux-gnu
+%make_install
 mkdir -p %{buildroot}%{_bindir}
 # lldb-mi
 for i in lldb;do