diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2013-02-13 21:46:44 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2013-02-13 21:46:44 +0000 |
| commit | 968c8a57d191da81f323166286ec9e619bff6e5c (patch) | |
| tree | 0edc3d8fbbe50bf07346d6867d96dd35df05c2b5 /dev-lang | |
| parent | Fixed build failure against 'USE=tinfo ncurses' in bug #454216 by Reinis Danne. (diff) | |
| download | gentoo-2-968c8a57d191da81f323166286ec9e619bff6e5c.tar.gz gentoo-2-968c8a57d191da81f323166286ec9e619bff6e5c.tar.bz2 gentoo-2-968c8a57d191da81f323166286ec9e619bff6e5c.zip | |
Fix ghc build failure against 'USE=tinfo ncurses' (bug #454216).
(Portage version: 2.2.0_alpha161_p21/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ghc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch | 25 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.4.2.ebuild | 9 |
3 files changed, 37 insertions, 3 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog index 155654f15891..8d6803ee21bd 100644 --- a/dev-lang/ghc/ChangeLog +++ b/dev-lang/ghc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ghc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.230 2013/02/09 18:33:57 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.231 2013/02/13 21:46:44 slyfox Exp $ + + 13 Feb 2013; Sergei Trofimovich <slyfox@gentoo.org> + +files/terminfo-0.3.2.5-tinfo.patch, ghc-7.4.2.ebuild: + Fix ghc build failure against 'USE=tinfo ncurses' (bug #454216). *ghc-7.6.2 (09 Feb 2013) diff --git a/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch b/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch new file mode 100644 index 000000000000..ca10da2e03ae --- /dev/null +++ b/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/454216 + +Mon Jan 7 16:34:47 FET 2013 Judah Jacobson <judah.jacobson@gmail.com> + * Search for terminfo in libtinfo; fixes GHC #7281. + + Patch from Paul Johnson. +diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac +--- old-terminfo/configure.ac 2013-02-14 00:16:11.816111434 +0300 ++++ new-terminfo/configure.ac 2013-02-14 00:16:11.819111434 +0300 +@@ -39,10 +39,11 @@ + TERMINFO_INCLUDES="$CursesIncludes term.h" + fi + +-AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw, +- [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses, +- [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses, +- HaveLibCurses=NO; LibCurses=not-installed)])]) ++AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo, ++ [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw, ++ [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses, ++ [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses, ++ HaveLibCurses=NO; LibCurses=not-installed)])])]) + + if test "x$HaveLibCurses" = "xNO" ; then + AC_MSG_FAILURE([curses library not found, so this package cannot be built]) diff --git a/dev-lang/ghc/ghc-7.4.2.ebuild b/dev-lang/ghc/ghc-7.4.2.ebuild index d6917ea5ba7a..8641c9d6961d 100644 --- a/dev-lang/ghc/ghc-7.4.2.ebuild +++ b/dev-lang/ghc/ghc-7.4.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.1 2012/11/14 09:34:39 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.2 2013/02/13 21:46:44 slyfox Exp $ # Brief explanation of the bootstrap logic: # @@ -375,6 +375,11 @@ src_prepare() { sed -i -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' utils/haddock/doc/configure.ac || die fi + cd "${S}"/libraries/terminfo + # bug #454216 + epatch "${FILESDIR}"/terminfo-0.3.2.5-tinfo.patch + + cd "${S}" # as we have changed the build system eautoreconf fi |