x86 installation fix

4 files changed, 27 insertions, 8 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index c0cc7dc11f3b..57ce519b6e36 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.14 2003/09/30 19:20:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.15 2003/10/04 16:38:38 dholm Exp $
+
+  04 Oct 2003; David Holm <dholm@gentoo.org> gnat-3.15p-r3.ebuild,
+  files/gnat-3.15p-i686-pc-linux-gnu-bin.patch:
+  Added installation fix on x86 submitted by Olivier Crete <tester@gentoo.org>.
 
   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
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index 36eeb9e8b852..0a1aaf33b3e5 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -1,11 +1,11 @@
-MD5 22e59579ad479c2decc372644e7b3aed ChangeLog 3107
+MD5 3f8331e9f888ee3904199106f355ebbf ChangeLog 3303
 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 5fb643f4c952c50509762af55884b9ad gnat-3.15p-r3.ebuild 5828
+MD5 00c28267d432f4037e64c158856615c7 gnat-3.15p-r3.ebuild 5893
 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
@@ -15,3 +15,4 @@ MD5 f2825770e20893d32738f4106cd3d628 files/gnat-3.15p-gentoo.patch.bz2 3754
 MD5 6055ef6f0b3cd0df65743bfedb9de925 files/gnat-3.15p-gentoo-nonx86.patch.bz2 2112
 MD5 7fabcf7198fb4001adfba250899e0024 files/gnat-3.15p-noaddr2line.patch.bz2 542
 MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r3 378
+MD5 6c454f942791a6212d8b5cf5c92aa2d0 files/gnat-3.15p-i686-pc-linux-gnu-bin.patch 605
diff --git a/dev-lang/gnat/files/gnat-3.15p-i686-pc-linux-gnu-bin.patch b/dev-lang/gnat/files/gnat-3.15p-i686-pc-linux-gnu-bin.patch
new file mode 100644
index 000000000000..6e9e401bcaac
--- /dev/null
+++ b/dev-lang/gnat/files/gnat-3.15p-i686-pc-linux-gnu-bin.patch
@@ -0,0 +1,12 @@
+diff -Naur gnat-3.15p-i686-pc-linux-gnu-bin.orig/Makefile gnat-3.15p-i686-pc-linux-gnu-bin/Makefile
+--- gnat-3.15p-i686-pc-linux-gnu-bin.orig/Makefile	2002-10-23 10:54:23.000000000 +0200
++++ gnat-3.15p-i686-pc-linux-gnu-bin/Makefile	2003-10-04 10:46:40.000000000 +0200
+@@ -53,7 +53,7 @@
+ 	  fi \
+ 	done
+ 	cp -p -f gnat1$(ext)     $(libsubdir)
+-	tar cf - rts* | (cd $(libsubdir); tar xf -)
++	tar cf - rts* | (cd $(libsubdir); tar xf -) || true
+ 	case `uname` in \
+ 	   *_NT*) cp -p -f *.dll $(user_bin); cp -p -f *.a $(libsubdir); \
+ 	          mv -f $(libsubdir)/rts/adainclude $(libsubdir)/adainclude; \
diff --git a/dev-lang/gnat/gnat-3.15p-r3.ebuild b/dev-lang/gnat/gnat-3.15p-r3.ebuild
index 29be86caa3b9..6b0d8882ef91 100644
--- a/dev-lang/gnat/gnat-3.15p-r3.ebuild
+++ b/dev-lang/gnat/gnat-3.15p-r3.ebuild
@@ -1,6 +1,8 @@
 # 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.4 2003/09/30 19:20:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.15p-r3.ebuild,v 1.5 2003/10/04 16:38:39 dholm Exp $
+
+inherit gnat
 
 DESCRIPTION="The GNU Ada Toolkit"
 DEPEND="x86? ( >=app-shells/tcsh-6.0 )"
@@ -29,7 +31,7 @@ case ${ARCH} in
 			;;
 esac
 
-inherit gnat
+CFLAGS="-O2 -gnatpgn"
 
 src_unpack() {
 	unpack ${A}
@@ -37,6 +39,7 @@ src_unpack() {
 	# Install the bootstrap compiler
 	if [ "${ARCH}" = "x86" ]; then
 		cd "${GNATBOOTINST}"
+		patch -p1 < ${FILESDIR}/gnat-3.15p-i686-pc-linux-gnu-bin.patch
 		echo $'\n'3$'\n'${GNATBOOT}$'\n' | ./doconfig > doconfig.log 2>&1
 		./doinstall
 	fi
@@ -67,7 +70,6 @@ src_compile() {
 	fi
 
 	# Configure gcc
-	local CFLAGS="-O2 -gnatpgn"
 	cd "${S}"
 	econf --libdir=/usr/lib/ada --program-prefix=gnat \
 		|| die "./configure failed"
@@ -108,7 +110,7 @@ src_install() {
 
 	# Build and install the static version of gnatlib
 	einfo "Building static gnatlib"
-	make CC="gcc" CFLAGS="-O2 -gnatpgn" GNATLIBCFLAGS="-O2 -gnatpgn" gnatlib ||
+	make CC="gcc" CFLAGS="${CFLAGS}" GNATLIBCFLAGS="${CFLAGS}" gnatlib ||
 		die "Failed while compiling static gnatlib!"
 	make prefix="${D}/usr" libdir="${D}/usr/lib/ada" \
 		LANGUAGES="c ada gcov" GCC_INSTALL_NAME=gnatgcc install-gnatlib ||
@@ -127,7 +129,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" \
+		make CC="gcc" CFLAGS="${CFLAGS}" GNATLIBCFLAGS="${CFLAGS} -fPIC" \
 			THREAD_KIND="fsu" gnatlib-shared
 		make prefix="${D}/usr" libdir="${D}/usr/lib/ada" install-gnatlib
 		cd "${D}/usr/lib/ada/gcc-lib/${CHOST}/2.8.1"