From 4d3f3059a3244affbb21e0161014bccdb0a6d683 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 Feb 2013 17:07:55 +0100 Subject: [PATCH] libarchive: make this cross buildable. --- srcpkgs/libarchive/bsdcpio.template | 24 ------------------- srcpkgs/libarchive/bsdtar.template | 25 -------------------- srcpkgs/libarchive/libarchive-devel.template | 12 ++++------ srcpkgs/libarchive/template | 24 ++++++++++++------- 4 files changed, 19 insertions(+), 66 deletions(-) diff --git a/srcpkgs/libarchive/bsdcpio.template b/srcpkgs/libarchive/bsdcpio.template index 3f0d112bcc..58bfa0d418 100644 --- a/srcpkgs/libarchive/bsdcpio.template +++ b/srcpkgs/libarchive/bsdcpio.template @@ -1,30 +1,6 @@ # Template file for 'bsdcpio'. # short_desc="BSD cpio(1) using libarchive" -long_desc=" - This package provides an interface similar to cpio(1), but using libarchive - as the backend for the archiving and extraction of data. It can read CPIO, - tar, pax, zip, jar, ar, and ISO9660 images and provides similar features to - the bsdtar package. Features include: - - * Automatic format detection. Libarchive automatically detects the - compression (none/gzip/bzip2) and format (old tar, ustar, gnutar, - pax, cpio, iso9660, zip) when reading archives. It does this for - any data source. - - * Pax Interchange Format Support. This is a POSIX/SUSv3 extension to - the old \"ustar\" tar format that adds arbitrary extended attributes - to each entry. Does everything that GNU tar format does, only - better. - - * Handles file flags, ACLs, arbitrary pathnames, etc. Pax interchange - format supports key/value attributes using an easily-extensible - technique. Arbitrary pathnames, group names, user names, file sizes - are part of the POSIX standard; libarchive extends this with - support for file flags, ACLs, and arbitrary device numbers. - - * GNU tar support. Libarchive reads most GNU tar archives. If there - is demand, this can be improved further." do_install() { vmove usr/bin usr diff --git a/srcpkgs/libarchive/bsdtar.template b/srcpkgs/libarchive/bsdtar.template index 726888c046..257a47c6f1 100644 --- a/srcpkgs/libarchive/bsdtar.template +++ b/srcpkgs/libarchive/bsdtar.template @@ -1,31 +1,6 @@ # Template file for 'bsdtar'. # short_desc="BSD tar(1) using libarchive" -long_desc=" - The bsdtar program has a number of advantages over previous tar - implementations: - - * Library. Since the core functionality is in a library, it can be - used by other tools, such as pkg_add. - - * Automatic format detection. Libarchive automatically detects the - compression (none/gzip/bzip2) and format (old tar, ustar, gnutar, - pax, cpio, iso9660, zip) when reading archives. It does this for - any data source. - - * Pax Interchange Format Support. This is a POSIX/SUSv3 extension to - the old \"ustar\" tar format that adds arbitrary extended attributes - to each entry. Does everything that GNU tar format does, only - better. - - * Handles file flags, ACLs, arbitrary pathnames, etc. Pax interchange - format supports key/value attributes using an easily-extensible - technique. Arbitrary pathnames, group names, user names, file sizes - are part of the POSIX standard; libarchive extends this with - support for file flags, ACLs, and arbitrary device numbers. - - * GNU tar support. Libarchive reads most GNU tar archives. If there - is demand, this can be improved further." do_install() { vmove usr/bin/bsdtar usr/bin diff --git a/srcpkgs/libarchive/libarchive-devel.template b/srcpkgs/libarchive/libarchive-devel.template index c859feb506..434147d49e 100644 --- a/srcpkgs/libarchive/libarchive-devel.template +++ b/srcpkgs/libarchive/libarchive-devel.template @@ -1,14 +1,10 @@ # Template file for 'libarchive-devel'. # -depends="acl-devel zlib-devel bzip2-devel liblzma-devel openssl-devel expat-devel libarchive" -short_desc="${sourcepkg} development files" -long_desc="${long_desc} +depends="acl-devel zlib-devel bzip2-devel liblzma-devel + openssl-devel expat-devel libarchive>=${version}" +short_desc="${short_desc} -- development files" - This package contains files for development, headers, static libs, etc." - - -do_install() -{ +do_install() { vmove usr/include usr vmove "usr/lib/*.a" usr/lib vmove usr/lib/pkgconfig usr/lib diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 09610e3c56..1d3df52507 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,21 +1,27 @@ # Template file for 'libarchive' pkgname=libarchive version=3.0.4 -distfiles="https://github.com/downloads/libarchive/libarchive/libarchive-$version.tar.gz" +revision=2 +subpackages="bsdtar bsdcpio $pkgname-devel" build_style=gnu-configure configure_args="--without-xml2 --without-nettle" -makedepends="zlib-devel acl-devel openssl-devel liblzma-devel expat-devel" -revision=1 +makedepends="acl-devel openssl-devel liblzma-devel expat-devel" short_desc="Library to read/write several different streaming archive formats" maintainer="Juan RP " homepage="http://libarchive.github.com/" license="BSD" +distfiles="https://github.com/downloads/libarchive/libarchive/libarchive-$version.tar.gz" checksum=76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac -long_desc=" - Libarchive is a programming library that can create and read several - different streaming archive formats, including most popular tar variants, - several cpio formats, and both BSD and GNU ar variants. It can also write - shar archives and read ISO9660 CDROM images and ZIP archives." -subpackages="bsdtar bsdcpio $pkgname-devel" +if [ -n "${XBPS_CROSS_TRIPLET}" ]; then + makedepends="automake" +fi +crossmakedepends="zlib-devel bzip2-devel acl-devel openssl-devel liblzma-devel expat-devel" +pre_configure() { + ./build/autogen.sh +} + +pre_build() { + rm -f /usr/${XBPS_CROSS_TRIPLET}/lib/*.la +}