From 8545ccaff27d8095fbcbc11851d46536b50d9d3e Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 22 Jul 2020 10:49:07 +0200 Subject: [PATCH] --- lldb-experimental.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lldb-experimental.spec b/lldb-experimental.spec index 57c84cc..6c58f04 100644 --- a/lldb-experimental.spec +++ b/lldb-experimental.spec @@ -12,7 +12,7 @@ %endif Name: lldb-experimental Version: 11.0.0 -Release: 0.20200722snap0%{?dist} +Release: 0.20200722snap1%{?dist} Summary: Next generation high-performance debugger - experimental trunk snapshot License: NCSA URL: http://lldb.llvm.org/ @@ -25,6 +25,7 @@ BuildRequires: gcc-c++ git libedit-devel libatomic libxml2-devel zlib-devel valg 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 +BuildRequires: rh-git218-git-core # https://bugzilla.redhat.com/show_bug.cgi?id=1511892 %global __cmake /opt/rh/llvm-toolset-7/root/usr/bin/cmake3 %else @@ -64,6 +65,11 @@ The package contains header files for %{name}. %ldconfig_scriptlets %prep +%if 0%{?rhel:1} && 0%{?rhel} <= 7 +# git clone --depth 10000 --single-branch --reference ../reference https://github.com/llvm/llvm-project.git . +# fatal: git fetch-pack: expected shallow list +. /opt/rh/rh-git218/enable +%endif %setup -q -c -T OPTS="--depth 10000" %if !0%{?rhel:1} || 0%{?rhel} > 7 @@ -144,7 +150,11 @@ CXXFLAGS="$FLAGS" -DLLDB_DISABLE_LIBEDIT=OFF \ -DLLDB_DISABLE_PYTHON=OFF \ # +%if 0%{?rhel:1} && 0%{?rhel} <= 8 +%__cmake --build . -- %{?_smp_mflags} +%else %cmake_build +%endif %install mkdir -p %{buildroot}%{pkg_prefix} @@ -159,7 +169,11 @@ mkdir -p %{buildroot}%{pkg_prefix} revline . jankratochvil/rust %endif ) >%{buildroot}%{pkg_prefix}/HEAD +%if 0%{?rhel:1} && 0%{?rhel} <= 8 +DESTDIR="%{buildroot}" %__cmake --install . +%else %cmake_install +%endif mkdir -p %{buildroot}%{_bindir} # lldb-mi for i in lldb;do -- 1.8.3.1