From a53224a8e78924a0457182cffb04e7eff4f9ccd9 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 5 Oct 2022 21:06:49 +0200 Subject: [PATCH] {main,cross}/gcc{4,6}*: remove !tracedeps option (MR 3498) Don't build with !tracedeps, as otherwise the isl dependency is not properly added to the built gccs. In practice this probably doesn't matter since we only use these old gccs to build kernels in the native chroots (not via crossdirect in foreign arch chroots), and we also install a proper gcc in the native chroot that pulls in the isl dependency. But fix it for correctness. Related: pmaports issue 1732 [ci:skip-build] Already built successfuly on CI in MR --- cross/gcc4-aarch64/APKBUILD | 6 +++--- cross/gcc4-armhf/APKBUILD | 6 +++--- cross/gcc4-armv7/APKBUILD | 6 +++--- cross/gcc6-aarch64/APKBUILD | 6 +++--- cross/gcc6-armhf/APKBUILD | 6 +++--- cross/gcc6-armv7/APKBUILD | 6 +++--- main/gcc4/APKBUILD | 4 ++-- main/gcc6/APKBUILD | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cross/gcc4-aarch64/APKBUILD b/cross/gcc4-aarch64/APKBUILD index 4f4e0aa12..b880f566e 100644 --- a/cross/gcc4-aarch64/APKBUILD +++ b/cross/gcc4-aarch64/APKBUILD @@ -10,7 +10,7 @@ LANG_JAVA=false LANG_GO=false LANG_FORTRAN=false LANG_ADA=false -options="!strip !tracedeps" +options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*" @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc4-aarch64 pkgver=9999 _pkgver=4.9.2 -pkgrel=6 +pkgrel=7 pkgdesc="Stage2 cross-compiler for aarch64" url="http://gcc.gnu.org" arch="x86_64" @@ -35,7 +35,7 @@ _gccrel=$_pkgver-r$pkgrel depends="binutils-aarch64 mpc1" makedepends_build="gcc g++ 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 musl-dev-aarch64 binutils-aarch64" -options="!strip !tracedeps" +options="!strip" # We only care about C, so we can compile old Linux kernels LANG_CXX=false diff --git a/cross/gcc4-armhf/APKBUILD b/cross/gcc4-armhf/APKBUILD index 3dc29643c..6abb55d6d 100644 --- a/cross/gcc4-armhf/APKBUILD +++ b/cross/gcc4-armhf/APKBUILD @@ -10,7 +10,7 @@ LANG_JAVA=false LANG_GO=false LANG_FORTRAN=false LANG_ADA=false -options="!strip !tracedeps" +options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*" @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc4-armhf pkgver=9999 _pkgver=4.9.2 -pkgrel=6 +pkgrel=7 pkgdesc="Stage2 cross-compiler for armhf" url="http://gcc.gnu.org" arch="x86_64" @@ -35,7 +35,7 @@ _gccrel=$_pkgver-r$pkgrel depends="binutils-armhf mpc1" makedepends_build="gcc g++ 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 musl-dev-armhf binutils-armhf" -options="!strip !tracedeps" +options="!strip" # We only care about C, so we can compile old Linux kernels LANG_CXX=false diff --git a/cross/gcc4-armv7/APKBUILD b/cross/gcc4-armv7/APKBUILD index bc16c29bb..f78c2310f 100644 --- a/cross/gcc4-armv7/APKBUILD +++ b/cross/gcc4-armv7/APKBUILD @@ -10,7 +10,7 @@ LANG_JAVA=false LANG_GO=false LANG_FORTRAN=false LANG_ADA=false -options="!strip !tracedeps" +options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*" @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc4-armv7 pkgver=9999 _pkgver=4.9.2 -pkgrel=6 +pkgrel=7 pkgdesc="Stage2 cross-compiler for armv7" url="http://gcc.gnu.org" arch="x86_64" @@ -35,7 +35,7 @@ _gccrel=$_pkgver-r$pkgrel depends="binutils-armv7 mpc1" makedepends_build="gcc g++ 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 musl-dev-armv7 binutils-armv7" -options="!strip !tracedeps" +options="!strip" # We only care about C, so we can compile old Linux kernels LANG_CXX=false diff --git a/cross/gcc6-aarch64/APKBUILD b/cross/gcc6-aarch64/APKBUILD index 4a5b1f882..4bbe9420e 100644 --- a/cross/gcc6-aarch64/APKBUILD +++ b/cross/gcc6-aarch64/APKBUILD @@ -10,7 +10,7 @@ LANG_JAVA=false LANG_GO=false LANG_FORTRAN=false LANG_ADA=false -options="!strip !tracedeps" +options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*" @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc6-aarch64 pkgver=9999 _pkgver=6.4.0 -pkgrel=11 +pkgrel=12 pkgdesc="Stage2 cross-compiler for aarch64" url="http://gcc.gnu.org" arch="x86_64" @@ -35,7 +35,7 @@ _gccrel=$_pkgver-r$pkgrel depends="binutils-aarch64 mpc1" makedepends_build="gcc g++ 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 musl-dev-aarch64 binutils-aarch64" -options="!strip !tracedeps" +options="!strip" # We only care about C, so we can compile old Linux kernels LANG_CXX=false diff --git a/cross/gcc6-armhf/APKBUILD b/cross/gcc6-armhf/APKBUILD index 53610cc02..e69f8293d 100644 --- a/cross/gcc6-armhf/APKBUILD +++ b/cross/gcc6-armhf/APKBUILD @@ -10,7 +10,7 @@ LANG_JAVA=false LANG_GO=false LANG_FORTRAN=false LANG_ADA=false -options="!strip !tracedeps" +options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*" @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc6-armhf pkgver=9999 _pkgver=6.4.0 -pkgrel=11 +pkgrel=12 pkgdesc="Stage2 cross-compiler for armhf" url="http://gcc.gnu.org" arch="x86_64" @@ -35,7 +35,7 @@ _gccrel=$_pkgver-r$pkgrel depends="binutils-armhf mpc1" makedepends_build="gcc g++ 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 musl-dev-armhf binutils-armhf" -options="!strip !tracedeps" +options="!strip" # We only care about C, so we can compile old Linux kernels LANG_CXX=false diff --git a/cross/gcc6-armv7/APKBUILD b/cross/gcc6-armv7/APKBUILD index 62adbdb57..d15823225 100644 --- a/cross/gcc6-armv7/APKBUILD +++ b/cross/gcc6-armv7/APKBUILD @@ -10,7 +10,7 @@ LANG_JAVA=false LANG_GO=false LANG_FORTRAN=false LANG_ADA=false -options="!strip !tracedeps" +options="!strip" # abuild doesn't try to tries to install "build-base-$CTARGET_ARCH" # when this variable matches "no*" @@ -26,7 +26,7 @@ _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" pkgname=gcc6-armv7 pkgver=9999 _pkgver=6.4.0 -pkgrel=11 +pkgrel=12 pkgdesc="Stage2 cross-compiler for armv7" url="http://gcc.gnu.org" arch="x86_64" @@ -35,7 +35,7 @@ _gccrel=$_pkgver-r$pkgrel depends="binutils-armv7 mpc1" makedepends_build="gcc g++ 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 musl-dev-armv7 binutils-armv7" -options="!strip !tracedeps" +options="!strip" # We only care about C, so we can compile old Linux kernels LANG_CXX=false diff --git a/main/gcc4/APKBUILD b/main/gcc4/APKBUILD index 32ec9288d..2b165de50 100644 --- a/main/gcc4/APKBUILD +++ b/main/gcc4/APKBUILD @@ -1,7 +1,7 @@ pkgname=gcc4 pkgver=9999 _pkgver=4.9.2 -pkgrel=6 +pkgrel=7 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all" @@ -11,7 +11,7 @@ depends="binutils mpc1" makedepends_build="gcc g++ 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" subpackages=" " -options="!tracedeps" +options="" # We only care about C, so we can compile old Linux kernels LANG_CXX=false diff --git a/main/gcc6/APKBUILD b/main/gcc6/APKBUILD index 96a477d93..1039e3c8f 100644 --- a/main/gcc6/APKBUILD +++ b/main/gcc6/APKBUILD @@ -1,7 +1,7 @@ pkgname=gcc6 pkgver=9999 _pkgver=6.4.0 -pkgrel=11 +pkgrel=12 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all" @@ -11,7 +11,7 @@ depends="binutils mpc1" makedepends_build="gcc g++ 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" subpackages=" " -options="!tracedeps" +options="" # We only care about C, so we can compile old Linux kernels LANG_CXX=false