Add jobs to SAMUFLAGS, show names of missing dependencies

This commit is contained in:
kernelpanic 2022-07-29 21:51:36 +00:00
parent 79904a2018
commit 5d740d71a3

View file

@ -14,7 +14,7 @@ command -V bad 2>/dev/null || bad() {
"$@" "$@"
} }
bad --gmake command -V gmake 2> /dev/null || gmake() { bad --gmake command -V gmake > /dev/null 2> /dev/null || gmake() {
make "$@" make "$@"
} }
@ -131,10 +131,15 @@ export JOBS=$(nproc)
. ./build.sh . ./build.sh
if command -V iglu 2>/dev/null; then if command -V iglu 2>/dev/null; then
[ -z "$mkdeps" ] || iglu has $(echo $mkdeps | sed -e "s|:| |g") \ missing=""
|| fatal 'missing make dependancies'
[ -z "$deps" ] || iglu has $(echo $deps | sed -e "s|$|$cross|" -e "s|:|$cross |g") \ missing=$(echo $mkdeps | tr ":" "\n" | while read mkdep; do \
|| fatal 'missing runtime dependancies' iglu has $mkdep || echo " $mkdep"; done)
[ ! -z "$missing" ] && fatal "missing make dependencies: $missing"
missing=$(echo $deps | tr ":" "\n" | while read dep; do \
iglu has $dep || echo " $dep"; done)
[ ! -z "$missing" ] && fatal "missing runtime dependencies: $missing"
fi fi
srcdir="$(pwd)/src" srcdir="$(pwd)/src"
@ -176,7 +181,7 @@ _b() {
rm -rf "$pkgdir" rm -rf "$pkgdir"
cd "$srcdir" cd "$srcdir"
[ -f .fetched ] || fatal 'must fetch before building' [ -f .fetched ] || fatal 'must fetch before building'
MAKEFLAGS=-j"$JOBS" build MAKEFLAGS=-j"$JOBS" SAMUFLAGS=-j"$JOBS" build
cd "$srcdir" cd "$srcdir"
:> .built :> .built
} }