new version out - to follow gcc-3.4.5. Adjusted libgcc_s installation (gnat-3.44 will have problems with new gcc).

Package-Manager: portage-2.1_pre3-r1

5 files changed, 58 insertions, 47 deletions

diff --git a/dev-lang/gnat/ChangeLog b/dev-lang/gnat/ChangeLog
index ef51f01a1b34..3a19871752ca 100644
--- a/dev-lang/gnat/ChangeLog
+++ b/dev-lang/gnat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2005/12/28 20:37:56 george Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/ChangeLog,v 1.40 2006/01/03 16:39:45 george Exp $
+
+*gnat-3.45 (03 Jan 2006)
+
+  03 Jan 2006; George Shapovalov <george@gentoo.org> -gnat-3.44.ebuild,
+  +gnat-3.45.ebuild:
+  new gnat version, to follow gcc-3.4.5. Some adjustments to install libgcc_s
+  properly were necessary. Removed 3.44-r0.
 
   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.
diff --git a/dev-lang/gnat/Manifest b/dev-lang/gnat/Manifest
index c67792b550b6..15c94069246f 100644
--- a/dev-lang/gnat/Manifest
+++ b/dev-lang/gnat/Manifest
@@ -1,4 +1,4 @@
-MD5 a7d792b567fd890891b89e88d113086b ChangeLog 6508
+MD5 1bcd22189b4439d5638639593ca26a7c ChangeLog 6750
 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
@@ -6,9 +6,9 @@ MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r4 378
 MD5 5710cea3459403d02bc4ad4674fa7d1b files/digest-gnat-3.15p-r5 378
 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 37ec829a7146b3a0069b195780d2dc98 files/digest-gnat-3.44-r2 360
+MD5 abed28bb4fc0cce9bb9d260d19e6fe6c files/digest-gnat-3.45 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
@@ -24,5 +24,5 @@ MD5 7e1abff13d1add33756c2f586bbb5e63 gnat-3.41.ebuild 4012
 MD5 140f94774ca1df5f61298c4a7982bf3a gnat-3.43.ebuild 4041
 MD5 a434a32f31860757df690d7a1ec2a21d gnat-3.44-r1.ebuild 4983
 MD5 e708ff7e7db4fd42251423216f2bcd0e gnat-3.44-r2.ebuild 5079
-MD5 f9e686a899e7d173784d4aaee898c0fe gnat-3.44.ebuild 5446
+MD5 1fbf56558303e522f6be3a158a4ccd32 gnat-3.45.ebuild 5495
 MD5 4b8299d1078b0c3a88969f43c9ae6a64 metadata.xml 927
diff --git a/dev-lang/gnat/files/digest-gnat-3.44 b/dev-lang/gnat/files/digest-gnat-3.44
deleted file mode 100644
index 173081569931..000000000000
--- a/dev-lang/gnat/files/digest-gnat-3.44
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 324005671decf8a5e4473e52ce5b5dbc gcc-3.4-amd64.tar.gz 25847787
-MD5 7da97a3f50bfa252d7fbb37ab22053f3 gcc-ada-3.4.4.tar.bz2 3460438
-MD5 9dd911fd9bc136ca42b73c68735d853b gcc-core-3.4.4.tar.bz2 13153342
-MD5 57c060cd1ccef8b1ae9165b11d98780a gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz 13482938
-MD5 33a146f39c04b2ac055ae81585622d08 gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 8228916
diff --git a/dev-lang/gnat/files/digest-gnat-3.45 b/dev-lang/gnat/files/digest-gnat-3.45
new file mode 100644
index 000000000000..234d1598679e
--- /dev/null
+++ b/dev-lang/gnat/files/digest-gnat-3.45
@@ -0,0 +1,5 @@
+MD5 c1a2ee0512334a922554e9b6ff0b73cf gcc-3.4-amd64.tar.gz 15097044
+MD5 a656394b22f40aee4db3161b32e1a761 gcc-3.4-i386.tar.bz2 10344150
+MD5 797afd0098e6b29ff85a2a8158d23f32 gcc-ada-3.4.5.tar.bz2 3784842
+MD5 0114ba67f9aabad91d96797d0b6017c4 gcc-core-3.4.5.tar.bz2 13397308
+MD5 33a146f39c04b2ac055ae81585622d08 gnat-3.15p-powerpc-unknown-linux-gnu.tar.bz2 8228916
diff --git a/dev-lang/gnat/gnat-3.44.ebuild b/dev-lang/gnat/gnat-3.45.ebuild
index 3ee217140454..87b83cc89bb6 100644
--- a/dev-lang/gnat/gnat-3.44.ebuild
+++ b/dev-lang/gnat/gnat-3.45.ebuild
@@ -1,55 +1,47 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.3 2005/12/10 16:50:23 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat/gnat-3.45.ebuild,v 1.1 2006/01/03 16:39:45 george Exp $
 
 inherit gnat flag-o-matic
 
-MY_PV="3.4.4"
+MY_PV="3.4.5"
 
 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://gd.tuwien.ac.at/languages/ada/gnat/3.15p/gnat-3.15p-i686-pc-redhat71-gnu-bin.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*
-	x86? ( >=app-shells/tcsh-6.0 )"
+DEPEND="=sys-devel/gcc-3.4*"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64"
 LICENSE="GMGPL"
 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"
