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

Revert "xbps-src: multiple performance improvements."

Browse source 
This reverts commit 2a4e178e35.
This commit is contained in:
Jürgen Buchmüller 2019-07-05 12:08:45 +02:00
parent 3dc3a61144
commit 17ba00b095
13 changed files with 608 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

41
common/xbps-src/shutils/show.sh
View file

@ -61,22 +61,44 @@ show_avail() {
}
show_pkg_build_depends() {
local f x _pkgname _srcpkg found result
local f x _pkgname _srcpkg _dep found result
local _deps="$1"
result=$(mktemp) || exit 1
# build time deps
for f in ${_deps}; do
# ignore virtual deps
local _rpkg="${f%\?*}"
local _vpkg="${f#*\?}"
# ignore virtual dependencies
[[ ${f%\?*} != ${f#*\?} ]] && f=${f#*\?}
if [ "${_rpkg}" != "${_vpkg}" ]; then
f="${_vpkg}"
fi
unset found
# check for subpkgs
for x in ${subpackages}; do
[[ $f == $x ]] && found=1 && break
_pkgname="$($XBPS_UHELPER_CMD getpkgdepname $f 2>/dev/null)"
if [ -z "${_pkgname}" ]; then
_pkgname="$($XBPS_UHELPER_CMD getpkgname $f 2>/dev/null)"
fi
if [ "${_pkgname}" = "$x" ]; then
found=1
break
fi
done
[[ $found ]] && continue
_pkgname=${f/-32bit}
if [ -n "$found" ]; then
continue
fi
_pkgname="$($XBPS_UHELPER_CMD getpkgdepname $f 2>/dev/null)"
if [ -z "${_pkgname}" ]; then
_pkgname="$($XBPS_UHELPER_CMD getpkgname $f 2>/dev/null)"
fi
if [ -z "${_pkgname}" ]; then
_pkgname="$f"
fi
_pkgname=${_pkgname/-32bit}
_srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_pkgname})
_srcpkg=${_srcpkg##*/}
echo "${_srcpkg}" >> $result
@ -86,15 +108,18 @@ show_pkg_build_depends() {
}
show_pkg_build_deps() {
show_pkg_build_depends "${hostmakedepends} ${makedepends} $(setup_pkg_depends '' 1)"
setup_pkg_depends
show_pkg_build_depends "${host_build_depends} ${build_depends} ${run_depends}"
}
show_pkg_hostmakedepends() {
show_pkg_build_depends "${hostmakedepends}"
setup_pkg_depends
show_pkg_build_depends "${host_build_depends}"
}
show_pkg_makedepends() {
show_pkg_build_depends "${makedepends}"
setup_pkg_depends
show_pkg_build_depends "${build_depends}"
}
show_pkg_build_options() {