aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2013-10-18 10:48:02 +0000
committerTimo Teräs <timo.teras@iki.fi>2013-10-18 10:48:02 +0000
commitb6709fdde1a36e6d9c14f9af122179f123450ff2 (patch)
treee69fc172df5fee24a88a646ed60d6f202961d5f0 /main
parent6554ee5831b764e0511e83d393dc3d222eadd5c2 (diff)
downloadaports-b6709fdde1a36e6d9c14f9af122179f123450ff2.tar.bz2
aports-b6709fdde1a36e6d9c14f9af122179f123450ff2.tar.xz
main/gcc: fix ada bootstrap once more
The new gentoo piepatches add -fstack-check to defaults which make ADA bootstrap break on certain platforms (at least arm). The configure patch affects stage1_cflags, which is needed if the currently installed host compiler has -fstack-check in it. The Makefile.in part affects rest of the bootstrap stages and is required if the current patch set includes -fstack-check in the default spec.
Diffstat (limited to 'main')
-rw-r--r--main/gcc/APKBUILD4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index b41fb3799c..0882435965 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -13,7 +13,7 @@ _cross=""
&& _cross="-$CTARGET"
pkgname="$pkgname$_cross"
-pkgrel=0
+pkgrel=1
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org"
arch="all"
@@ -231,6 +231,8 @@ prepare() {
# TODO: upstream this to piepatches
sed -i -e 's/stage1_cflags="$stage1_cflags -fno-stack-protector"/stage1_cflags="$stage1_cflags -fno-stack-protector -fno-stack-check"/g' \
configure
+ sed -i -e 's/^ESP_NOSSP_CFLAGS = -fno-stack-protector$/ESP_NOSSP_CFLAGS = -fno-stack-protector -fno-stack-check/g' \
+ Makefile.in
# genautomata crashes with a "Bus Error" when compiled with PIC
# mostly affecting cross-builds as on native build bootstrapping