summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-12-12 20:02:32 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-12-12 20:02:32 -0600
commiteefdd1183850caae8dde2894732e000a8bc19d55 (patch)
treeba439fe8a983405a63a7ea15e97069b833602916
parent0a9442b2f6d0ad1175a7d4a413c97832d6dec7b5 (diff)
downloadpackages-eefdd1183850caae8dde2894732e000a8bc19d55.tar.gz
packages-eefdd1183850caae8dde2894732e000a8bc19d55.tar.bz2
packages-eefdd1183850caae8dde2894732e000a8bc19d55.tar.xz
packages-eefdd1183850caae8dde2894732e000a8bc19d55.zip
scripts/newstrap.sh: More fixes
* GCC needs BOOTSTRAP, not BOOSTRAP. * Install musl-dev with EXTRADEPENDS_TARGET until build-base sorted. * More target packages, which even are built now.
-rwxr-xr-xscripts/newstrap.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/newstrap.sh b/scripts/newstrap.sh
index 7798e68a7..67276cef3 100755
--- a/scripts/newstrap.sh
+++ b/scripts/newstrap.sh
@@ -186,17 +186,17 @@ abuild_host() {
}
abuild_target() {
- CHOST=$ARCH BOOTSTRAP=bootimage APKBUILD=${BUILD_PATH}/system/$1/APKBUILD ABUILD_CONF="$TARGET_DIR"/etc/abuild.conf.target CBUILDROOT="$TARGET_DIR" abuild -r
+ EXTRADEPENDS_TARGET="musl musl-dev" CHOST=$ARCH BOOTSTRAP=bootimage APKBUILD=${BUILD_PATH}/system/$1/APKBUILD ABUILD_CONF="$TARGET_DIR"/etc/abuild.conf.target CBUILDROOT="$TARGET_DIR" abuild -r
}
CTARGET=$ARCH BOOTSTRAP=nobase abuild_host binutils
CHOST=$ARCH BOOTSTRAP=nocc abuild_host musl
EXTRADEPENDS_HOST=musl-dev CTARGET=$ARCH BOOTSTRAP=nolibc abuild_host gcc
EXTRADEPENDS_BUILD=gcc-pass2-$ARCH CHOST=$ARCH BOOTSTRAP=nolibc abuild_host musl
-EXTRADEPENDS_TARGET="musl musl-dev" CTARGET=$ARCH BOOSTRAP=nobase abuild_host gcc
+EXTRADEPENDS_BUILD=gcc-pass2-$ARCH EXTRADEPENDS_TARGET="musl musl-dev" CTARGET=$ARCH BOOTSTRAP=nobase abuild_host gcc
-for next_pkg in musl pkgconf zlib \
+for next_pkg in musl dash pkgconf zlib \
gettext-tiny ncurses bash binutils make bison flex m4 \
- openssl apk-tools; do
+ openssl apk-tools gmp mpfr3 mpc1 isl gcc; do
abuild_target $next_pkg
done