X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=67db91abaf629765fcf2cd58e5f712c38f6bfea9;hb=e23df020f1fa71a2d4e1e76456c9ea9804d2c795;hp=2a0cbfbbe0bea18fa52279125d74c3e8cfff3ade;hpb=8fa3d45608aad3bebde37f7bdb182c25cbf63715;p=pkgsrc-ghc.git diff --git a/Makefile b/Makefile index 2a0cbfb..67db91a 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,17 @@ # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $ DISTNAME= ghc-${VERSION} -VERSION= 7.0.1 +VERSION= 7.0.3 CATEGORIES= lang -MASTER_SITES= http://new-www.haskell.org/ghc/dist/${VERSION}/ +MASTER_SITES= http://www.haskell.org/ghc/dist/${VERSION}/ MAINTAINER= kristerw@NetBSD.org HOMEPAGE= http://www.haskell.org/ghc/ COMMENT= Compiler for the functional language Haskell 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-freebsd.tar.bz2 +DISTFILES+= ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 DISTFILES+= ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 @@ -31,15 +31,14 @@ 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 FreeBSD-*-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 # better than this? .include "../../mk/compiler.mk" .if empty(CCPATH) -WARNINGS+= "This package depends on pkgsrc's undocumented variable\ +WARNINGS+= "This package depends on pkgsrc's undocumented variable \ CCPATH but it disappeared somehow." WARNINGS+= "Using hard-coded /usr/bin/gcc as the C compiler..." CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc @@ -47,7 +46,7 @@ CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc CONFIGURE_ARGS+= --with-gcc=${CCPATH} .endif -USE_TOOLS+= gmake bsdtar perl:run +USE_TOOLS+= gmake gtar perl:run CONFIGURE_ENV+= PerlCmd=${PERL5:Q} # We don't want to extract all of the DISTFILEs. @@ -84,9 +83,9 @@ PLATFORM = i386-unknown-freebsd .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk PLATFORM = powerpc-apple-darwin - # Existence of libelf makes LeadingUnderscore being "NO", which is -# incorrect. See ghc-6.12.1/aclocal.m4 (FP_LEADING_UNDERSCORE) +# incorrect for this platform. See ghc-6.12.1/aclocal.m4 +# (FP_LEADING_UNDERSCORE) CONFLICTS= libelf-[0-9]* .else @@ -101,10 +100,9 @@ ${WRKDIR}/stamp-prepare-bootstrap: ${RUN} cd ${WRKDIR} && \ ${ECHO} "====> Preparing bootstrap compiler" && \ ${RM} -rf bootstrap && \ - ${MKDIR} bootstrap && \ - ${CP} -r ${DISTNAME} bootstrap && \ - cd bootstrap/${DISTNAME} && \ - ${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \ + ${MKDIR} -p bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot && \ + ${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xpvf - && \ + ${LN} -sf ${PWD_CMD} bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot/ghc-pwd && \ ${TOUCH} $@ ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap @@ -116,7 +114,7 @@ ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap ${WRKDIR}/stamp-extract-hc: ${WRKDIR}/stamp-configure-hc-boot ${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \ ${ECHO} "====> Extracting bootstrap HC archive" && \ - (cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \ + (cd .. && ${GTAR} -jxf ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \ ${SH} mkfiles && \ ${TOUCH} $@ @@ -128,7 +126,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 && \ @@ -147,15 +146,15 @@ ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths ${TOUCH} $@ do-configure: +# Seemingly by mistake, ghc-7.0.3 has a prebuilt +# utils/ghc-pwd/dist-boot/ghc-pwd for amd64 GNU/Linux. + ${RUN} cd ${WRKSRC} && \ + rm -rf utils/ghc-pwd/dist-boot ${RUN} cd ${WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} -# We need to tell the libraries/integer-gmp/configure that libgmp is +# We need to tell the libraries/terminfo/configure that our ncurses 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. - ${RUN} ${ECHO} "libraries/integer-gmp_CONFIGURE_OPTS += \ - --configure-option=--with-gmp-includes=${PREFIX}/include \ - --configure-option=--with-gmp-libraries=${PREFIX}/lib" > ${WRKSRC}/mk/build.mk -# The ncurses is also in a non-standard path. ${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \ --configure-option=--with-curses-includes=${PREFIX}/include \ --configure-option=--with-curses-libraries=${PREFIX}/lib" >> ${WRKSRC}/mk/build.mk @@ -173,12 +172,15 @@ do-configure: ${RUN} ${ECHO} "HSCOLOUR_SRCS = NO" >> ${WRKSRC}/mk/build.mk # To avoid powerpc crash... # See http://hackage.haskell.org/trac/ghc/ticket/4034 -.if ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" - ${RUN} ${ECHO} "GhcRtsHcOpts = -optc-O0 -optc-g" >> ${WRKSRC}/mk/build.mk - ${RUN} ${ECHO} "GhcRtsCcOpts = -O0 -g" >> ${WRKSRC}/mk/build.mk -.endif +#.if ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" +# ${RUN} ${ECHO} "GhcRtsHcOpts = -optc-O0 -optc-g" >> ${WRKSRC}/mk/build.mk +# ${RUN} ${ECHO} "GhcRtsCcOpts = -O0 -g" >> ${WRKSRC}/mk/build.mk +#.endif + +# Substitutions for INSTALL and DEINSTALL. +FILES_SUBST+= DISTNAME=${DISTNAME} -# Some unused scripts don't pass the portability test. +# There is an unused script which don't pass the portability test. CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw # GHC currently *requires* ${PREFIX}/lib to be in