diff options
| author |   George Shapovalov <george@gentoo.org> | 2005-12-28 20:37:56 +0000 |
|---|---|---|
| committer | George Shapovalov <george@gentoo.org> | 2005-12-28 20:37:56 +0000 |
| commit | 65743badf02e75e72c41d08435cbf06fa42b067d (patch) | |
| tree | ba3abf3c7dd4b5379601c0dc8e564a20b38103c1 /dev-lang/gnat | |
| parent | xml2 dep missing (diff) | |
| download | gentoo-2-65743badf02e75e72c41d08435cbf06fa42b067d.tar.gz gentoo-2-65743badf02e75e72c41d08435cbf06fa42b067d.tar.bz2 gentoo-2-65743badf02e75e72c41d08435cbf06fa42b067d.zip | |
fixed building gnat on x86 off gcc-3.4 (#90685).
(Portage version: 2.1_pre2)
Diffstat (limited to 'dev-lang/gnat')
| -rw-r--r-- | dev-lang/gnat/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/gnat/files/digest-gnat-3.44-r2 | 2 | ||||
| -rw-r--r-- | dev-lang/gnat/gnat-3.44-r2.ebuild | 20 |
3 files changed, 19 insertions, 11 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/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 |