-		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc-lib"
-		;;
 	ppc)
 		GNATBOOT="${WORKDIR}/gnat-3.15p-powerpc-unknown-linux-gnu"
 		GNATBOOTINST="${GNATBOOT}"
 		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc-lib"
 		;;
-	amd64)
+	amd64 | x86)
 		GNATBOOT="${WORKDIR}/usr"
 		GCC_EXEC_BASE="${GNATBOOT}/lib/gcc"
+		;;
 esac
 
-
 src_unpack() {
 	unpack ${A}
 
 	# 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
+	if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" ]; then
+		cd ${S}/gcc/ada/
+		patch Make-lang.in < ${FILESDIR}/gnat-3.44-amd64-Make-lang.in.patch
 	fi
 
 	# Prepare the gcc source directory
@@ -59,12 +51,9 @@ src_unpack() {
 	touch gcc/ada/nmake.ad[bs]
 	mkdir -p "${GNATBUILD}"
 
-	#fixup some hardwired flags (cause problems for shared libs)
-#	sed -i -e 's:GNATLIBCFLAGS = -g -O2:GNATLIBCFLAGS = -g -O2 -fPIC:'	\
-#		gcc/ada/Makefile.in || die "patching Makefile.in failed"
-#	sed -i -e 's:CFLAGS = -O2:CFLAGS = -g -O2 -fPIC:'	\
-#		gcc/ada/Makefile.adalib || die "patching Makefile.adalib failed"
-
+	#fixup some hardwired flags
+	sed -i -e "s:CFLAGS = -O2:CFLAGS = ${CFLAGS}:"	\
+		gcc/ada/Makefile.adalib || die "patching Makefile.adalib failed"
 }
 
 src_compile() {
@@ -72,7 +61,7 @@ src_compile() {
 	local GCC_EXEC_PREFIX=$(echo ${GCC_EXEC_BASE}/*/*)
 	local PATH="${GNATBOOT}/bin:${PATH}"
 
-	# hopefully this will catch one that works
+	# this should catch one that works
 	local ADA_OBJECTS_PATH
 	local ADA_INCLUDE_PATH
 	for x in $(find "${GCC_EXEC_PREFIX}" -name adalib); do
@@ -82,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
@@ -93,8 +89,6 @@ src_compile() {
 		--enable-languages="c,ada" \
 		--enable-libada \
 		--with-gcc \
-		--with-gnu-ld \
-		--with-gnu-as \
 		--enable-threads=posix \
 		--enable-shared \
 		--with-system-zlib \
@@ -123,10 +117,14 @@ src_compile() {
 	cd "${GNATBUILD}"
 	emake bootstrap || die "bootstrap failed"
 
+	einfo "building gnatlib_and_tools"
+	# make rts honor user defined CFLAGS
 	MAKEOPTS=-j1 emake -C gcc gnatlib_and_tools || die "gnatlib_and_tools failed"
-	#the shared libs compile breaks complaining that it needs -fPIC and yet 
-	#it ignores the set flag. Commented out untill resolved
-#	MAKEOPTS=-j1 emake -C gcc gnatlib-shared LIBRARY_VERSION=3.4 || die "gnatlib-shared failed"
+
+	einfo "building shared lib"
+	rm -f gcc/ada/rts/*.{o,ali} || die
+		#otherwise make tries to reuse already compiled (without -fPIC) objs..
+	MAKEOPTS=-j1 emake -C gcc gnatlib-shared LIBRARY_VERSION=3.4 || die "gnatlib-shared failed"
 }
 
 src_install() {
@@ -151,18 +149,21 @@ src_install() {
 
 	#above make installs libgcc_s into weird location
 	#removing it, as it is provided by gcc anyway
-	rm -rf ${D}/usr/lib/lib*
+	#rm -rf ${D}/usr/lib/lib*
 
 	# These are all provided by gcc
-	# Not all, some go by different name as well. (GS)
-#	rm -rf ${D}/usr/share/man
 	rm -rf ${D}/usr/share/info/{gcc*,cpp*}
+	dosym /usr/share/info/gnat_ugn_unw.info /usr/share/info/gnat.info
 
 	#on amd64 installer misdetects arch string
+	# also we need to move appropriate libgcc_s to join the other libs
 	if [ "${ARCH}" == "amd64" ]; then
 		local myCHOST="x86_64-unknown-linux-gnu"
+		mv ${D}/usr/lib/lib64/* ${D}/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/
+		mv ${D}/usr/lib/lib/* ${D}/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/32/
 	else
 		local myCHOST="${CHOST}"
+		mv ${D}/usr/lib/lib/* ${D}/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/
 	fi
 	dodir "/usr/lib/ada/gcc/${myCHOST}/${MY_PV}/rts-native"
 
@@ -173,10 +174,13 @@ src_install() {
 	# Make native threads the default
 	ln -s rts-native/adalib adalib
 	ln -s rts-native/adainclude adainclude
+
+	# remove uneeded stuff
+	rm -rf ${D}/usr/lib/li{b,b64} ${D}/usr/lib/ada/libiberty.a
 }
 
 pkg_postinst() {
-	# Notify the user what changed
+	# Notify the user of what changed
 	einfo ""
 	einfo "The compiler has been installed as gnatgcc, and the coverage testing"
 	einfo "tool as gnatgcov."