mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-19 07:37:01 +02:00
vsrcextract: drop the heuristic to prefer tar over bsdtar
Only kexec-tools has problem with bsdtar, the heuristic is problematic with those packages with tar in hostmakedepends
This commit is contained in:
parent
baf23c3577
commit
fe0d548527
2 changed files with 4 additions and 6 deletions
|
@ -26,15 +26,11 @@ vextract() {
|
|||
esac
|
||||
done
|
||||
|
||||
local TAR_CMD sfx
|
||||
local TAR_CMD="${tar_cmd}"
|
||||
local sfx
|
||||
local archive="$1"
|
||||
local ret=0
|
||||
|
||||
# When tar is explicitly put *first* in hostmakedepends
|
||||
# Some packages require tar to build but not for extraction
|
||||
case "$hostmakedepends " in
|
||||
"tar "*) TAR_CMD="tar" ;;
|
||||
esac
|
||||
[ -z "$TAR_CMD" ] && TAR_CMD="$(command -v bsdtar)"
|
||||
[ -z "$TAR_CMD" ] && TAR_CMD="$(command -v tar)"
|
||||
[ -z "$TAR_CMD" ] && msg_error "xbps-src: no suitable tar cmd (bsdtar, tar)\n"
|
||||
|
|
|
@ -18,6 +18,8 @@ case "$XBPS_TARGET_MACHINE" in
|
|||
ppc-musl) nopie=yes;; # textrels not supported
|
||||
esac
|
||||
|
||||
tar_cmd=tar
|
||||
|
||||
pre_build() {
|
||||
rm ${XBPS_WRAPPERDIR}/strip
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
|
|
Loading…
Add table
Reference in a new issue