PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

shutils/show.sh: never show self deps for depends

Browse Source 
xbps-src always ignore self deps in depends and in hostmakedepends
when not cross compiling. The old behaviour did only check for cross.
This now also ignores them in makedepends, but they are either way
disallowed in there, and returning an error would be correct, but
./xbps-src show-* is and never was suitable for linting, so ignore for now.
This commit is contained in:
John 2020-12-31 15:49:51 +01:00 committed by John Zimmermann
parent d9e68a2989
commit 5884118e3a
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
common/xbps-src/shutils/show.sh
View File

@ -76,48 +76,59 @@ show_avail() {
check_pkg_arch "$XBPS_CROSS_BUILD" 2>/dev/null check_pkg_arch "$XBPS_CROSS_BUILD" 2>/dev/null
} }
show_eval_dep() {
local f x _pkgname _srcpkg found
local _dep="$1"
local _host="$2"
if [ -z "$CROSS_BUILD" ] || [ -z "$_host" ]; then
# ignore dependency on itself
[[ $_dep == $sourcepkg ]] && return
fi
if [ ! -f $XBPS_SRCPKGDIR/$_dep/template ]; then
msg_error "$pkgver: dependency '$_dep' does not exist!\n"
fi
# ignore virtual dependencies
[[ ${_dep%\?*} != ${_dep#*\?} ]] && _dep=${_dep#*\?}
unset found
# check for subpkgs
for x in ${subpackages}; do
[[ $_dep == $x ]] && found=1 && break
done
[[ $found ]] && return
_pkgname=${_dep/-32bit}
_srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_pkgname})
_srcpkg=${_srcpkg##*/}
echo $_srcpkg
}
show_pkg_build_depends() { show_pkg_build_depends() {
local f x _pkgname _srcpkg found result local f result
local _deps="$1" local _deps="$1"
local _hostdeps="$2"
result=$(mktemp) || exit 1 result=$(mktemp) || exit 1
# build time deps # build time deps
for f in ${_deps}; do for f in ${_deps}; do
if [ -z "$CROSS_BUILD" ]; then show_eval_dep $f "" >> $result
# ignore dependency on itself done
[[ $f == $sourcepkg ]] && continue for f in ${_hostdeps}; do
fi show_eval_dep $f "hostdep" >> $result
if [ ! -f $XBPS_SRCPKGDIR/$f/template ]; then
msg_error "$pkgver: dependency '$f' does not exist!\n"
fi
# ignore virtual dependencies
[[ ${f%\?*} != ${f#*\?} ]] && f=${f#*\?}
unset found
# check for subpkgs
for x in ${subpackages}; do
[[ $f == $x ]] && found=1 && break
done
[[ $found ]] && continue
_pkgname=${f/-32bit}
_srcpkg=$(readlink -f ${XBPS_SRCPKGDIR}/${_pkgname})
_srcpkg=${_srcpkg##*/}
echo "${_srcpkg}" >> $result
done done
sort -u $result sort -u $result
rm -f $result rm -f $result
} }
show_pkg_build_deps() { show_pkg_build_deps() {
show_pkg_build_depends "${hostmakedepends} ${makedepends} $(setup_pkg_depends '' 1 1)" show_pkg_build_depends "${makedepends} $(setup_pkg_depends '' 1 1)" "${hostmakedepends}"
} }
show_pkg_hostmakedepends() { show_pkg_hostmakedepends() {
show_pkg_build_depends "${hostmakedepends}" show_pkg_build_depends "" "${hostmakedepends}"
} }
show_pkg_makedepends() { show_pkg_makedepends() {
show_pkg_build_depends "${makedepends}" show_pkg_build_depends "${makedepends}" ""
} }
show_pkg_build_options() { show_pkg_build_options() {