tar, bsdtar: use alternatives for usr/bin/tar.

GNU tar is now called gtar.

This will avoid the need to modify more templates
due to GNU vs BSD tar.
This commit is contained in:
Juan RP 2020-01-30 13:24:55 +01:00
parent 0501cbc62a
commit 7b663b891b
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
2 changed files with 6 additions and 3 deletions

View file

@ -1,7 +1,7 @@
# Template file for 'libarchive' # Template file for 'libarchive'
pkgname=libarchive pkgname=libarchive
version=3.4.1 version=3.4.1
revision=1 revision=2
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@ -28,6 +28,7 @@ post_install() {
} }
bsdtar_package() { bsdtar_package() {
alternatives="tar:tar:/usr/bin/bsdtar"
replaces="bsdcpio>=0" replaces="bsdcpio>=0"
short_desc="BSD utilities using libarchive" short_desc="BSD utilities using libarchive"
pkg_install() { pkg_install() {

View file

@ -1,9 +1,9 @@
# Template file for 'tar' # Template file for 'tar'
pkgname=tar pkgname=tar
version=1.32 version=1.32
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
configure_args="gl_cv_struct_dirent_d_ino=yes" configure_args="--program-prefix=g gl_cv_struct_dirent_d_ino=yes"
makedepends="acl-devel" makedepends="acl-devel"
short_desc="GNU tape archiver with remote magnetic tape support" short_desc="GNU tape archiver with remote magnetic tape support"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
@ -12,6 +12,8 @@ homepage="https://www.gnu.org/software/tar/"
distfiles="${GNU_SITE}/tar/${pkgname}-${version}.tar.xz" distfiles="${GNU_SITE}/tar/${pkgname}-${version}.tar.xz"
checksum=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 checksum=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8
alternatives="tar:tar:/usr/bin/gtar"
pre_configure() { pre_configure() {
# chroot-style=ethereal # chroot-style=ethereal
export FORCE_UNSAFE_CONFIGURE=1 export FORCE_UNSAFE_CONFIGURE=1