X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=blobdiff_plain;f=Makefile;h=d7542a97e1b4b5f4c885131718c40b32c1db49e4;hp=8a4e142c0bf96224cd5839cd00967aa03e9256f1;hb=bc3d4c0c58103a14df21359fc9df4a47cc148eda;hpb=60f16da3debbe7fdc6a06dc6fe1929b4c9161d70

diff --git a/Makefile b/Makefile
index 8a4e142..d7542a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,23 @@
 # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $
 
 DISTNAME=		ghc-${VERSION}
-VERSION=		6.12.1
+VERSION=		6.12.3
 CATEGORIES=		lang
-MASTER_SITES=	http://www.haskell.org/ghc/dist/${VERSION}/
+MASTER_SITES=	http://darcs.haskell.org/download/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 \
-				${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 \
-				${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
+DISTFILES=		${DISTNAME}-src.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
+
 
-SITES.${DISTNAME}-src.tar.bz2						= http://www.haskell.org/ghc/dist/${VERSION}/
 SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2	= http://static.cielonegro.org/archive/
 SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2	= http://static.cielonegro.org/archive/
+SITES.${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2	= http://static.cielonegro.org/archive/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -26,16 +28,15 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # these packages are built with integer-simple, not integer-gmp, to
 # reduce some complexity by not depending on the GMP. The resulting
 # registerised GHC uses integer-gmp so this won't be a problem.
-ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386
-# Note: Darwin-*-powerpc is temporarily disabled for now. It shall
-# come back in the near future. Thanks for your patience.
+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 better
-# way than this?
+# 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 CCPATH but it disappeared somehow."
+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
 .else
@@ -48,7 +49,6 @@ CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DISTNAME}-src.tar.bz2
 
-PLATFORM= ${MACHINE_ARCH}-unknown-${LOWER_OPSYS}
 CONFIGURE_ARGS += \
 	--build=${PLATFORM} \
 	--host=${PLATFORM} \
@@ -70,21 +70,27 @@ CONFIGURE_ARGS += \
 # running "ghc-pkg recache".
 
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD"
-BOOTSTRAP_TARBALL  = ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
+PLATFORM           = i386-unknown-netbsd
 
 .elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
-BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
+PLATFORM           = i386-unknown-freebsd
+
+.elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
+BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
+PLATFORM           = powerpc-apple-darwin
 
-#.elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
-#BOOTSTRAP_TARBALL = ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
-#BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
+# Existence of libelf makes LeadingUnderscore being "NO", which is
+# incorrect. See ghc-6.12.1/aclocal.m4 (FP_LEADING_UNDERSCORE)
+CONFLICTS=	libelf-[0-9]*
 
 .else
 PKG_FAIL_REASON+=	"internal error: unsupported platform"
 .endif
 
+BOOTSTRAP_TARBALL = ${DISTNAME}-boot-${PLATFORM}.tar.bz2
+
 pre-configure:
 	${RUN} cd ${WRKDIR} && \
 		${ECHO} "====> Preparing bootstrap compiler" && \
@@ -93,7 +99,7 @@ pre-configure:
 		cd bootstrap/${DISTNAME} && \
 		${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \
 		${ECHO} "====> Configuring for bootstrap compiler" && \
-		${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot ${CONFIGURE_ARGS} && \
+		${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot --with-ghc="" ${CONFIGURE_ARGS} && \
 		${ECHO} "====> Extracting bootstrap HC archive" && \
 		(cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
 		${SH} mkfiles && \
@@ -115,19 +121,19 @@ pre-configure:
 		${CP} inplace/bin/ghc-stage2 ${BUILDLINK_DIR}/bin/ghc && \
 		${CP} inplace/bin/ghc-pkg ${BUILDLINK_DIR}/bin/ghc-pkg
 
-# We need to tell the libraries/integer-gmp/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.
 do-configure:
 	${RUN} cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
+# We need to tell the libraries/integer-gmp/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.
 	${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
-
 # The ghc compiler does normally split the generated C files into small
 # parts before sending them to gcc, to enable the linker to eliminate
 # unused parts.  This does however not play nice with the pkgsrc
@@ -136,8 +142,34 @@ do-configure:
 #    http://mail-index.netbsd.org/tech-pkg/2006/07/30/0005.html
 # for a description of the problem.
 # Disable file splitting until pkgsrc gets improved.
-pre-build:
 	${RUN} ${ECHO} "SplitObjs = NO" >> ${WRKSRC}/mk/build.mk
+# If we don't explicitly disable HsColour, PLIST gets changed
+# depending on whether we have installed it or not.
+	${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
+
+pre-build:
+# We have to sacrifice the GHCi library for GHC itself to work around
+# for powerpc ld bug.  See
+# http://hackage.haskell.org/trac/ghc/ticket/3260
+.if ${MACHINE_ARCH} == "powerpc"
+	${RUN} ${MKDIR} ${WRKSRC}/compiler/stage1/build
+	${RUN} ${TOUCH} -t `expr \`date '+%Y'\` + 1`12310000 \
+					${WRKSRC}/compiler/stage1/build/HS${DISTNAME}.o
+	${RUN} ${MKDIR} ${WRKSRC}/compiler/stage2/build
+	${RUN} ${TOUCH} -t `expr \`date '+%Y'\` + 1`12310000 \
+					${WRKSRC}/compiler/stage2/build/HS${DISTNAME}.o
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+WARNINGS+= "You won't be able to use GHCi library for GHC itself\
+because of powerpc ld bug."
+.endif
 
 # Some unused scripts don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
@@ -147,10 +179,14 @@ CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 CHECK_SHLIBS_SUPPORTED= 	no
 
+# I guess pdcurses works well but not tested.
+USE_NCURSES=	yes
+.include "../../devel/ncurses/buildlink3.mk"
+
+BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 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"