From b10a9ffa3a668d3d8df3de0633a37ba7b8d5a4d4 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 26 Nov 2010 10:29:10 +0900 Subject: [PATCH] 7.0.1 for i386-unknown-netbsd (not tested) --- Makefile | 7 ++++--- TODO | 11 +++++++++-- distinfo | 3 +++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 04bc5ca..81c9334 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ LICENSE= modified-bsd DISTFILES= ${DISTNAME}-src.tar.bz2 #DISTFILES+= ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 -#DISTFILES+= ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 +DISTFILES+= ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 DISTFILES+= ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 @@ -32,7 +32,7 @@ PKG_DESTDIR_SUPPORT= user-destdir # If you want to build HC packages yourself, follow instructions in # the ./TODO file. #ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc -ONLY_FOR_PLATFORM= Darwin-*-powerpc +ONLY_FOR_PLATFORM= NetBSD-*-i386 Darwin-*-powerpc # We must provide the real pass to gcc to the ./configure script, # because GHC has a runtime dependency on it. Aren't there any ways @@ -128,7 +128,8 @@ ${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc (cd `${DIRNAME} $$c` && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \ done && \ for i in inplace/lib/package.conf.d/*.conf */*/package-data.mk */*/*/package-data.mk; do \ - ${SED} -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" $$i > $$i.tmp; \ + ${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" \ + -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" $$i > $$i.tmp; \ ${MV} -f $$i.tmp $$i; \ done && \ ${TOUCH} -r inplace/lib/package.conf.d */*/package-data.mk */*/*/package-data.mk && \ diff --git a/TODO b/TODO index 5ee5ead..cc117cc 100644 --- a/TODO +++ b/TODO @@ -34,7 +34,9 @@ Build some configuration files:: Run ``./configure`` on the host tree:: $ cd ghc-{VERSION}-host - $ ./configure + $ ./configure \ + --with-iconv-includes=/usr/pkg/include \ + --with-iconv-libraries=/usr/pkg/lib Then create ``ghc-{VERSION}-host/mk/build.mk`` with the following contents:: @@ -55,6 +57,9 @@ contents:: utils/ghc-pkg_dist-install_v_HC_OPTS += -keep-hc-files INTEGER_LIBRARY = integer-simple + libraries/terminfo_CONFIGURE_OPTS += \ + --configure-option=--with-curses-includes=/usr/pkg/include \ + --configure-option=--with-curses-libraries=/usr/pkg/lib Copy some configuration files from the ``-target`` tree:: @@ -91,7 +96,9 @@ Then extract it again, in a different directory:: Modify hard-coded paths in inplace ``.conf`` files, and then re-archive the HC tree:: - $ sed -i.bak -e 's#'`dirname \`pwd\``'#[[GHC_SOURCE_PATH]]#g' \ + $ gsed -i.bak \ + -e 's#/usr/pkg#[[PREFIX]]#g' \ + -e 's#'`dirname \`pwd\``'#[[GHC_SOURCE_PATH]]#g' \ inplace/lib/package.conf.d/*.conf \ */*/package-data.mk \ */*/*/package-data.mk diff --git a/distinfo b/distinfo index 0392fe4..795066d 100644 --- a/distinfo +++ b/distinfo @@ -1,5 +1,8 @@ $NetBSD: distinfo,v 1.22 2008/07/07 14:58:00 kristerw Exp $ +SHA1 (ghc-7.0.1-boot-i386-unknown-netbsd.tar.bz2) = b784ac379c701fb0b54e39e1bad9b96cd320d98d +RMD160 (ghc-7.0.1-boot-i386-unknown-netbsd.tar.bz2) = 3e72ba5e97260c08be263335f7feac2ccf86ba9b +Size (ghc-7.0.1-boot-i386-unknown-netbsd.tar.bz2) = 21704547 bytes SHA1 (ghc-7.0.1-boot-powerpc-apple-darwin.tar.bz2) = 48ef53eeac7c7b3dacf942602cf533f8209dd0b4 RMD160 (ghc-7.0.1-boot-powerpc-apple-darwin.tar.bz2) = 1e0f77678677ba27a5549bddcc88458ab746d3b3 Size (ghc-7.0.1-boot-powerpc-apple-darwin.tar.bz2) = 21831376 bytes -- 2.40.0