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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C165E158086 for ; Sat, 1 Jan 2022 21:44:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C648E2BC03B; Sat, 1 Jan 2022 21:44:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DDA732BC03B for ; Sat, 1 Jan 2022 21:44:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DA943406C2 for ; Sat, 1 Jan 2022 21:44:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78097219 for ; Sat, 1 Jan 2022 21:44:06 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1641073423.eb143fae3bca40c52cfbf6f96b9a439dc26b0976.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/gnat-gpl/, dev-lang/gnat-gpl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild X-VCS-Directories: dev-lang/gnat-gpl/files/ dev-lang/gnat-gpl/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: eb143fae3bca40c52cfbf6f96b9a439dc26b0976 X-VCS-Branch: master Date: Sat, 1 Jan 2022 21:44:06 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2d62ab4c-811b-48d0-84a1-a3c7a32ba0bf X-Archives-Hash: 68e06f96a34b4f091bb237c5460ec60a commit: eb143fae3bca40c52cfbf6f96b9a439dc26b0976 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Jan 1 21:43:43 2022 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sat Jan 1 21:43:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb143fae dev-lang/gnat-gpl: fix cet detection Closes: https://bugs.gentoo.org/830345 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch | 10 ++++++++++ dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch index 3caa2a6d996e..2bfc54c551a9 100644 --- a/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch +++ b/dev-lang/gnat-gpl/files/gnat-gpl-2021-gentoo.patch @@ -39,3 +39,13 @@ + %{fdump-scos:-fpreserve-decisions-generic}\ %{fprofile-arcs|fprofile-generate*|coverage:\ - %{!fprofile-update=singel:\ +--- a/gcc-10-2021-20210519-19A74-src/config/cet.m4 2022-01-01 11:18:09.663425422 +0100 ++++ b/gcc-10-2021-20210519-19A74-src/config/cet.m4 2022-01-01 11:18:14.809345911 +0100 +@@ -62,7 +62,6 @@ + i[[34567]]86-*-linux* | x86_64-*-linux*) + may_have_cet=yes + save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -fcf-protection" + case "$enable_cet" in + auto) + # Check if target supports multi-byte NOPs diff --git a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild index 3502c2c009fd..60a6e2908ead 100644 --- a/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild +++ b/dev-lang/gnat-gpl/gnat-gpl-2021-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -87,6 +87,11 @@ src_prepare() { ln -s /usr/bin/$CHOST-ld \ "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/ld \ || die + rm "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + || die + ln -s /usr/bin/$CHOST-as \ + "${WORKDIR}"/${BTSTRP}/libexec/gcc/x86_64-pc-linux-gnu/4.7.4/as \ + || die fi CC=${GCC}