OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3606 from diizzyy/patch-25 

libs/libarchive: Update to 3.2.2 and add bsdtar
This commit is contained in:
Hannu Nyman 2016-12-02 00:13:35 +02:00 committed by GitHub
parent c64a84937e 2121d6595e
commit 24cfec62e9
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/libarchive/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libarchive PKG_NAME:=libarchive
PKG_VERSION:=3.1.2 PKG_VERSION:=3.2.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.libarchive.org/downloads PKG_SOURCE_URL:=http://www.libarchive.org/downloads
PKG_MD5SUM:=efad5a503f66329bb9d2f4308b5de98a PKG_MD5SUM:=691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f
PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de> PKG_MAINTAINER:=Johannes Morgenroth <morgenroth@ibr.cs.tu-bs.de>
PKG_LICENSE:=BSD-2-Clause PKG_LICENSE:=BSD-2-Clause
@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)/Default define Package/$(PKG_NAME)/Default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+zlib DEPENDS:=+zlib +liblzma +libbz2 +libexpat
TITLE:=Multi-format archive and compression library TITLE:=Multi-format archive and compression library
URL:=http://www.libarchive.org/ URL:=http://www.libarchive.org/
endef endef
@ -41,18 +41,30 @@ define Package/$(PKG_NAME)-noopenssl
VARIANT:=noopenssl VARIANT:=noopenssl
endef endef
define Package/bsdtar
SECTION:=utils
CATEGORY:=Utilities
SUBMENU:=Compression
DEPENDS:=+libarchive-noopenssl
TITLE:=BSD variant that supports various file compression formats
URL:=http://www.libarchive.org/
endef
define Package/bsdtar/description
Reads a variety of formats including tar, pax, zip, xar, lha, ar,
cab, mtree, rar, warc, 7z and ISO images. Writes tar, pax, zip,
xar, ar, ISO, mtree and shar archives. Automatically handles
archives compressed with gzip, bzip2, lzip, xz, lzma or compress.
endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-bsdcpio \ --disable-bsdcpio \
--disable-bsdtar \ --enable-bsdtar=shared \
--disable-acl \ --disable-acl \
--disable-xattr \ --disable-xattr \
--without-bz2lib \
--without-lzma \
--without-lzmadec \
--without-lzo2 \ --without-lzo2 \
--without-nettle \ --without-nettle \
--without-expat \ --without-xml2 \
--without-xml2
ifeq ($(BUILD_VARIANT),noopenssl) ifeq ($(BUILD_VARIANT),noopenssl)
CONFIGURE_ARGS += --without-openssl CONFIGURE_ARGS += --without-openssl
@ -71,7 +83,14 @@ define Package/libarchive/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
endef endef
define Package/bsdtar/install
$(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/bsdtar $(1)/usr/bin
endef
Package/$(PKG_NAME)-noopenssl/install = $(Package/$(PKG_NAME)/install) Package/$(PKG_NAME)-noopenssl/install = $(Package/$(PKG_NAME)/install)
$(eval $(call BuildPackage,libarchive)) $(eval $(call BuildPackage,libarchive))
$(eval $(call BuildPackage,libarchive-noopenssl)) $(eval $(call BuildPackage,libarchive-noopenssl))
$(eval $(call BuildPackage,bsdtar))