fixed building gnat on x86 off gcc-3.4 (#90685).

Package-Manager: portage-2.1_pre2

4 files changed, 22 insertions, 14 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index de4b16567945..ef51f01a1b34 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,9 +1,11 @@
 # 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.38 2005/12/28 16:45:43 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.39 2005/12/28 20:37:56 george Exp $
 
-  28 Dec 2005; George Shapovalov <george@gentoo.org> gnat-3.44-r1.ebuild:
-  ready for unmasking on x86, amd64 supported in -r2 and ppc needs testing
+  28 Dec 2005; George Shapovalov <george@gentoo.org> gnat-3.44-r1.ebuild, gnat-3.44-r2.ebuild:
+  Ready for unmasking on x86, amd64 supported in -r2 and ppc needs testing.
+  Fixed building gnat on x86 off gcc-3.4 (#90685). Now both x86 and amd64 use
+  common procedure..
 
   19 Dec 2005; George Shapovalov <george@gentoo.org> gnat-3.44-r2.ebuild:
   all of amd64 stuff for gnat-3.44 is set, redady for unmasking. Removed ~x86
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index 99c6dca5fd3c..c67792b550b6 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -1,4 +1,4 @@
-MD5 ce544348213d3615b533540d2bc559fc ChangeLog 6387
+MD5 a7d792b567fd890891b89e88d113086b ChangeLog 6508
 MD5 59500f81e672cff22232586fc278547b files/digest-gnat-3.14p 213
 MD5 737e39907fb4f28640a1b4cbbc1cdc78 files/digest-gnat-3.15p 216
 MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r3 378
@@ -8,7 +8,7 @@ MD5 ffcd9ae5ebd258ffd9c88fc3cf225bd6 files/digest-gnat-3.41 315
 MD5 119e0c400e71cdafcfb3eeca106c7029 files/digest-gnat-3.43 315
 MD5 24fa8c7547a59391c65d8a1f6e28e0ae files/digest-gnat-3.44 382
 MD5 c1759c1573408778816003fb5c8c8cc0 files/digest-gnat-3.44-r1 315
-MD5 aa0506e53784085c260dc9001ff1680c files/digest-gnat-3.44-r2 359
+MD5 37ec829a7146b3a0069b195780d2dc98 files/digest-gnat-3.44-r2 360
 MD5 6055ef6f0b3cd0df65743bfedb9de925 files/gnat-3.15p-gentoo-nonx86.patch.bz2 2112
 MD5 f2825770e20893d32738f4106cd3d628 files/gnat-3.15p-gentoo.patch.bz2 3754
 MD5 6c454f942791a6212d8b5cf5c92aa2d0 files/gnat-3.15p-i686-pc-linux-gnu-bin.patch 605
@@ -23,6 +23,6 @@ MD5 608766ca2b3f1891c60dc4bf831bf14a gnat-3.15p.ebuild 5655
 MD5 7e1abff13d1add33756c2f586bbb5e63 gnat-3.41.ebuild 4012
 MD5 140f94774ca1df5f61298c4a7982bf3a gnat-3.43.ebuild 4041
 MD5 a434a32f31860757df690d7a1ec2a21d gnat-3.44-r1.ebuild 4983
-MD5 7e91bca705a60e00158df0aeacbfd42b gnat-3.44-r2.ebuild 5003
+MD5 e708ff7e7db4fd42251423216f2bcd0e gnat-3.44-r2.ebuild 5079
 MD5 f9e686a899e7d173784d4aaee898c0fe gnat-3.44.ebuild 5446
 MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
diff --git a/dev-lang/gnat/files/digest-gnat-3.44-r2 b/dev-lang/gnat/files/digest-gnat-3.44-r2
index ec911bdb2950..5abed79a4e78 100644
--- a/dev-lang/gnat/files/digest-gnat-3.44-r2
+++ b/dev-lang/gnat/files/digest-gnat-3.44-r2
@@ -1,5 +1,5 @@
 MD5 c1a2ee0512334a922554e9b6ff0b73cf gcc-3.4-amd64.tar.gz 15097044
-MD5 465b94f3be66bf6c3f15b67dfb1e67e4 gcc-3.4-i386.tar.gz 12314657
+MD5 a656394b22f40aee4db3161b32e1a761 gcc-3.4-i386.tar.bz2 10344150
 MD5 7da97a3f50bfa252d7fbb37ab22053f3 gcc-ada-3.4.4.tar.bz2 3460438
 MD5 9dd911fd9bc136ca42b73c68735d853b gcc-core-3.4.4.tar.bz2 13153342
 MD5 33a146f39c04b2ac055ae81585622d08 gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 8228916
diff --git a/dev-lang/gnat/gnat-3.44-r2.ebuild b/dev-lang/gnat/gnat-3.44-r2.ebuild
index b114884775f9..ab2590965d58 100644
--- a/dev-lang/gnat/gnat-3.44-r2.ebuild
+++ b/dev-lang/gnat/gnat-3.44-r2.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-r2.ebuild,v 1.2 2005/12/19 19:36:28 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.44-r2.ebuild,v 1.3 2005/12/28 20:37:56 george Exp $
 
 inherit gnat flag-o-matic
 
@@ -9,16 +9,15 @@ MY_PV="3.4.4"
 DESCRIPTION="GNAT Ada Compiler"
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${MY_PV}/gcc-core-${MY_PV}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${MY_PV}/gcc-ada-${MY_PV}.tar.bz2
-	x86? ( http://dev.gentoo.org/~george/src/gcc-3.4-i386.tar.gz )
+	x86? ( http://dev.gentoo.org/~george/src/gcc-3.4-i386.tar.bz2 )
 	ppc? ( mirror://gentoo/gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 )
 	amd64? ( http://dev.gentoo.org/~george/src/gcc-3.4-amd64.tar.gz )"
 HOMEPAGE="http://www.gnat.com/"
 
-DEPEND="=sys-devel/gcc-3.4*
-	x86? ( >=app-shells/tcsh-6.0 )"
+DEPEND="=sys-devel/gcc-3.4*"
 
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 LICENSE="GMGPL"
 IUSE=""
 
@@ -72,8 +71,15 @@ src_compile() {
 	   ADA_INCLUDE_PATH="${x}:${ADA_INCLUDE_PATH}"
 	done
 
-	local LDFLAGS="-L${GCC_EXEC_PREFIX} -L${GNATBOOTINST}"
-	local CC="${GNATBOOT}/bin/gcc"
+	case ${ARCH} in
+		ppc)
+			export LDFLAGS="-L${GCC_EXEC_PREFIX} -L${GNATBOOTINST}"
+			;;
+		amd64 | x86)
+			export LDFLAGS="-L${GCC_EXEC_PREFIX}"
+			;;
+	esac
+	export CC="${GNATBOOT}/bin/gcc"
 	export LD_LIBRARY_PATH="${GNATBOOT}/lib"
 
 	# Configure gcc