diff options
Diffstat (limited to 'dev-haskell/hmake')
| -rw-r--r-- | dev-haskell/hmake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/hmake/files/hmake-3.11-ghc66.patch | 36 | ||||
| -rw-r--r-- | dev-haskell/hmake/hmake-3.11.ebuild | 7 |
3 files changed, 45 insertions, 4 deletions
diff --git a/dev-haskell/hmake/ChangeLog b/dev-haskell/hmake/ChangeLog index ec4b182f404e..8a8d4ad582d9 100644 --- a/dev-haskell/hmake/ChangeLog +++ b/dev-haskell/hmake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/hmake # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.28 2006/10/05 03:31:50 cparrott Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.29 2006/10/11 18:18:00 dcoutts Exp $ + + 11 Oct 2006; Duncan Coutts <dcoutts@gentoo.org> + +files/hmake-3.11-ghc66.patch, hmake-3.11.ebuild: + Added patch to fix building with ghc-6.6 05 Oct 2006; Chris Parrott <cparrott@gentoo.org> hmake-3.11.ebuild: marked stable for amd64 (bug 144678) diff --git a/dev-haskell/hmake/files/hmake-3.11-ghc66.patch b/dev-haskell/hmake/files/hmake-3.11-ghc66.patch new file mode 100644 index 000000000000..6dbb2c85efd9 --- /dev/null +++ b/dev-haskell/hmake/files/hmake-3.11-ghc66.patch @@ -0,0 +1,36 @@ +diff -urwpN hmake-3.11.orig/src/hmake/Makefile hmake-3.11/src/hmake/Makefile +--- hmake-3.11.orig/src/hmake/Makefile 2006-05-03 14:38:29.000000000 +0100 ++++ hmake-3.11/src/hmake/Makefile 2006-09-12 10:34:28.000000000 +0100 +@@ -46,7 +46,7 @@ ifeq "nhc" "$(BUILDCOMP)" + HEAP = -H4M + endif + ifeq "ghc" "$(BUILDCOMP)" +-HFLAGS += $(shell ${LOCAL}fixghc ${GHCSYM} -package lang) ++HFLAGS += $(shell ${LOCAL}fixghc ${GHCSYM}) + endif + ifeq "hbc" "$(BUILDCOMP)" + all: hbc +diff -urwpN hmake-3.11.orig/src/interpreter/Makefile hmake-3.11/src/interpreter/Makefile +--- hmake-3.11.orig/src/interpreter/Makefile 2005-10-07 14:34:32.000000000 +0100 ++++ hmake-3.11/src/interpreter/Makefile 2006-09-12 10:37:23.000000000 +0100 +@@ -11,7 +11,7 @@ CHFILES = $(patsubst %.hs, ../hmake/%.$C + + ifeq "${BUILDCOMP}" "ghc" + HFLAGS = $(shell $(LOCAL)fixghc $(GHCSYM) \ +- -package lang -package util -package base $(READLINE) ) ++ -package base $(READLINE) ) + export HFLAGS + endif + ifeq "${BUILDCOMP}" "hbc" +diff -urwpN hmake-3.11.orig/src/interpreter/SimpleLineEditor.hs hmake-3.11/src/interpreter/SimpleLineEditor.hs +--- hmake-3.11.orig/src/interpreter/SimpleLineEditor.hs 2004-06-25 20:58:31.000000000 +0100 ++++ hmake-3.11/src/interpreter/SimpleLineEditor.hs 2006-09-12 10:39:43.000000000 +0100 +@@ -26,7 +26,7 @@ import IO + import Monad (when) + import Char (isSpace) + #if USE_READLINE +-import Readline ++import System.Console.Readline + #else + #if defined(__HBC__) + import IOExts (IORef, newIORef, readIORef, writeIORef, unsafePerformIO) diff --git a/dev-haskell/hmake/hmake-3.11.ebuild b/dev-haskell/hmake/hmake-3.11.ebuild index a0e9714bf654..ca79062f7cd3 100644 --- a/dev-haskell/hmake/hmake-3.11.ebuild +++ b/dev-haskell/hmake/hmake-3.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.11.ebuild,v 1.7 2006/10/05 03:31:50 cparrott Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.11.ebuild,v 1.8 2006/10/11 18:18:00 dcoutts Exp $ inherit base eutils fixheadtails ghc-package @@ -10,7 +10,7 @@ SRC_URI="http://www.haskell.org/hmake/${P}.tar.gz" LICENSE="nhc98" SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" +KEYWORDS="~amd64 ~ppc ppc64 sparc ~x86" IUSE="" DEPEND="virtual/ghc @@ -27,6 +27,7 @@ RDEPEND="virtual/ghc src_unpack() { unpack ${A} cd ${S} + epatch "${FILESDIR}/${P}-ghc66.patch" # fix all head/tail declarations sed -i 's/tail -1/tail -n 1/' src/hmake/MkConfig.hs @@ -38,7 +39,7 @@ src_unpack() { src_compile() { # package uses non-standard configure, therefore econf does # not work ... - ./configure \ + READLINE='-package readline' ./configure \ --prefix=/usr \ --mandir=/usr/share/man/man1 \ --buildwith="$(ghc-getghc)" \ |