diff options
author | Lennart Kolmodin <kolmodin@gentoo.org> | 2010-03-25 21:00:52 +0000 |
---|---|---|
committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2010-03-25 21:00:52 +0000 |
commit | 435b564be82e4b2a639a0c82a83485cefa72768d (patch) | |
tree | f1b00867705c0f90943c148e2696b607ae9cd0e8 /dev-lang | |
parent | Bump to 2.0.3.7. Contains a number of bug fixes. (diff) | |
download | gentoo-2-435b564be82e4b2a639a0c82a83485cefa72768d.tar.gz gentoo-2-435b564be82e4b2a639a0c82a83485cefa72768d.tar.bz2 gentoo-2-435b564be82e4b2a639a0c82a83485cefa72768d.zip |
Fix compilation issue with dev-lang/ghc. See bug #310963.
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/ghc/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 846603b6da0b..cfce2f984978 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.173 2010/01/26 19:54:10 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.174 2010/03/25 21:00:52 kolmodin Exp $ + + 25 Mar 2010; Lennart Kolmodin <kolmodin@gentoo.org> + files/ghc-6.12.1-configure-CHOST.patch: + Fix building with CHOST="i486-pc-linux-gnu". + Issue reported by Sergey Mironov <ierton@gmail.com>, + patch contributed by Sergei Trofimovich <slyfox@inbox.ru>. + For details, see bug #310963. *ghc-6.12.1 (26 Jan 2010) diff --git a/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch b/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch index cbb288cc06c2..3369d703889d 100644 --- a/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch +++ b/dev-lang/ghc/files/ghc-6.12.1-configure-CHOST.patch @@ -5,7 +5,7 @@ fi fi +build=`echo "$build" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'` -+build=`echo "$build" | sed -e 's/i686/i386/'` ++[build=`echo "$build" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket if test "$host" = "" then @@ -14,7 +14,7 @@ fi fi +host=`echo "$host" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'` -+host=`echo "$host" | sed -e 's/i686/i386/'` ++[host=`echo "$host" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket if test "$target" = "" then @@ -23,7 +23,7 @@ fi fi +target=`echo "$target" | sed -e 's/linux-gnu/linux/' -e 's/-pc-/-unknown-/'` -+target=`echo "$target" | sed -e 's/i686/i386/'` ++[target=`echo "$target" | sed -e 's/i[4-6]86/i386/'`] # escaping square bracket exeext='' soext='.so' |