X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=b51dc94b72ed8c2225f0afc21897e5c8c9a251ab;hp=bed88233ea6ebdca0c461f8cc932fe77d03ac893;hb=f6ba21e16e5aec08ea1e7aa393e793181347f2c9;hpb=829ce8864bd00a42e40114d8cf600488bac9f0ff

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index bed8823..b51dc94 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -12,28 +12,29 @@
 %endif
 Name: lldb-experimental
 Version: 11.0.0
-Release: 0.20200424snap3%{?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 swig 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
 BuildRequires: llvm-toolset-7-cmake devtoolset-8-gcc-c++ python-devel python2-pyyaml
+# swig on rhel7: /builddir/build/BUILD/lldb-experimental-11.0.0/lldb/bindings/./python/python-typemaps.swig:496: Error: Syntax error in input(3).
+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
 %endif
-BuildRequires: cmake
+BuildRequires: cmake swig
 BuildRequires: python3-devel python3-pygments python3-pyyaml
 # removed in F31+
 #BuildRequires: xar-devel
-%global ninjabuild ninja
 %endif
 
 %description
@@ -70,9 +71,10 @@ OPTS="--depth 10000"
 %endif
 REF="reference"
 # RHEL-7 does not support: --reference-if-able
-test -d ../$REF/ && OPTS="$OPTS --reference ../$REF"
+CLONEOPTS="--single-branch"
+test -d ../$REF/ && CLONEOPTS="$CLONEOPTS --reference ../$REF"
 # 2500 = 1 month in 2019
-git clone --single-branch $OPTS https://github.com/llvm/llvm-project.git .
+git clone $OPTS $CLONEOPTS https://github.com/llvm/llvm-project.git .
 %if %{use_jankratochvil_dwz} || %{use_jankratochvil_rust}
 git remote remove jankratochvil || :
 #git remote add jankratochvil git://git.jankratochvil.net/lldb
@@ -89,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
@@ -123,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}
@@ -145,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}
@@ -160,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