(no commit message)

diff --git a/cmakespecpatch b/cmakespecpatch
deleted file mode 100644 (file)
index ba7cf91..0000000
--- a/cmakespecpatch
+++ /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 8884ce9..86e5819 100644 (file)
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -1,7 +1,7 @@
 # https://download.copr.fedorainfracloud.org/results/jankratochvil/lldb/fedora-rawhide-x86_64/01574351-lldb-experimental/builder-live.log.gz
 # No space left on device.
 %global fast 1
-%global use_jankratochvil_dwz 1
+%global use_jankratochvil_dwz 0
 %global use_jankratochvil_rust 0
 %global pkg_prefix /opt/%{name}
 %global _unpackaged_files_terminate_build 0
@@ -14,7 +14,7 @@
 %endif
 Name: lldb-experimental
 Version: 12.0.0
-Release: 0.20201026snap5%{?dist}
+Release: 0.20201026snap6%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -104,6 +104,28 @@ 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!
+ sed -i -e 's/qt-gui /&--no-system-libarchive /' cmake.spec
+ 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