From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-89341-garchives=archives.gentoo.org@lists.gentoo.org>
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 49F6D138334
	for <garchives@archives.gentoo.org>; Sat, 23 Nov 2019 08:16:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6F4B5E0819;
	Sat, 23 Nov 2019 08:16:49 +0000 (UTC)
Received: from tupone.it (tupone.it [213.133.98.230])
	(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 0A90EE07F9
	for <gentoo-dev@lists.gentoo.org>; Sat, 23 Nov 2019 08:16:48 +0000 (UTC)
Received: from alfredo-i5 (unknown [95.235.4.69])
	by tupone.it (Postfix) with ESMTPSA id 438BC1810B6
	for <gentoo-dev@lists.gentoo.org>; Sat, 23 Nov 2019 09:16:46 +0100 (CET)
Date: Sat, 23 Nov 2019 09:16:42 +0100
From: Alfredo Tupone <tupone@gentoo.org>
To: gentoo development <gentoo-dev@lists.gentoo.org>
Subject: [gentoo-dev] toolchain.eclass more friendly about ada/gnat
Message-ID: <20191123091642.5544ecee@alfredo-i5>
X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu)
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Archives-Salt: 76754951-d96f-4ad5-99df-4a77f8a55208
X-Archives-Hash: 5fcf0e62422775be7e2fb1c09a298282

I would like to have comments about the followinf changes.
I "fear" the shopts nullglob a little

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index a3081c38bac1..aca10b4f37ed 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1817,33 +1817,37 @@ toolchain_src_install() {
 	fi
 
 	dodir /etc/env.d/gcc
 	create_gcc_env_entry
 	create_revdep_rebuild_entry
 
 	# Setup the gcc_env_entry for hardened gcc 4 with minispecs
 	want_minispecs && copy_minispecs_gcc_specs
 
 	# Make sure we dont have stuff lying around that
 	# can nuke multiple versions of gcc
 	gcc_slot_java
 
 	dodir /usr/bin
 	cd "${D}"${BINPATH}
+
+	shopt nullglob
+	local gnat_extra_bins="gnat*"
+
 	# Ugh: we really need to auto-detect this list.
 	#      It's constantly out of date.
-	for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do
+	for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ${gnat_extra_bins} ; do
 		# For some reason, g77 gets made instead of ${CTARGET}-g77...
 		# this should take care of that
 		if [[ -f ${x} ]] ; then
 			# In case they're hardlinks, clear out the target first
 			# otherwise the mv below will complain.
 			rm -f ${CTARGET}-${x}
 			mv ${x} ${CTARGET}-${x}
 		fi
 
 		if [[ -f ${CTARGET}-${x} ]] ; then
 			if ! is_crosscompile ; then
 				ln -sf ${CTARGET}-${x} ${x}
 				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
 					/usr/bin/${x}-${GCC_CONFIG_VER}
 			fi