moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

vsrcextract: drop the heuristic to prefer tar over bsdtar

Browse source 
Only kexec-tools has problem with bsdtar, the heuristic is problematic
with those packages with tar in hostmakedepends
This commit is contained in:
Đoàn Trần Công Danh 2023-08-28 16:55:34 +07:00
parent baf23c3577
commit fe0d548527
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/environment/setup/archive.sh
View file

@ -26,15 +26,11 @@ vextract() {
esac esac
done done
local TAR_CMD sfx local TAR_CMD="${tar_cmd}"
local sfx
local archive="$1" local archive="$1"
local ret=0 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 bsdtar)"
[ -z "$TAR_CMD" ] && TAR_CMD="$(command -v tar)" [ -z "$TAR_CMD" ] && TAR_CMD="$(command -v tar)"
[ -z "$TAR_CMD" ] && msg_error "xbps-src: no suitable tar cmd (bsdtar, tar)\n" [ -z "$TAR_CMD" ] && msg_error "xbps-src: no suitable tar cmd (bsdtar, tar)\n"

2
srcpkgs/kexec-tools/template
View file

@ -18,6 +18,8 @@ case "$XBPS_TARGET_MACHINE" in
ppc-musl) nopie=yes;; # textrels not supported ppc-musl) nopie=yes;; # textrels not supported
esac esac
tar_cmd=tar
pre_build() { pre_build() {
rm ${XBPS_WRAPPERDIR}/strip rm ${XBPS_WRAPPERDIR}/strip
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in