X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=blobdiff_plain;f=Makefile;h=9164300fcf9267087b302e08d1afdc526f5eaa27;hp=a732e84192e3686506f1098420780c49b4993151;hb=581794b5a3b8c50fa6fe25325b8c59a96a89fa41;hpb=40ea93f22a6b5c7187c9ddd7e6b17987d8687abc diff --git a/Makefile b/Makefile index a732e84..9164300 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $ DISTNAME= ghc-${VERSION} -VERSION= 6.10.4 +VERSION= 6.12.1 CATEGORIES= lang MASTER_SITES= http://www.haskell.org/ghc/dist/${VERSION}/ MAINTAINER= kristerw@NetBSD.org @@ -10,13 +10,10 @@ COMMENT= Compiler for the functional language Haskell LICENSE= modified-bsd DISTFILES= ${DISTNAME}-src.tar.bz2 \ - ghc-6.6.1-src.tar.bz2 \ - ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz \ - ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz + ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 -SITES.ghc-6.6.1-src.tar.bz2 = http://www.haskell.org/ghc/dist/6.6.1/ -SITES.ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz = http://static.cielonegro.org/archive/ -SITES.ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz = http://static.cielonegro.org/archive/ +SITES.${DISTNAME}-src.tar.bz2 = http://www.haskell.org/ghc/dist/${VERSION}/ +SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 = http://static.cielonegro.org/archive/ PKG_DESTDIR_SUPPORT= user-destdir @@ -24,44 +21,77 @@ PKG_DESTDIR_SUPPORT= user-destdir # Unregisterised HC packages are architecture dependent. We have to # create more HC packages to support more architectures. -ONLY_FOR_PLATFORM= *-*-i386 *-*-powerpc +#ONLY_FOR_PLATFORM= *-*-i386 *-*-powerpc +ONLY_FOR_PLATFORM= *-*-i386 -GNU_CONFIGURE= yes -CONFIGURE_ENV+= PerlCmd=${PERL5:Q} -USE_TOOLS+= gmake perl:run find:run cp:run +USE_TOOLS+= gmake bsdtar perl # We don't want to extract all of the DISTFILEs. -EXTRACT_ONLY= ${DISTNAME}-src.tar.bz2 \ - ghc-6.6.1-src.tar.bz2 - -.if ${MACHINE_ARCH} == "i386" -EXTRACT_ONLY += ghc-6.6.1-i386-unknown-freebsd-hc.tar.gz -.elif ${MACHINE_ARCH} == "powerpc" -EXTRACT_ONLY += ghc-6.6.1-powerpc-apple-darwin-hc.tar.gz -.endif +EXTRACT_ONLY= ${DISTNAME}-src.tar.bz2 # We need to tell the ./configure that libgmp is in a non-standard path. Without # that, the resulting GHC tries to link programs by executing ld(1) without # passing it -L${PREFIX}/lib. -CONFIGURE_ARGS += --with-gmp-includes=${PREFIX}/include -CONFIGURE_ARGS += --with-gmp-libraries=${PREFIX}/lib +CONFIGURE_ARGS += \ + --prefix=${PREFIX} \ + --mandir=${PKGMANDIR} \ + --with-gmp-includes=${PREFIX}/include \ + --with-gmp-libraries=${PREFIX}/lib \ + --with-iconv-includes=${PREFIX}/include \ + --with-iconv-libraries=${PREFIX}/lib # Build an unregisterised bootstrap compiler and install it directly # into the .buildlink directory. But we can't use "make install" # because we don't build it in a standard way (./configure && make). # -# To install it, we search for any non-symlink executables in -# work/ghc-6.6.1 whose name ends with "-inplace". Then copy those -# files into ${BUILDLINK_DIR}/bin with dropping the "-inplace" at -# their tails. +# To install it, we just copy ghc and ghc-pkg from +# "work/bootstrap/ghc-${VERSION}/inplace/bin" to +# "${BUILDLINK_DIR}/bin". Note that in-place ghc isn't usable before +# running "ghc-pkg recache". + +.if ${MACHINE_ARCH} == "i386" +BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 +#.elif ${MACHINE_ARCH} == "powerpc" +#BOOTSTRAP_TARBALL = ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 +.endif + +.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" +BUILD_MK = ${PKGDIR}/files/bsd-build.mk +.else +BUILD_MK = ${PKGDIR}/files/fallback-build.mk +.endif + pre-configure: - cd ${WRKDIR}/ghc-6.6.1 && \ - ${CHMOD} +x ./distrib/hc-build && \ - ${ENV} ${CONFIGURE_ENV} ./distrib/hc-build -C --disable-readline --enable-hc-boot-unregisterised && \ - ${FIND} . -type f -and -perm -o+x -and -name '*-inplace' | \ - while read i; do \ - ${CP} $$i ${BUILDLINK_DIR}/bin/`basename $$i | sed -e 's/-inplace//'`; \ - done + ${RUN} cd ${WRKDIR} && \ + ${ECHO} "====> Preparing bootstrap compiler" && \ + ${MKDIR} bootstrap && \ + ${CP} -r ${DISTNAME} bootstrap && \ + cd bootstrap/${DISTNAME} && \ + ${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \ + ${ECHO} "====> Configuring for bootstrap compiler" && \ + ${ENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot ${CONFIGURE_ARGS} && \ + ${ECHO} "====> Extracting bootstrap HC archive" && \ + (cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \ + ${SH} mkfiles && \ + ${ECHO} "====> Building bootstrap compiler" && \ + ${SED} -e 's#\\[\\[PREFIX\\]\\]#${PREFIX}#g' ${BUILD_MK} > mk/build.mk && \ + for c in libraries/*/configure; do \ + (cd `${DIRNAME} $$c` && ${ENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \ + done && \ + ${SED} -i -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" \ + inplace/lib/package.conf.d/*.conf */*/package-data.mk */*/*/package-data.mk && \ + ${TOUCH} -r inplace/lib/package.conf.d */*/package-data.mk */*/*/package-data.mk && \ + ${GMAKE} bootstrapping-files && \ + ${GMAKE} all_ghc_stage2 && \ + ${GMAKE} inplace/bin/ghc-pkg && \ + ${GMAKE} inplace/lib/unlit && \ + inplace/bin/ghc-pkg recache && \ + ${CP} inplace/bin/ghc-stage2 ${BUILDLINK_DIR}/bin/ghc && \ + ${CP} inplace/bin/ghc-pkg ${BUILDLINK_DIR}/bin/ghc-pkg + +do-configure: + ${RUN} cd ${WRKSRC} && \ + ${ENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} # The ghc compiler does normally split the generated C files into small # parts before sending them to gcc, to enable the linker to eliminate @@ -77,6 +107,10 @@ pre-build: # Some unused scripts don't pass the portability test. CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw +BUILDLINK_DEPMETHOD.libxslt = build +.include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" +.include "../../textproc/libxslt/buildlink3.mk" +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk"