From 8e6824c6e022752bc58420e75311115a0b6e0fd6 Mon Sep 17 00:00:00 2001 From: afeuerstein <4562667-afeuerstein@users.noreply.gitlab.com> Date: Tue, 10 Aug 2021 00:44:06 +0200 Subject: [PATCH] {main,cross}/gcc*: sync makedeps with Alpine (remove paxmark) (MR 2421) [ci:skip-build] gcc never builds on CI, let alone 11 gccs [ci:skip-vercheck] --- cross/gcc-aarch64/APKBUILD | 2 +- cross/gcc-armhf/APKBUILD | 2 +- cross/gcc-armv7/APKBUILD | 2 +- cross/gcc4-aarch64/APKBUILD | 6 +-- cross/gcc4-armhf/APKBUILD | 6 +-- cross/gcc4-armv7/APKBUILD | 6 +-- .../0014-fix-missing-includes-isl-0.20.patch | 54 +++++++++++++++++++ cross/gcc6-aarch64/APKBUILD | 7 ++- .../0014-fix-missing-includes-isl-0.20.patch | 54 +++++++++++++++++++ cross/gcc6-armhf/APKBUILD | 7 ++- .../0014-fix-missing-includes-isl-0.20.patch | 54 +++++++++++++++++++ cross/gcc6-armv7/APKBUILD | 7 ++- main/gcc4/APKBUILD | 4 +- main/gcc6/APKBUILD | 4 +- 14 files changed, 193 insertions(+), 22 deletions(-) create mode 100644 cross/gcc6-aarch64/0014-fix-missing-includes-isl-0.20.patch create mode 100644 cross/gcc6-armhf/0014-fix-missing-includes-isl-0.20.patch create mode 100644 cross/gcc6-armv7/0014-fix-missing-includes-isl-0.20.patch diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD index a0d000ab3..963da6dfc 100644 --- a/cross/gcc-aarch64/APKBUILD +++ b/cross/gcc-aarch64/APKBUILD @@ -38,7 +38,7 @@ arch="x86_64" license="GPL-2.0-or-later LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel depends="isl binutils-aarch64 mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" subpackages="g++-aarch64:gpp" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD index 9e056bc78..4241526ff 100644 --- a/cross/gcc-armhf/APKBUILD +++ b/cross/gcc-armhf/APKBUILD @@ -38,7 +38,7 @@ arch="x86_64" license="GPL-2.0-or-later LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel depends="isl binutils-armhf mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" subpackages="g++-armhf:gpp" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD index 029af1ae6..180a74ad7 100644 --- a/cross/gcc-armv7/APKBUILD +++ b/cross/gcc-armv7/APKBUILD @@ -38,7 +38,7 @@ arch="x86_64" license="GPL-2.0-or-later LGPL-2.1-or-later" _gccrel=$pkgver-r$pkgrel depends="isl binutils-armv7 mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" subpackages="g++-armv7:gpp" [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-doc$_target" diff --git a/cross/gcc4-aarch64/APKBUILD b/cross/gcc4-aarch64/APKBUILD index 891206b43..3fadff279 100644 --- a/cross/gcc4-aarch64/APKBUILD +++ b/cross/gcc4-aarch64/APKBUILD @@ -4,6 +4,7 @@ CTARGET_ARCH=aarch64 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})" +LANG_D=false LANG_OBJC=false LANG_JAVA=false LANG_GO=false @@ -22,7 +23,7 @@ CBUILDROOT="/" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" -pkgname="gcc4-aarch64" +pkgname=gcc4-aarch64 pkgver=9999 _pkgver=4.9.2 pkgrel=2 @@ -32,9 +33,8 @@ arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="isl binutils-aarch64 mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" -subpackages="" options="!strip !tracedeps" # We only care about C, so we can compile old Linux kernels diff --git a/cross/gcc4-armhf/APKBUILD b/cross/gcc4-armhf/APKBUILD index dfa998068..bdd3f788a 100644 --- a/cross/gcc4-armhf/APKBUILD +++ b/cross/gcc4-armhf/APKBUILD @@ -4,6 +4,7 @@ CTARGET_ARCH=armhf CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})" +LANG_D=false LANG_OBJC=false LANG_JAVA=false LANG_GO=false @@ -22,7 +23,7 @@ CBUILDROOT="/" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" -pkgname="gcc4-armhf" +pkgname=gcc4-armhf pkgver=9999 _pkgver=4.9.2 pkgrel=2 @@ -32,9 +33,8 @@ arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="isl binutils-armhf mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" -subpackages="" options="!strip !tracedeps" # We only care about C, so we can compile old Linux kernels diff --git a/cross/gcc4-armv7/APKBUILD b/cross/gcc4-armv7/APKBUILD index fcdb4cbef..0664e25e8 100644 --- a/cross/gcc4-armv7/APKBUILD +++ b/cross/gcc4-armv7/APKBUILD @@ -4,6 +4,7 @@ CTARGET_ARCH=armv7 CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})" +LANG_D=false LANG_OBJC=false LANG_JAVA=false LANG_GO=false @@ -22,7 +23,7 @@ CBUILDROOT="/" _cross_configure="--disable-bootstrap --with-sysroot=/usr/$CTARGET" -pkgname="gcc4-armv7" +pkgname=gcc4-armv7 pkgver=9999 _pkgver=4.9.2 pkgrel=2 @@ -32,9 +33,8 @@ arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="isl binutils-armv7 mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" -subpackages="" options="!strip !tracedeps" # We only care about C, so we can compile old Linux kernels diff --git a/cross/gcc6-aarch64/0014-fix-missing-includes-isl-0.20.patch b/cross/gcc6-aarch64/0014-fix-missing-includes-isl-0.20.patch new file mode 100644 index 000000000..36d7893fa --- /dev/null +++ b/cross/gcc6-aarch64/0014-fix-missing-includes-isl-0.20.patch @@ -0,0 +1,54 @@ +From e31e485e7b453cd6cddf5a0a137b9c98bc797ea5 Mon Sep 17 00:00:00 2001 +From: Matthias Klose +Date: Tue, 14 Aug 2018 15:15:39 +0000 +Subject: [PATCH] backport: re PR tree-optimization/86724 (Compilation error + with new isl 0.20 (missing includes)) + +2018-08-14 Matthias Klose + + Backport from mainline + 2018-08-01 Richard Biener + + PR bootstrap/86724 + * graphite.h: Include isl/id.h and isl/space.h to allow build + with ISL 0.20. + +From-SVN: r263539 +--- + gcc/ChangeLog | 9 +++++++++ + gcc/graphite.h | 2 ++ + 2 files changed, 11 insertions(+) + +diff --git a/gcc/ChangeLog b/gcc/ChangeLog +index c7f61504757..4aaaeac328a 100644 +--- a/gcc/ChangeLog ++++ b/gcc/ChangeLog +@@ -1,3 +1,12 @@ ++2018-08-14 Matthias Klose ++ ++ Backport from mainline ++ 2018-08-01 Richard Biener ++ ++ PR bootstrap/86724 ++ * graphite.h: Include isl/id.h and isl/space.h to allow build ++ with ISL 0.20. ++ + 2018-08-10 Segher Boessenkool + + Backport from mainline +diff --git a/gcc/graphite.h b/gcc/graphite.h +index 578fa1a6d98..431d0ed0a5e 100644 +--- a/gcc/graphite.h ++++ b/gcc/graphite.h +@@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see + #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS + /* isl 0.15 or later. */ + #include ++#include ++#include + + #else + /* isl 0.14 or 0.13. */ +-- +2.27.0 + diff --git a/cross/gcc6-aarch64/APKBUILD b/cross/gcc6-aarch64/APKBUILD index d6f996be7..66d185950 100644 --- a/cross/gcc6-aarch64/APKBUILD +++ b/cross/gcc6-aarch64/APKBUILD @@ -33,7 +33,7 @@ arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="isl binutils-aarch64 mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" @@ -221,6 +221,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg 0011-i386-Update-mfunction-return-for-return-with-pop.patch 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch + + 0014-fix-missing-includes-isl-0.20.patch " # we build out-of-tree @@ -490,4 +492,5 @@ baa27a4b912d8e27cd65a556b09cf45289a0e00e86dae3925f2923d1f3752080e80d80e159c996ef b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch -3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch" +3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch +e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch" diff --git a/cross/gcc6-armhf/0014-fix-missing-includes-isl-0.20.patch b/cross/gcc6-armhf/0014-fix-missing-includes-isl-0.20.patch new file mode 100644 index 000000000..36d7893fa --- /dev/null +++ b/cross/gcc6-armhf/0014-fix-missing-includes-isl-0.20.patch @@ -0,0 +1,54 @@ +From e31e485e7b453cd6cddf5a0a137b9c98bc797ea5 Mon Sep 17 00:00:00 2001 +From: Matthias Klose +Date: Tue, 14 Aug 2018 15:15:39 +0000 +Subject: [PATCH] backport: re PR tree-optimization/86724 (Compilation error + with new isl 0.20 (missing includes)) + +2018-08-14 Matthias Klose + + Backport from mainline + 2018-08-01 Richard Biener + + PR bootstrap/86724 + * graphite.h: Include isl/id.h and isl/space.h to allow build + with ISL 0.20. + +From-SVN: r263539 +--- + gcc/ChangeLog | 9 +++++++++ + gcc/graphite.h | 2 ++ + 2 files changed, 11 insertions(+) + +diff --git a/gcc/ChangeLog b/gcc/ChangeLog +index c7f61504757..4aaaeac328a 100644 +--- a/gcc/ChangeLog ++++ b/gcc/ChangeLog +@@ -1,3 +1,12 @@ ++2018-08-14 Matthias Klose ++ ++ Backport from mainline ++ 2018-08-01 Richard Biener ++ ++ PR bootstrap/86724 ++ * graphite.h: Include isl/id.h and isl/space.h to allow build ++ with ISL 0.20. ++ + 2018-08-10 Segher Boessenkool + + Backport from mainline +diff --git a/gcc/graphite.h b/gcc/graphite.h +index 578fa1a6d98..431d0ed0a5e 100644 +--- a/gcc/graphite.h ++++ b/gcc/graphite.h +@@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see + #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS + /* isl 0.15 or later. */ + #include ++#include ++#include + + #else + /* isl 0.14 or 0.13. */ +-- +2.27.0 + diff --git a/cross/gcc6-armhf/APKBUILD b/cross/gcc6-armhf/APKBUILD index 04f234292..150a8cc37 100644 --- a/cross/gcc6-armhf/APKBUILD +++ b/cross/gcc6-armhf/APKBUILD @@ -33,7 +33,7 @@ arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="isl binutils-armhf mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" @@ -221,6 +221,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg 0011-i386-Update-mfunction-return-for-return-with-pop.patch 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch + + 0014-fix-missing-includes-isl-0.20.patch " # we build out-of-tree @@ -490,4 +492,5 @@ baa27a4b912d8e27cd65a556b09cf45289a0e00e86dae3925f2923d1f3752080e80d80e159c996ef b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch -3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch" +3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch +e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch" diff --git a/cross/gcc6-armv7/0014-fix-missing-includes-isl-0.20.patch b/cross/gcc6-armv7/0014-fix-missing-includes-isl-0.20.patch new file mode 100644 index 000000000..36d7893fa --- /dev/null +++ b/cross/gcc6-armv7/0014-fix-missing-includes-isl-0.20.patch @@ -0,0 +1,54 @@ +From e31e485e7b453cd6cddf5a0a137b9c98bc797ea5 Mon Sep 17 00:00:00 2001 +From: Matthias Klose +Date: Tue, 14 Aug 2018 15:15:39 +0000 +Subject: [PATCH] backport: re PR tree-optimization/86724 (Compilation error + with new isl 0.20 (missing includes)) + +2018-08-14 Matthias Klose + + Backport from mainline + 2018-08-01 Richard Biener + + PR bootstrap/86724 + * graphite.h: Include isl/id.h and isl/space.h to allow build + with ISL 0.20. + +From-SVN: r263539 +--- + gcc/ChangeLog | 9 +++++++++ + gcc/graphite.h | 2 ++ + 2 files changed, 11 insertions(+) + +diff --git a/gcc/ChangeLog b/gcc/ChangeLog +index c7f61504757..4aaaeac328a 100644 +--- a/gcc/ChangeLog ++++ b/gcc/ChangeLog +@@ -1,3 +1,12 @@ ++2018-08-14 Matthias Klose ++ ++ Backport from mainline ++ 2018-08-01 Richard Biener ++ ++ PR bootstrap/86724 ++ * graphite.h: Include isl/id.h and isl/space.h to allow build ++ with ISL 0.20. ++ + 2018-08-10 Segher Boessenkool + + Backport from mainline +diff --git a/gcc/graphite.h b/gcc/graphite.h +index 578fa1a6d98..431d0ed0a5e 100644 +--- a/gcc/graphite.h ++++ b/gcc/graphite.h +@@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see + #ifdef HAVE_ISL_OPTIONS_SET_SCHEDULE_SERIALIZE_SCCS + /* isl 0.15 or later. */ + #include ++#include ++#include + + #else + /* isl 0.14 or 0.13. */ +-- +2.27.0 + diff --git a/cross/gcc6-armv7/APKBUILD b/cross/gcc6-armv7/APKBUILD index 79530f4ef..9ae892a4a 100644 --- a/cross/gcc6-armv7/APKBUILD +++ b/cross/gcc6-armv7/APKBUILD @@ -33,7 +33,7 @@ arch="x86_64" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="isl binutils-armv7 mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" @@ -221,6 +221,8 @@ source="http://gcc.gnu.org/pub/gcc/releases/gcc-${_pkgbase:-$_pkgver}/gcc-${_pkg 0011-i386-Update-mfunction-return-for-return-with-pop.patch 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch + + 0014-fix-missing-includes-isl-0.20.patch " # we build out-of-tree @@ -490,4 +492,5 @@ baa27a4b912d8e27cd65a556b09cf45289a0e00e86dae3925f2923d1f3752080e80d80e159c996ef b7b59f3203bf53168de2170b91738cd456f6ae205b3fe5bf8aacbaa8cc5624dd09c941ad8f1071d1ab8ab4fb5f69068a4bc792c0486fdec1ee2eb9c83688bb78 0010-i386-Pass-INVALID_REGNUM-as-invalid-register-number.patch c53d4c5968865abb709ee8a9af9d57917d43ea3ba31ee8312f9e8f338e9b1b44babf5aa3414848da7267e5cf13a9261815eb9185dc153cbd41ee7ce5ea23d2d0 0011-i386-Update-mfunction-return-for-return-with-pop.patch 955080ba3e42cfe2f604e5dcef46aa6fca7c899c7808398947af655ff3b7954e30807ef85246986a5cc7db36dbc870db151e9fa8d8bc967b89ea56efdf64614c 0012-i386-Add-TARGET_INDIRECT_BRANCH_REGISTER.patch -3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch" +3aae3a9cef8e8afe5a5433db8d9f410e1a2882481af01bb1d33232f987dbb74d7780c32be70b868bb391b3601b65ed3a16d777afea946f5eeaff72aa1e7fa3a9 0013-i386-Don-t-generate-alias-for-function-return-thunk.patch +e926a9c43eb774f788bbba168f4363fe37ccf2d57531540a6bccb3e16a487aa42e85dfdfc4fb0a3370eb890d100cd1e93279efb2fc9af73b09e3225511afa132 0014-fix-missing-includes-isl-0.20.patch" diff --git a/main/gcc4/APKBUILD b/main/gcc4/APKBUILD index 76b68c529..2731a7cc7 100644 --- a/main/gcc4/APKBUILD +++ b/main/gcc4/APKBUILD @@ -1,14 +1,14 @@ pkgname=gcc4 pkgver=9999 _pkgver=4.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="binutils isl mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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" diff --git a/main/gcc6/APKBUILD b/main/gcc6/APKBUILD index 29affbea7..281964697 100644 --- a/main/gcc6/APKBUILD +++ b/main/gcc6/APKBUILD @@ -1,14 +1,14 @@ pkgname=gcc6 pkgver=9999 _pkgver=6.4.0 -pkgrel=7 +pkgrel=8 pkgdesc="Old GCC for old vendor kernels (C compiler only)" url="http://gcc.gnu.org" arch="all" license="GPL LGPL" _gccrel=$_pkgver-r$pkgrel depends="binutils isl mpc1" -makedepends_build="gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev" +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"