From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9BB31396D9 for ; Thu, 26 Oct 2017 20:26:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 047122BC012; Thu, 26 Oct 2017 20:26:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D87D22BC012 for ; Thu, 26 Oct 2017 20:26:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76F5A33BF51 for ; Thu, 26 Oct 2017 20:26:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07B37309 for ; Thu, 26 Oct 2017 20:26:30 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1509049583.fd205ea13d9f7998b8de9b5311d0dcb1c278f76d.axs@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-0.97-r17.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: fd205ea13d9f7998b8de9b5311d0dcb1c278f76d X-VCS-Branch: master Date: Thu, 26 Oct 2017 20:26:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c7fe4904-c193-44ad-bec5-855d181bc5a2 X-Archives-Hash: d63ca5c334adf904c95eb3e9c69695c9 commit: fd205ea13d9f7998b8de9b5311d0dcb1c278f76d Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Oct 26 20:25:49 2017 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Oct 26 20:26:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd205ea1 sys-boot/grub-0.97-r17: switch -nopie for -no-pie on gcc6+ As the -nopie option was something gentoo patched into gcc via the pie patches used for hardened, and these patches are not applied to gcc6, the no-pie patch used with grub:0 needs to be adjusted to hse the new flag when a newer gcc is used. Package-Manager: Portage-2.3.8, Repoman-2.3.3 sys-boot/grub/grub-0.97-r17.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild index 038a541f879..b34191f7346 100644 --- a/sys-boot/grub/grub-0.97-r17.ebuild +++ b/sys-boot/grub/grub-0.97-r17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # XXX: we need to review menu.lst vs grub.conf handling. We've been converting @@ -67,6 +67,13 @@ src_prepare() { "${S}"/grub/asmstub.c \ || die + # gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -no-pie + if (( $(gcc-major-version) > 5 )); then + sed -i 's/-nopie/-no-pie/' \ + "${WORKDIR}"/patch/860_all_grub-0.97-pie.patch \ + || die + fi + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch # bug 564890, 566638 epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch