fix for building gnat when older version is already installed (#86484). No -r bump as this is compile-time

(Portage version: 2.0.53_rc7)

3 files changed, 30 insertions, 16 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index db3b91a06d09..480c0155f073 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/gnat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.32 2005/11/13 17:46:20 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.33 2005/11/15 21:33:38 george Exp $
+
+  15 Nov 2005; <gerr@gentoo.org> gnat-3.44.ebuild:
+  fix for building gnat when older version is already installed (#86484)
 
 *gnat-3.44 (12 Nov 2005)
 
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index 757d5f00602f..574bde3770bb 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -19,5 +19,5 @@ MD5 9e647fec72de0891860dccad0a12c86a gnat-3.15p-r5.ebuild 5769
 MD5 608766ca2b3f1891c60dc4bf831bf14a gnat-3.15p.ebuild 5655
 MD5 7e1abff13d1add33756c2f586bbb5e63 gnat-3.41.ebuild 4012
 MD5 140f94774ca1df5f61298c4a7982bf3a gnat-3.43.ebuild 4041
-MD5 b7c2ccf8e7413d05b77b2cab3e2fe736 gnat-3.44.ebuild 5235
+MD5 c41f989722c9fa8f1c3e718c90c618ef gnat-3.44.ebuild 5399
 MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
diff --git a/dev-lang/gnat/gnat-3.44.ebuild b/dev-lang/gnat/gnat-3.44.ebuild
index a79b83ad71c2..a4a62e93e364 100644
--- a/dev-lang/gnat/gnat-3.44.ebuild
+++ b/dev-lang/gnat/gnat-3.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44.ebuild,v 1.1 2005/11/13 17:46:20 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44.ebuild,v 1.2 2005/11/15 21:33:38 george Exp $
 
 inherit gnat flag-o-matic
 
@@ -25,13 +25,19 @@ IUSE=""
 S="${WORKDIR}/gcc-${MY_PV}"
 GNATBUILD="${WORKDIR}/build"
 case ${ARCH} in
-	x86)	GNATBOOT="${WORKDIR}/boot"
-			GNATBOOTINST="${WORKDIR}/gnat-3.15p-i686-pc-linux-gnu-bin"
+	x86)
+		GNATBOOT="${WORKDIR}/boot"
+		GNATBOOTINST="${WORKDIR}/gnat-3.15p-i686-pc-linux-gnu-bin"
+		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc-lib"
 		;;
-	ppc)	GNATBOOT="${WORKDIR}/gnat-3.15p-powerpc-unknown-linux-gnu"
-		;;
-	amd64)	GNATBOOT="${WORKDIR}/usr"
+	ppc)
+		GNATBOOT="${WORKDIR}/gnat-3.15p-powerpc-unknown-linux-gnu"
+		GNATBOOTINST="${GNATBOOT}"
+		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc-lib"
 		;;
+	amd64)
+		GNATBOOT="${WORKDIR}/usr"
+		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc"
 esac
 
 #needed for shared libs
@@ -65,17 +71,22 @@ src_unpack() {
 
 src_compile() {
 	# Set some paths to our bootstrap compiler.
-	case ${ARCH} in
-		x86)    local GCC_EXEC_PREFIX="${GNATBOOT}/lib/gcc-lib/i686-pc-linux-gnu/3.2.3"
-			;;
-		amd64)	local GCC_EXEC_PREFIX="${GNATBOOT}/lib/gcc/x86_64-linux/3.4.5"
-			;;
-	esac
+	local GCC_EXEC_PREFIX=$(echo ${GCC_EXEC_BASE}/*/*)
 	local PATH="${GNATBOOT}/bin:${PATH}"
+
+	# hopefully this will catch one that works
+	local ADA_OBJECTS_PATH
+	local ADA_INCLUDE_PATH
+	for x in $(find "${GCC_EXEC_PREFIX}" -name adalib); do
+	   ADA_OBJECTS_PATH="${x}:${ADA_OBJECTS_PATH}"
+	done
+	for x in $(find "${GCC_EXEC_PREFIX}" -name adainclude); do
+	   ADA_INCLUDE_PATH="${x}:${ADA_INCLUDE_PATH}"
+	done
+
 	local LDFLAGS="-L${GCC_EXEC_PREFIX} -L${GNATBOOTINST}"
 	local CC="${GNATBOOT}/bin/gcc"
-	#simply assigning LD_LIBRARY_PATH, like with the other vars, does not work
-	export "LD_LIBRARY_PATH=${GNATBOOT}/lib"
+	export LD_LIBRARY_PATH="${GNATBOOT}/lib"
 
 	# Configure gcc
 	cd "${GNATBUILD}"