From: Jan Kratochvil Date: Mon, 26 Oct 2020 17:25:48 +0000 (+0100) Subject: (no commit message) X-Git-Url: http://git.jankratochvil.net/?p=lldb-experimental.git;a=commitdiff_plain;h=0e8165a16915565fcc2cde9b21d14407554aa371;hp=bdb07bb89b956fff28fab80bdf154df7d472ca4b --- diff --git a/cmake.spec.patch b/cmake.spec.patch deleted file mode 100644 index ba7cf91..0000000 --- a/cmake.spec.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake-3.17.0-1.fc32.src.rpm.d/cmake.spec-orig 2020-03-25 14:26:04.000000000 +0100 -+++ cmake-3.17.0-1.fc32.src.rpm.d/cmake.spec 2020-10-26 16:37:18.372185178 +0100 -@@ -289,6 +289,7 @@ $SRCDIR/bootstrap --prefix=%{_prefix} -- - --sphinx-build=%{_bindir}/false \ - %endif - --%{!?with_gui:no-}qt-gui \ -+ --no-system-libarchive \ - ; - popd - %make_build -C %{_vpath_builddir} VERBOSE=1 diff --git a/lldb-experimental.spec b/lldb-experimental.spec index 52b3575..983fe00 100644 --- a/lldb-experimental.spec +++ b/lldb-experimental.spec @@ -14,7 +14,7 @@ %endif Name: lldb-experimental Version: 12.0.0 -Release: 0.20201026snap2%{?dist} +Release: 0.20201026snap3%{?dist} Summary: Next generation high-performance debugger - experimental trunk snapshot License: NCSA URL: http://lldb.llvm.org/ @@ -104,28 +104,6 @@ The package contains header files for %{name}. # ../lldb/CMakeLists.txt:28 (include) . /opt/rh/rh-python38/enable %endif -%if 0%{?rhel} == 8 -cmakesrc=cmake-3.17.0-1.fc32.src.rpm -rm -rf $cmakesrc $cmakesrc.tgz $cmakesrc.d -wget http://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/32/Everything/source/tree/Packages/c/$cmakesrc -rpm2archive $cmakesrc -(mkdir $cmakesrc.d - cd $cmakesrc.d - tar xzf ../$cmakesrc.tgz - # FIXME: Why? - for i in .[a-z]*;do mv $i `echo $i|sed 's/^\.//'`;done - # -- Could NOT find LibArchive: Found unsuitable version "3.3.2", but required is at least "3.3.3" (found /usr/lib64/libarchive.so) - # CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found! - patch -p1 <../cmake.spec.patch - rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" -bc cmake.spec -) -%global __cmake %(echo %{_builddir}/cmake-*.d/cmake-*/*/bin/cmake) -%global __cmake_builddir . -%global cmake_build \ - %__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose -%global cmake_install \ - DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" -%endif %setup -q -c -T OPTS="--depth 10000" %if !0%{?rhel:1} || 0%{?rhel} > 7