X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from smtp-1.adminflex.de (smtp-1.adminflex.de [84.38.79.71]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id E337EDC00F5 for ; Sun, 24 Nov 2013 15:33:04 +0000 (UTC) Received: from 91-66-231-240-dynip.superkabel.de ([91.66.231.240] helo=[192.168.178.35]) by smtp-1.adminflex.de with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1VkchK-0007zq-NW for alpine-devel@lists.alpinelinux.org; Sun, 24 Nov 2013 16:38:14 +0000 Message-ID: <52921C08.8080508@port-zero.com> Date: Sun, 24 Nov 2013 16:32:24 +0100 From: "Leslie P. Polzer | PORT ZERO" User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 To: alpine-devel@lists.alpinelinux.org Subject: Re: [alpine-devel] main/gcc: fix Ada -fno-stack-check handling References: <5290AD0F.2010203@port-zero.com> <20131123180735.6b700fdf@vostro> In-Reply-To: <20131123180735.6b700fdf@vostro> Content-Type: multipart/mixed; boundary="------------070100020107030309020703" This is a multi-part message in MIME format. --------------070100020107030309020703 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable On 11/23/2013 05:07 PM, Timo Teras wrote: > If you set environment vars, it should be in build() or in the global > block. Setting those in prepare() only breaks "abuild build". Duh, thanks. Good we have peer review. Modified patch attached. Leslie --=20 Dipl.Ing.(BA) Leslie P. Polzer | CTO - PORT ZERO UG (haftungsbeschr=E4nkt) Softwareentwicklung & IT Engineering Adalbertstra=DFe 7/8 10999 Berlin Tel.: +49 (0)30 - 69 200 907 - 0 Fax: +49 (0)30 - 69 200 907 - 9 http://www.port-zero.com --------------070100020107030309020703 Content-Type: text/x-patch; name="0001-main-gcc-update-fix-to-compile-Ada-with-fno-stack-ch.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-main-gcc-update-fix-to-compile-Ada-with-fno-stack-ch.pa"; filename*1="tch" >From ce5a772e9b7cc625579e592e83d7d58bf1ade038 Mon Sep 17 00:00:00 2001 From: "Leslie P. Polzer" Date: Sun, 24 Nov 2013 12:41:20 +0100 Subject: [PATCH] main/gcc: update fix to compile Ada with -fno-stack-check. --- main/gcc/APKBUILD | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 45c7609..1aa6003 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -13,7 +13,7 @@ _cross="" && _cross="-$CTARGET" pkgname="$pkgname$_cross" -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Compiler Collection" url="http://gcc.gnu.org" arch="all" @@ -225,14 +225,6 @@ prepare() { return 1 fi - # fix ada bootstrap - # piepatches adds -fstack-check to spec which breaks ada bootstrap - # 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 # somehow seems to build proper genautomata @@ -357,6 +349,11 @@ build() { --with-system-zlib \ || return 1 + # fix ada bootstrap + # piepatches adds -fstack-check to spec which breaks ada bootstrap + # TODO: upstream this to piepatches + export ADA_CFLAGS='-fno-stack-check' + make || return 1 } -- 1.8.4.3 --------------070100020107030309020703-- --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---