forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

{main,cross}/gcc{4,6}*: remove !tracedeps option (MR 3498)

Browse source 
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
This commit is contained in:
Oliver Smith 2022-10-05 21:06:49 +02:00 committed by Newbyte
parent 67b5efcea1
commit a53224a8e7
No known key found for this signature in database
GPG key ID: 5873C171C9429CFA
8 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cross/gcc4-aarch64/APKBUILD
View file

@ -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

6
cross/gcc4-armhf/APKBUILD
View file

@ -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

6
cross/gcc4-armv7/APKBUILD
View file

@ -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

6
cross/gcc6-aarch64/APKBUILD
View file

@ -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

6
cross/gcc6-armhf/APKBUILD
View file

@ -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

6
cross/gcc6-armv7/APKBUILD
View file

@ -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

4
main/gcc4/APKBUILD
View file

@ -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

4
main/gcc6/APKBUILD
View file

@ -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