[patch] 0004-dev-lang-gnat-gpl-migrate-2016-r4-from-GCC_A_FAKEIT-.patch

0004-dev-lang-gnat-gpl-migrate-2016-r4-from-GCC_A_FAKEIT-.patch (text/plain), 2.25 KB, created by Sergei Trofimovich (RETIRED) on 2020-02-01 19:24:06 UTC

From 42f6ddaa84b6bf35bcba54d69ea283af1dfe060f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <[e-mail]>
Date: Sat, 1 Feb 2020 19:17:33 +0000
Subject: [PATCH 4/4] dev-lang/gnat-gpl: migrate 2016-r4 from GCC_A_FAKEIT, bug
 #706560

While at it:
- add RESTRICT="!test? ( test )"
- pass compiler version to downgrade_arch_flags directly

Bug: https://bugs.gentoo.org/706588
Signed-off-by: Sergei Trofimovich <[e-mail]>
---
 dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
index 15eafdcd92a..ea63e3896e0 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+PATCH_GCC_VER=4.9.4
 PATCH_VER="1.4"
 UCLIBC_VER="1.0"
 
@@ -21,15 +22,16 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 TOOLCHAIN_GCC_PV=4.9.4
 
-inherit toolchain-funcs toolchain
-
 REL=4.9
 MYP=gcc-${REL}-gpl-${PV}-src
 BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
 BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
 
+inherit toolchain-funcs toolchain
+
 DESCRIPTION="GNAT Ada Compiler - GPL version"
 HOMEPAGE="http://libre.adacore.com/"
+# we provide own tarball below
 SRC_URI+="
 	http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f
 		-> ${P}-src.tar.gz
@@ -52,6 +54,7 @@ LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
 KEYWORDS="amd64 x86"
 IUSE="+bootstrap"
+RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
 DEPEND="${RDEPEND}
@@ -98,14 +101,6 @@ src_unpack() {
 		die "ada compiler not available"
 	fi
 
-	GCC_A_FAKEIT="${P}-src.tar.gz
-		${MYP}.tar.gz
-		${FSFGCC}.tar.bz2
-		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
-	if use bootstrap; then
-		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
-	fi
-
 	toolchain_src_unpack
 	if use bootstrap; then
 		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
@@ -148,10 +143,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
-	GCC_BRANCH_VER=$(gcc-version)
-	downgrade_arch_flags
-	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
+	downgrade_arch_flags "$(gcc-version)"
 	toolchain_src_configure \
 		--enable-languages=ada \
 		--disable-libada \
-- 
2.25.0