snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps-src: break out of following cyclic dependencies

This commit is contained in:
Piotr Wójcik 2020-04-14 20:04:31 +02:00 committed by Piotr
parent eb13aa8bcc
commit 6cd3bd1806
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/xbps-src/libexec/build.sh
View File

@ -26,6 +26,12 @@ for f in $XBPS_SHUTILSDIR/*.sh; do
. $f . $f
done done
last="${XBPS_DEPENDS_CHAIN##*,}"
case "$XBPS_DEPENDS_CHAIN" in
*,$last,*)
msg_error "Build-time cyclic dependency$last,${XBPS_DEPENDS_CHAIN##*,$last,} detected.\n"
esac
setup_pkg "$PKGNAME" $XBPS_CROSS_BUILD setup_pkg "$PKGNAME" $XBPS_CROSS_BUILD
readonly SOURCEPKG="$sourcepkg" readonly SOURCEPKG="$sourcepkg"

6
common/xbps-src/shutils/build_dependencies.sh
View File

@ -369,7 +369,7 @@ install_pkg_deps() {
( (
curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null) curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null)
setup_pkg $curpkgdepname setup_pkg $curpkgdepname
exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 \ exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 XBPS_DEPENDS_CHAIN="$XBPS_DEPENDS_CHAIN, $sourcepkg(host)" \
$XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross_prepare || exit $? $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross_prepare || exit $?
) || exit $? ) || exit $?
host_binpkg_deps+=("$i") host_binpkg_deps+=("$i")
@ -382,7 +382,7 @@ install_pkg_deps() {
curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null) curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null)
setup_pkg $curpkgdepname $cross setup_pkg $curpkgdepname $cross
exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 \ exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 XBPS_DEPENDS_CHAIN="$XBPS_DEPENDS_CHAIN, $sourcepkg(${cross:-host})" \
$XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $? $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $?
) || exit $? ) || exit $?
binpkg_deps+=("$i") binpkg_deps+=("$i")
@ -400,7 +400,7 @@ install_pkg_deps() {
fi fi
fi fi
setup_pkg $curpkgdepname $cross setup_pkg $curpkgdepname $cross
exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 \ exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 XBPS_DEPENDS_CHAIN="$XBPS_DEPENDS_CHAIN, $sourcepkg(${cross:-host})" \
$XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $? $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $?
) || exit $? ) || exit $?
done done