ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ./installdeps m32 for Solus 

When calculating 32 bit dependencies, look only for -devel packages, and
match only -devel packages when checking for corresponding -32bit-devel
packages.
This commit is contained in:
Rafael Kitover 2017-03-24 01:38:34 -07:00
parent 9324318373
commit f56794e8a3
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
installdeps
View File

@ -518,12 +518,12 @@ solus_installdeps() {
if [ -n "$amd64" -a "$target" = m32 ]; then if [ -n "$amd64" -a "$target" = m32 ]; then
info_msg 'Calculating dependencies, this will take a while..' info_msg 'Calculating dependencies, this will take a while..'
# first expand all dep lists recursively # first expand all dep lists recursively for -devel packages
curdeps= curdeps=
newdeps=$@ newdeps=$@
while [ "$curdeps" != "$newdeps" ]; do while [ "$curdeps" != "$newdeps" ]; do
curdeps=$newdeps curdeps=$newdeps
set -- $(echo "$@" $(sudo eopkg info "$@" 2>/dev/null | sed -n 's/^Dependencies *: *\(.*\)/\1/p' | sort -u) | sed 's/ */\n/g' | sort -u) set -- $(echo "$@" $(sudo eopkg info "$@" 2>/dev/null | sed -n 's/^Dependencies *: *\(.*\)/\1/p' | sort -u) | sed 's/ */\n/g' | grep -- '-devel$' | sort -u)
newdeps=$@ newdeps=$@
done done
@ -534,7 +534,17 @@ solus_installdeps() {
set -- set --
first=0 first=0
fi fi
set -- "$@" "${pkg%-devel}-32bit-devel" case "$pkg" in
*-32bit-devel)
# already 32 bit
;;
*-devel)
set -- "$@" "${pkg%-devel}-32bit-devel"
;;
*)
set -- "$@" "$pkg"
;;
esac
done done
# prune the ones that don't exist # prune the ones that don't exist