libarchive: switch to CMake

Allows simplifying the Makefile. Also faster compilation.

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile
index 819ecc64664bce4242af9f4191cfb559e90e91f3..085fca2d2fbe7bb90707a622b7a916063ee60de4 100644 (file)
--- a/libs/libarchive/Makefile
+++ b/libs/libarchive/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libarchive
 PKG_VERSION:=3.4.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.libarchive.org/downloads
@@ -20,10 +20,10 @@ PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:libarchive:libarchive
 
-PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libarchive/Default
   SECTION:=libs
@@ -71,24 +71,38 @@ define Package/bsdtar/description
   archives compressed with gzip, bzip2, lzip, xz, lzma or compress.
 endef
 
-CONFIGURE_ARGS += \
-       --enable-bsdtar=shared \
-       --disable-bsdcpio \
-       --disable-rpath \
-       --disable-acl \
-       --disable-xattr \
-       --without-cng \
-       --without-iconv \
-       --without-lz4 \
-       --without-lzo2 \
-       --without-nettle \
-       --without-xml2 \
-       --without-zstd
+CMAKE_OPTIONS += \
+       -DENABLE_MBEDTLS=OFF \
+       -DENABLE_NETTLE=OFF \
+       -DENABLE_LIBB2=OFF \
+       -DENABLE_LZ4=OFF \
+       -DENABLE_LZO=OFF \
+       -DENABLE_LZMA=ON \
+       \
+       -DENABLE_ZSTD=OFF \
+       -DENABLE_ZLIB=ON \
+       -DENABLE_BZip2=ON \
+       -DENABLE_LIBXML2=OFF \
+       -DENABLE_EXPAT=ON \
+       -DENABLE_PCREPOSIX=OFF \
+       -DENABLE_LibGCC=OFF \
+       -DENABLE_CNG=OFF \
+       \
+       -DENABLE_TAR=ON \
+       -DENABLE_TAR_SHARED=ON \
+       -DENABLE_CPIO=OFF \
+       -DENABLE_CAT=OFF \
+       -DENABLE_XATTR=OFF \
+       -DENABLE_ACL=OFF \
+       -DENABLE_ICONV=OFF \
+       -DENABLE_TEST=OFF \
+       -DENABLE_COVERAGE=OFF \
+       -DENABLE_INSTALL=ON
 
 ifeq ($(BUILD_VARIANT),noopenssl)
-       CONFIGURE_ARGS += --without-openssl
+       CMAKE_OPTIONS += -DENABLE_OPENSSL=OFF
 else
-       CONFIGURE_ARGS += --with-openssl
+       CMAKE_OPTIONS += -DENABLE_OPENSSL=ON
 endif
 
 define Build/InstallDev