From b6709fdde1a36e6d9c14f9af122179f123450ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Fri, 18 Oct 2013 10:48:02 +0000 Subject: 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. --- main/gcc/APKBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'main/gcc') 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 -- cgit v1.2.3