From 0faa0b7801700706bbea0bacb5c6a27bcb55c2fd Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Mon, 19 Dec 2022 21:19:57 +0000
Subject: libarchive: revert back to cmake build, set CFLAG for multithreaded
 xz compression

---
 libarchive/.signature |  4 ++--
 libarchive/Pkgfile    | 27 ++++++++++++---------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/libarchive/.signature b/libarchive/.signature
index a68916bb..5cf2218e 100644
--- a/libarchive/.signature
+++ b/libarchive/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqiBEghaKFfOWIMFDIk55jGu0m1Kcd/HqpI9Szd3DFotJzCI1sOaFMb58efcqIbF2UxepoQJpcecggt8Wzs3tAQw=
-SHA256 (Pkgfile) = b36a7330c8937605ff43cc65d730218e29dfc5ac07eb3de843b2c981d97ec122
+RWRJc1FUaeVeqqe3N1mHoZZ3BzKg6rkyzjgJC8TYnRonYRan41kkJwDzyPYLTQsUAIybHqfEzurFcIWK4RhKu6jTmmQoju1x9gE=
+SHA256 (Pkgfile) = 39957b1d0756d66e12450ee8edfe970d321b9e1d4cd97c6eea942c985e3cd32b
 SHA256 (.footprint) = 4657ae77d65c936340a13fe44364b76415797a9dd258d7ba2b6798923f9ab2c8
 SHA256 (libarchive-3.6.2.tar.xz) = 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d
diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile
index 9b5c0c52..f9e9622a 100644
--- a/libarchive/Pkgfile
+++ b/libarchive/Pkgfile
@@ -5,22 +5,19 @@
 
 name=libarchive
 version=3.6.2
-release=2
+release=3
 source=(https://github.com/libarchive/libarchive/releases/download/v$version/$name-$version.tar.xz)
 
 build() {
-	cd $name-$version
-
-	# We're passing --without-xml2, --without-nettle and --without-libb2
-	# to avoid linking to libraries which are only available in opt.
-
-	./configure \
-		--prefix=/usr \
-		--without-iconv \
-		--without-xml2 \
-		--without-nettle \
-		--without-libb2
-
-	make
-	make DESTDIR=$PKG install
+	cmake -S $name-$version -B build -G Ninja \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DHAVE_LZMA_STREAM_ENCODER_MT=1" \
+		-D ENABLE_TAR_SHARED=ON \
+		-D ENABLE_LIBB2=OFF \
+		-D ENABLE_LIBXML2=OFF \
+		-D ENABLE_NETTLE=OFF \
+		-Wno-dev
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
 }
-- 
cgit v1.2.3