Added some more compilation fixes for x86

3 files changed, 30 insertions, 17 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index 11fa0a71c2c6..c0cc7dc11f3b 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/gnat
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.13 2003/09/29 22:47:13 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.14 2003/09/30 19:20:47 dholm Exp $
+
+  30 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
+  Added some more compilation fixes for x86 along with more descripting error
+  messages.
 
   30 Sep 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild:
   Compile gnat with "-O2 -gnatpgn" and without "-fPIC" (for static libs) as
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index b3b88cf862e4..36eeb9e8b852 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -1,11 +1,11 @@
-MD5 0609268309d1eefb479f0434bddbf8cf ChangeLog 2949
+MD5 22e59579ad479c2decc372644e7b3aed ChangeLog 3107
 MD5 332d79b0cddb0dfcb80bc77487f36918 gnat-3.14p.ebuild 5673
 MD5 6deb19eecc4f53aba08a7aaa89e80d0d gnat-3.15p-r1.ebuild 5468
 MD5 2f454961e48b21552f1a9bd35b83a8dc gnat-3.15p-r2.ebuild 4879
 MD5 f44a1458554adef6e9794dc5d4fbb719 gnat-3.15p.ebuild 5667
 MD5 9dd49db5f4cbf1afbe367cb529a22b78 gnat-5.0_pre20030822.ebuild 4264
 MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
-MD5 d758dc1c2c9972f4bea8b0461731cc46 gnat-3.15p-r3.ebuild 5475
+MD5 5fb643f4c952c50509762af55884b9ad gnat-3.15p-r3.ebuild 5828
 MD5 59500f81e672cff22232586fc278547b files/digest-gnat-3.14p 213
 MD5 737e39907fb4f28640a1b4cbbc1cdc78 files/digest-gnat-3.15p 216
 MD5 419f46c7076e98eee00cf04ce2199ab0 files/digest-gnat-3.15p-r1 288
diff --git a/dev-lang/gnat/gnat-3.15p-r3.ebuild b/dev-lang/gnat/gnat-3.15p-r3.ebuild
index 6bd615d1ffbe..29be86caa3b9 100644
--- a/dev-lang/gnat/gnat-3.15p-r3.ebuild
+++ b/dev-lang/gnat/gnat-3.15p-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r3.ebuild,v 1.3 2003/09/29 22:47:13 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r3.ebuild,v 1.4 2003/09/30 19:20:47 dholm Exp $
 
 DESCRIPTION="The GNU Ada Toolkit"
 DEPEND="x86? ( >=app-shells/tcsh-6.0 )"
@@ -49,23 +49,25 @@ src_unpack() {
 	bzcat "${FILESDIR}/${P}-gentoo.patch.bz2" | patch -p1
 	touch ada/treeprs.ads ada/a-[es]info.h ada/nmake.ad[bs]
 
+	# Make $local_prefix point to $prefix
+	sed -i -e "s/@local_prefix@/@prefix@/" "${S}/Makefile.in"
+
 	#if [ "${ARCH}" != "x86" ]; then
 		cd "${S}"
 		bzcat "${FILESDIR}/${P}-noaddr2line.patch.bz2" | patch -p1
+		sed -i -e "s/-laddr2line//g" ada/Makefile.in
 	#fi
 }
 
 src_compile() {
 	local PATH="${GNATBOOT}/bin:${PATH}"
-	if [ -z ${GNATBOOTINST} ]; then
-		local LDFLAGS="-L${GNATBOOTINST}"
+	local LDFLAGS="-L${GNATBOOT}/lib/gcc-lib/i686-pc-linux-gnu/2.8.1"
+	if [ -d ${GNATBOOTINST} ]; then
+		local LDFLAGS="-L${GNATBOOTINST} ${LDFLAGS}"
 	fi
 
-	# Make $local_prefix point to $prefix
-	sed -i -e "s/@local_prefix@/@prefix@/" "${S}/Makefile.in"
-
 	# Configure gcc
-	local CFLAGS="-O0"
+	local CFLAGS="-O2 -gnatpgn"
 	cd "${S}"
 	econf --libdir=/usr/lib/ada --program-prefix=gnat \
 		|| die "./configure failed"
@@ -76,20 +78,25 @@ src_compile() {
 
 	# Compile it by first using the bootstrap compiler and then bootstrapping
 	# our own version. Finally compile the libraries and tools.
-	make CC="gcc" CFLAGS="-O2 -gnatpgn" LANGUAGES="c ada gcov" || \
+	einfo "Building compiler"
+	make CC="gcc" CFLAGS="${CFLAGS}" LANGUAGES="c ada gcov" ||
 		die "Failed while running inital compilation!"
-	make CC="gcc" CFLAGS="-O2 -gnatpgn" LANGUAGES="c ada gcov" bootstrap || \
+	make CC="gcc" CFLAGS="${CFLAGS}" LANGUAGES="c ada gcov" bootstrap ||
 		die "Died while bootstrapping!"
-	make CC="gcc" CFLAGS="-O2 -gnatpgn" GNATLIBCFLAGS="-O2 -gnatpgn -fPIC" \
-		gnatlib-shared || die "Failed to build the shared version of gnatlib!"
-	make CC="gcc" CFLAGS="-O2 -gnatpgn" gnattools || \
+	einfo "Building shared gnatlib"
+	make CC="gcc" CFLAGS="${CFLAGS}" GNATLIBCFLAGS="${CFLAGS} -fPIC" \
+		gnatlib-shared ||
+		die "Failed to build the shared version of gnatlib!"
+	einfo "Building gnattools"
+	make CC="gcc" CFLAGS="${CFLAGS}" gnattools ||
 		die "Failed to build gnattools!"
 }
 
 src_install() {
 	local PATH="${GNATBOOT}/bin:${PATH}"
-	if [ -z ${GNATBOOTINST} ]; then
-		local LDFLAGS="-L${GNATBOOTINST}"
+	local LDFLAGS="-L${GNATBOOT}/lib/gcc-lib/i686-pc-linux-gnu/2.8.1"
+	if [ -d ${GNATBOOTINST} ]; then
+		local LDFLAGS="${LDFLAGS} -L${GNATBOOTINST}"
 	fi
 
 	# Install gnatgcc, tools and native threads library
@@ -100,6 +107,7 @@ src_install() {
 	touch "${D}/usr/lib/ada/gcc-lib/${CHOST}/2.8.1/include/float.h"
 
 	# Build and install the static version of gnatlib
+	einfo "Building static gnatlib"
 	make CC="gcc" CFLAGS="-O2 -gnatpgn" GNATLIBCFLAGS="-O2 -gnatpgn" gnatlib ||
 		die "Failed while compiling static gnatlib!"
 	make prefix="${D}/usr" libdir="${D}/usr/lib/ada" \
@@ -118,6 +126,7 @@ src_install() {
 
 		# Compile and install the FSU threads library
 		rm stamp-gnatlib1
+		einfo "Building FSU-threads runtime"
 		make CC="gcc" CFLAGS="-O0" GNATLIBCFLAGS="-O0 -fPIC" \
 			THREAD_KIND="fsu" gnatlib-shared
 		make prefix="${D}/usr" libdir="${D}/usr/lib/ada" install-gnatlib