diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-02-24 11:58:32 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-27 06:23:05 +0000 |
| commit | f9110e603a3ce00536142e4caeae8f3db1fc48a1 (patch) | |
| tree | bab8401b2e1dbbcfd74e8633d8ca26f3318a57e5 | |
| parent | f5c4b298918ba1d5ff85861cdeed9eff2cbcd5b9 (diff) | |
| download | aports-f9110e603a3ce00536142e4caeae8f3db1fc48a1.tar.bz2 aports-f9110e603a3ce00536142e4caeae8f3db1fc48a1.tar.xz | |
scripts/bootstrap.sh, main/{binutils,gcc,musl}: no more options="toolchain"
abuild has been updated to figure this one out from $BOOTSTRAP.
| -rw-r--r-- | main/binutils/APKBUILD | 1 | ||||
| -rw-r--r-- | main/gcc/APKBUILD | 3 | ||||
| -rw-r--r-- | main/musl/APKBUILD | 5 | ||||
| -rwxr-xr-x | scripts/bootstrap.sh | 6 |
4 files changed, 6 insertions, 9 deletions
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD index 09ea0962d6..8bacc931c2 100644 --- a/main/binutils/APKBUILD +++ b/main/binutils/APKBUILD @@ -5,7 +5,6 @@ pkgrel=1 pkgdesc="Tools necessary to build programs" url="http://www.gnu.org/software/binutils/" depends="" -options="toolchain" makedepends_build="bison flex texinfo" makedepends_host="zlib-dev" makedepends="$makedepends_build $makedepends_host" diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 47e1007d91..ea73b5bd85 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -13,7 +13,6 @@ url="http://gcc.gnu.org" arch="all" license="GPL LGPL" _gccrel=$pkgver-r$pkgrel -options="toolchain" depends="binutils$_target isl" makedepends_build="gcc$_cross g++$_cross paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev !gettext-dev" @@ -42,7 +41,7 @@ if [ "$CARCH" = aarch64 ]; then fi if [ "$CHOST" != "$CTARGET" ]; then - if [ "$BOOTSTRAP" ]; then + if [ "$BOOTSTRAP" = nolibc ]; then LANG_CXX=false LANG_ADA=false LIBGCC=false diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD index 255c4fb75c..2d6002b2f8 100644 --- a/main/musl/APKBUILD +++ b/main/musl/APKBUILD @@ -9,7 +9,6 @@ arch="all" license="MIT" depends="" depends_dev="!uclibc-dev" -options="toolchain" makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-dbg libc6-compat:compat:noarch" case "$BOOTSTRAP" in @@ -42,7 +41,7 @@ builddir="$srcdir"/musl-$pkgver build() { cd "$builddir" - [ "$BOOTSTRAP" == "nocc" ] && return 0 + [ "$BOOTSTRAP" = "nocc" ] && return 0 # provide minimal libssp_nonshared.a so we don't need libssp from gcc ${CROSS_COMPILE}gcc $CPPFLAGS $CFLAGS -c "$srcdir"/__stack_chk_fail_local.c -o __stack_chk_fail_local.o || return 1 @@ -73,7 +72,7 @@ build() { package() { cd "$builddir" - if [ "$BOOTSTRAP" == "nocc" ]; then + if [ "$BOOTSTRAP" = "nocc" ]; then case "$CARCH" in aarch64*) ARCH="aarch64" ;; arm*) ARCH="arm" ;; diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index de2cf7e4ed..93a1e1a36f 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -66,7 +66,7 @@ fi msg "Building cross-compiler" # Build and install cross binutils (--with-sysroot) -CTARGET=$TARGET_ARCH APKBUILD=$(apkbuildname binutils) abuild -r +CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname binutils) abuild -r if ! CHOST=$TARGET_ARCH BOOTSTRAP=nolibc APKBUILD=$(apkbuildname musl) abuild up2date 2>/dev/null; then # C-library headers for target @@ -83,10 +83,10 @@ fi # Full cross GCC EXTRADEPENDS_TARGET="musl musl-dev" \ -CTARGET=$TARGET_ARCH APKBUILD=$(apkbuildname gcc) abuild -r -k +CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname gcc) abuild -r # Cross build-base -CTARGET=$TARGET_ARCH APKBUILD=$(apkbuildname build-base) abuild -r +CTARGET=$TARGET_ARCH BOOTSTRAP=nobase APKBUILD=$(apkbuildname build-base) abuild -r msg "Cross building base system" |