Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xbps-src: work around autodeps removal needing multiple passes #15679

Merged
merged 1 commit into from
Oct 25, 2019
Merged

xbps-src: work around autodeps removal needing multiple passes #15679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions common/xbps-src/shutils/cross.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# vim: set ts=4 sw=4 et:

remove_pkg_cross_deps() {
local rval= tmplogf=
local rval= tmplogf= prevs=0
[ -z "$XBPS_CROSS_BUILD" ] && return 0

cd $XBPS_MASTERDIR || return 1
Expand All @@ -14,7 +14,18 @@ remove_pkg_cross_deps() {
fi

$XBPS_REMOVE_XCMD -Ryo > $tmplogf 2>&1
if [ $? -ne 0 ]; then
rval=$?
while [ $rval -eq 0 ]; do
local curs=$(stat -c %s $tmplogf)
if [ $curs -eq $prevs ]; then
break
fi
prevs=$curs
$XBPS_REMOVE_XCMD -Ryo >> $tmplogf 2>&1
rval=$?
done

if [ $rval -ne 0 ]; then
msg_red "${pkgver:-xbps-src}: failed to remove autocrossdeps:\n"
cat $tmplogf && rm -f $tmplogf
msg_error "${pkgver:-xbps-src}: cannot continue!\n"
Expand Down
19 changes: 14 additions & 5 deletions common/xbps-src/shutils/pkgtarget.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,27 +44,36 @@ pkg_available() {
}

remove_pkg_autodeps() {
local rval= tmplogf=
local rval= tmplogf= errlogf= prevs=

cd $XBPS_MASTERDIR || return 1
msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n"
tmplogf=$(mktemp) || exit 1
errlogf=$(mktemp) || exit 1

remove_pkg_cross_deps
$XBPS_RECONFIGURE_CMD -a >> $tmplogf 2>&1
echo yes | $XBPS_REMOVE_CMD -Ryod >> $tmplogf 2>&1
prevs=$(stat -c %s $tmplogf)
echo yes | $XBPS_REMOVE_CMD -Ryod 2>> $errlogf 1>> $tmplogf
rval=$?
if [ $rval -eq 0 ]; then
echo yes | $XBPS_REMOVE_CMD -Ryod >> $tmplogf 2>&1
while [ $rval -eq 0 ]; do
local curs=$(stat -c %s $tmplogf)
if [ $curs -eq $prevs ]; then
break
fi
prevs=$curs
echo yes | $XBPS_REMOVE_CMD -Ryod 2>> $errlogf 1>> $tmplogf
rval=$?
fi
done

if [ $rval -ne 0 ]; then
msg_red "${pkgver:-xbps-src}: failed to remove autodeps: (returned $rval)\n"
cat $tmplogf && rm -f $tmplogf
cat $errlogf && rm -f $errlogf
msg_error "${pkgver:-xbps-src}: cannot continue!\n"
fi
rm -f $tmplogf
rm -f $errlogf
}

remove_pkg_wrksrc() {
Expand Down