summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Dupeyron <calchan@gentoo.org>2008-02-09 19:00:26 +0000
committerDenis Dupeyron <calchan@gentoo.org>2008-02-09 19:00:26 +0000
commit269f7c755bbd852763850cfa872fe886e25b6247 (patch)
tree937532aebe55c39711e9055813ac5a8ccc87fdc4 /sci-electronics
parentRe-add ~alpha/~ia64 (diff)
downloadhistorical-269f7c755bbd852763850cfa872fe886e25b6247.tar.gz
historical-269f7c755bbd852763850cfa872fe886e25b6247.tar.bz2
historical-269f7c755bbd852763850cfa872fe886e25b6247.zip
Fixed compilation on amd64, bug #203721.
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/ghdl/ChangeLog7
-rw-r--r--sci-electronics/ghdl/Manifest4
-rw-r--r--sci-electronics/ghdl/ghdl-0.26.ebuild18
3 files changed, 22 insertions, 7 deletions
diff --git a/sci-electronics/ghdl/ChangeLog b/sci-electronics/ghdl/ChangeLog
index 4d55680fae94..14f97a2e13a7 100644
--- a/sci-electronics/ghdl/ChangeLog
+++ b/sci-electronics/ghdl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-electronics/ghdl
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.3 2007/12/31 21:27:10 josejx Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ChangeLog,v 1.4 2008/02/09 19:00:26 calchan Exp $
+
+ 09 Feb 2008; Denis Dupeyron <calchan@gentoo.org> ghdl-0.26.ebuild:
+ Fixed compilation on amd64, bug #203721.
31 Dec 2007; Joseph Jezak <josejx@gentoo.org> ghdl-0.26.ebuild:
Marked ~ppc for bug #196439.
diff --git a/sci-electronics/ghdl/Manifest b/sci-electronics/ghdl/Manifest
index 7583dfd9de06..8e41d3c5bca8 100644
--- a/sci-electronics/ghdl/Manifest
+++ b/sci-electronics/ghdl/Manifest
@@ -1,5 +1,5 @@
DIST gcc-core-4.1.2.tar.bz2 17485561 RMD160 612cbd5b795f7095fb3f565e6a8eaaee82c472c5 SHA1 d6875295f6df1bec4a6f4ab8f0da54bfb8d97306 SHA256 7be9c5df8000ae35d0928f0a254bfb5e8478cad5e5e57fd07820530c03b3711d
DIST ghdl-0.26.tar.bz2 723192 RMD160 1cfd7a17fd61c30e425835f87b4a500ce2bc89fa SHA1 affd89cbf1721ec83ef7deae536794e042dc13e7 SHA256 60987834e40c08c4830179e56f57d1ab906cc12b29ae58e3630d78da3e8ba8a0
-EBUILD ghdl-0.26.ebuild 1936 RMD160 9a16633b4bacf4a02578f3cf14f5adc22de105ce SHA1 0e4cd4d6ea77ea7df3f9e7a71bbed7f132bd17ad SHA256 bd9bde2a159139bad210a634429d7495b3af6df9d7f425dc1af46bbc32ba26e8
-MISC ChangeLog 733 RMD160 06e4359fe5ca34c8adddcb4a462d1f612e0cb3ae SHA1 9d1a341b8c8a537dd2387b8c17408e61e284af56 SHA256 12d5f8c2e953a49941244382409809a8b580bf3ed730e81e0ca3ba0837911f6e
+EBUILD ghdl-0.26.ebuild 2309 RMD160 0b89bf88347fc3efe34a11a146543cfd5852102f SHA1 a92cdf198a9ef91ff4b9cf8309fdd466592bdda6 SHA256 04b226255004cc6e938e21992e313311440f61c42fa51bdb587b7e70a0a87403
+MISC ChangeLog 847 RMD160 6dd123a84384031d762af960cb38ab6260a80c72 SHA1 b2747ef85dd7a1e53dd43acdc098d095c55223b0 SHA256 251c06d828a6028f6117ea26f9641ac1ed5154dedddaf3ecc34c314a0c86bb1d
MISC metadata.xml 457 RMD160 1109ba523b49de11adbc2aab294b7dcf359c1871 SHA1 24b4eb79fe450ac62a80bab8ca0c7cf315afb231 SHA256 e7ff050c97cb69f7062abe8bde70d94f53c865bddeadfbfa2200f7dcb987f4f8
diff --git a/sci-electronics/ghdl/ghdl-0.26.ebuild b/sci-electronics/ghdl/ghdl-0.26.ebuild
index 9ad153d448e6..d21c352630d0 100644
--- a/sci-electronics/ghdl/ghdl-0.26.ebuild
+++ b/sci-electronics/ghdl/ghdl-0.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.26.ebuild,v 1.3 2007/12/31 21:27:10 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/ghdl/ghdl-0.26.ebuild,v 1.4 2008/02/09 19:00:26 calchan Exp $
inherit multilib
@@ -12,7 +12,7 @@ SRC_URI="http://ghdl.free.fr/${P}.tar.bz2
mirror://gnu/gcc/releases/gcc-${GCC_VERSION}/gcc-core-${GCC_VERSION}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
DEPEND=">=sys-apps/portage-2.1.2.10
virtual/gnat"
@@ -37,6 +37,18 @@ src_unpack() {
# Fix atan2 bug in math_complex-body.vhdl
sed -i -e 's/atan2(z.re,z.im)/atan2(z.im,z.re)/' \
gcc/vhdl/libraries/ieee/math_complex-body.vhdl || die "sed failed"
+
+ # For multilib profile arch, see bug #203721
+ if (has_multilib_profile || use multilib ) ; then
+ for T_LINUX64 in `find "${S}/gcc/config" -name t-linux64` ;
+ do
+ einfo "sed for ${T_LINUX64} for multilib. :)"
+ sed -i \
+ -e "s:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:" \
+ "${T_LINUX64}" \
+ || die "sed for ${T_LINUX64} failed. :("
+ done
+ fi
}
src_compile() {