Merge pull request #12714 from neheb/arch

libarchive: switch to CMake
This commit is contained in:
Rosen Penev 2020-07-07 15:32:05 -07:00 committed by GitHub
commit 6b971e36ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libarchive PKG_NAME:=libarchive
PKG_VERSION:=3.4.3 PKG_VERSION:=3.4.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.libarchive.org/downloads PKG_SOURCE_URL:=https://www.libarchive.org/downloads
@ -20,10 +20,10 @@ PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:libarchive:libarchive PKG_CPE_ID:=cpe:/a:libarchive:libarchive
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/libarchive/Default define Package/libarchive/Default
SECTION:=libs SECTION:=libs
@ -71,24 +71,38 @@ define Package/bsdtar/description
archives compressed with gzip, bzip2, lzip, xz, lzma or compress. archives compressed with gzip, bzip2, lzip, xz, lzma or compress.
endef endef
CONFIGURE_ARGS += \ CMAKE_OPTIONS += \
--enable-bsdtar=shared \ -DENABLE_MBEDTLS=OFF \
--disable-bsdcpio \ -DENABLE_NETTLE=OFF \
--disable-rpath \ -DENABLE_LIBB2=OFF \
--disable-acl \ -DENABLE_LZ4=OFF \
--disable-xattr \ -DENABLE_LZO=OFF \
--without-cng \ -DENABLE_LZMA=ON \
--without-iconv \ \
--without-lz4 \ -DENABLE_ZSTD=OFF \
--without-lzo2 \ -DENABLE_ZLIB=ON \
--without-nettle \ -DENABLE_BZip2=ON \
--without-xml2 \ -DENABLE_LIBXML2=OFF \
--without-zstd -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) ifeq ($(BUILD_VARIANT),noopenssl)
CONFIGURE_ARGS += --without-openssl CMAKE_OPTIONS += -DENABLE_OPENSSL=OFF
else else
CONFIGURE_ARGS += --with-openssl CMAKE_OPTIONS += -DENABLE_OPENSSL=ON
endif endif
define Build/InstallDev define Build/InstallDev