diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2010-09-13 18:20:56 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2010-09-13 18:20:56 +0000 |
| commit | 599a740aa34c6c1e12e1b68f97c4824479765d40 (patch) | |
| tree | dbcae0466903bba0875e76627aeb82dcf5cd8c86 /dev-lang | |
| parent | Version bump, remove old testing. (diff) | |
| download | gentoo-2-599a740aa34c6c1e12e1b68f97c4824479765d40.tar.gz gentoo-2-599a740aa34c6c1e12e1b68f97c4824479765d40.tar.bz2 gentoo-2-599a740aa34c6c1e12e1b68f97c4824479765d40.zip | |
Fixed configure regeneration failure (bug #337025)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/ghc/files/ghc-6.12.3-autoconf-2.66-4252.patch | 20 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-6.12.3.ebuild | 5 |
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 654197297171..c35d34e66c5c 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,11 @@ # 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.189 2010/09/09 18:53:01 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.190 2010/09/13 18:20:56 slyfox Exp $ + + 13 Sep 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild, + +files/ghc-6.12.3-autoconf-2.66-4252.patch: + Fixed configure regeneration failure (bug #337025). Thanks to Andrew + Savchenko for the report and found solution. 09 Sep 2010; Sergei Trofimovich <slyfox@gentoo.org> ghc-6.12.3.ebuild: Added sparc build for 6.12.3. Marked ~sparc (bug #283531) diff --git a/dev-lang/ghc/files/ghc-6.12.3-autoconf-2.66-4252.patch b/dev-lang/ghc/files/ghc-6.12.3-autoconf-2.66-4252.patch new file mode 100644 index 000000000000..7341ca35c97a --- /dev/null +++ b/dev-lang/ghc/files/ghc-6.12.3-autoconf-2.66-4252.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/show_bug.cgi?id=337025 +http://hackage.haskell.org/trac/ghc/ticket/4252 +Mon Aug 16 17:24:42 EEST 2010 Ross Paterson <ross@soi.city.ac.uk> + * fix FP_CHECK_ALIGNMENT for autoconf 2.66 (fixes #4252) + + Recent versions of AS_LITERAL_IF don't like *'s. Fix from + + http://blog.gmane.org/gmane.comp.sysutils.autoconf.general/month=20100701 +diff -rN -u old-ghc/aclocal.m4 new-ghc/aclocal.m4 +--- old-ghc/aclocal.m4 2010-09-13 21:00:36.288338228 +0300 ++++ new-ghc/aclocal.m4 2010-09-13 21:00:37.209338228 +0300 +@@ -141,7 +141,7 @@ + # A variation of AC_CHECK_SIZEOF for computing the alignment restrictions of a + # given type. Defines ALIGNMENT_TYPE. + AC_DEFUN([FP_CHECK_ALIGNMENT], +-[AS_LITERAL_IF([$1], [], ++[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [], + [AC_FATAL([$0: requires literal arguments])])[]dnl + AC_CHECK_TYPE([$1], [], [], [$3])[]dnl + m4_pushdef([fp_Cache], [AS_TR_SH([fp_cv_alignment_$1])])[]dnl diff --git a/dev-lang/ghc/ghc-6.12.3.ebuild b/dev-lang/ghc/ghc-6.12.3.ebuild index ca82f3918ff6..0ac6369deb47 100644 --- a/dev-lang/ghc/ghc-6.12.3.ebuild +++ b/dev-lang/ghc/ghc-6.12.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.11 2010/09/09 18:53:01 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.12.3.ebuild,v 1.12 2010/09/13 18:20:56 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -219,6 +219,9 @@ src_unpack() { # same with NA on ppc epatch "${FILESDIR}/ghc-6.12.3-ppc-use-libffi-for-foreign-import-wrapper.patch" + # substitute outdated macros + epatch "${FILESDIR}/ghc-6.12.3-autoconf-2.66-4252.patch" + # as we have changed the build system eautoreconf fi |