abuild: pass --arch to apk whenever sysroot is used
so we can crosscompile for different architectures
This commit is contained in:
parent
6b2fd4a891
commit
971504f0ec
10
abuild.in
10
abuild.in
|
@ -1048,7 +1048,7 @@ trace_apk_deps() {
|
|||
|
||||
case "$parch" in
|
||||
$CBUILD_ARCH) ;;
|
||||
$CARCH | $CTARGET_ARCH) apkroot="--root $CBUILDROOT" ;;
|
||||
$CARCH | $CTARGET_ARCH) apkroot="--root $CBUILDROOT --arch $CTARGET_ARCH" ;;
|
||||
esac
|
||||
|
||||
msg "Tracing dependencies..."
|
||||
|
@ -1810,7 +1810,7 @@ builddeps() {
|
|||
calcdeps "$BUILD_BASE"
|
||||
|
||||
installed_builddeps=$($APK info --installed $builddeps)
|
||||
[ -n "$CBUILDROOT" -a -n "$hostdeps" ] && installed_hostdeps=$($APK info --root "$CBUILDROOT" --installed $hostdeps)
|
||||
[ -n "$CBUILDROOT" -a -n "$hostdeps" ] && installed_hostdeps=$($APK info --root "$CBUILDROOT" --arch "$CTARGET_ARCH" --installed $hostdeps)
|
||||
|
||||
# find which deps are missing
|
||||
for i in $builddeps; do
|
||||
|
@ -1825,7 +1825,7 @@ builddeps() {
|
|||
done
|
||||
for i in $hostdeps; do
|
||||
if [ "${i#\!}" != "$i" ]; then
|
||||
if $APK info --quiet --installed --root "$CBUILDROOT" "${i#\!}"; then
|
||||
if $APK info --quiet --installed --root "$CBUILDROOT" --arch "$CTARGET_ARCH" "${i#\!}"; then
|
||||
error "Conflicting package installed: ${i#\!}"
|
||||
return 1
|
||||
fi
|
||||
|
@ -2039,7 +2039,7 @@ deps() {
|
|||
|| return 1
|
||||
if [ -n "$CBUILDROOT" ]; then
|
||||
[ -z "$_quiet" ] && msg "Installing for host:$hostdeps"
|
||||
$SUDO_APK add $_quiet --root "$CBUILDROOT" --repository "$REPODEST/$repo" $apk_opt_wait \
|
||||
$SUDO_APK add $_quiet --root "$CBUILDROOT" --arch "$CTARGET_ARCH" --repository "$REPODEST/$repo" $apk_opt_wait \
|
||||
--no-scripts --virtual .makedepends-$pkgname $hostdeps || return 1
|
||||
fi
|
||||
}
|
||||
|
@ -2048,7 +2048,7 @@ undeps() {
|
|||
local _quiet="$@"
|
||||
$SUDO_APK del $_quiet $apk_opt_wait .makedepends-$pkgname
|
||||
if [ -n "$CBUILDROOT" ]; then
|
||||
$SUDO_APK del $_quiet --root "$CBUILDROOT" $apk_opt_wait \
|
||||
$SUDO_APK del $_quiet --root "$CBUILDROOT" --arch "$CTARGET_ARCH" $apk_opt_wait \
|
||||
--no-scripts .makedepends-$pkgname
|
||||
fi
|
||||
return 0
|
||||
|
|
Loading…
Reference in New Issue