 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2014/08/03 08:14:38 obache Exp $
+# $NetBSD: Makefile,v 1.13 2015/02/03 02:32:05 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-7.6.3-src
 PKGNAME=	${DISTNAME:S/-src$//}
 PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pho@cielonegro.org
 HOMEPAGE=	http://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell
 @@ -50,30 +50,30 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 USE_TOOLS+=			autoconf gmake perl:run
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=	no
 CONFIGURE_ARGS+= \
 	--with-gcc=${CC:Q} \
-	--with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/include \
+	--with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q} \
-	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/lib \
+	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q} \
-	--with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/include \
+	--with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q} \
-	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/lib
+	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q}
 CONFIGURE_ENV+= \
 	CONF_CC_OPTS_STAGE0=${CFLAGS:Q} \
 	CONF_GCC_LINKER_OPTS_STAGE0=${LDFLAGS:Q} \
 	CONF_LD_LINKER_OPTS_STAGE0=${LDFLAGS:Q} \
 	CONF_CC_OPTS_STAGE1=${CFLAGS:Q} \
 	CONF_GCC_LINKER_OPTS_STAGE1=${LDFLAGS:Q} \
 	CONF_LD_LINKER_OPTS_STAGE1=${LDFLAGS:Q} \
 	CONF_CC_OPTS_STAGE2=${CFLAGS:Q} \
 	CONF_GCC_LINKER_OPTS_STAGE2=${LDFLAGS:Q} \
 	CONF_LD_LINKER_OPTS_STAGE2=${LDFLAGS:Q} \
 	ac_cv_path_fp_prog_ar=${AR:Q} \
 	PerlCmd=${PERL5:Q}
 @@ -97,41 +97,42 @@ SITES.${i}?=	${MASTER_SITE_LOCAL}
 .endfor
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 post-configure:
 # Here we generate mk/build.mk dynamically.
 	${RUN} ${RM} -f ${WRKSRC:Q}/mk/build.mk
 # 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:Q}/lib.
 	${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
-		--configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/include \
+		--configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.curses:Q} \
-		--configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/lib" >> ${WRKSRC:Q}/mk/build.mk
+		--configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_LIBDIRS.curses:Q}" \
 		>> ${WRKSRC:Q}/mk/build.mk
 # The ghc compiler does normally split the generated asm 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
 # framework, and the result is that the build takes more than 5 times
 # as long than when the files are not split.  See
 #    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.
 	${RUN} ${ECHO} "SplitObjs         = NO" >> ${WRKSRC:Q}/mk/build.mk
-# If there is HsColour is in the PATH, GHC's build system tries to use
+# If there is HsColour in the PATH, GHC's build system tries to use it
-# it without even checking if it really works. That's not what we
+# without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC:Q}/mk/build.mk
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_DOCBOOK_PS  = NO" >> ${WRKSRC:Q}/mk/build.mk
 	${RUN} ${ECHO} "BUILD_DOCBOOK_PDF = NO" >> ${WRKSRC:Q}/mk/build.mk
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.

 @@ -1,14 +1,14 @@
-# $NetBSD: bootstrap.mk,v 1.11 2014/09/26 07:00:50 obache Exp $
+# $NetBSD: bootstrap.mk,v 1.12 2015/02/03 02:32:05 pho Exp $
 # -----------------------------------------------------------------------------
 # Select a bindist of bootstrapping compiler based on a per-platform
 # basis.
+#
 # BOOT_ARCHIVE
 #   This variable is set to the name of compressed archive file of a
 #   bootstrapping compiler for the current platform.
+#
 # BOOT_TARBALL
 #   Similar to BOOT_ARCHIVE, but "*.tar" not "*.tar.xz".
+#
 .include "../../mk/bsd.prefs.mk"
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
 @@ -38,27 +38,26 @@ BOOT_ARCHIVE:=  ${PKGNAME}-boot-x86_64-u
 .else
 PKG_FAIL_REASON+=	"internal error: unsupported platform"
 .endif
 # current bootstrap binary kit for SmartOS is built with ncurses5
 .if !empty(MACHINE_PLATFORM:MSunOS-5.11-*) && !empty(OS_VARIANT:U:MSmartOS)
 BUILD_DEPENDS+=	ncurses>=5.0:../../devel/ncurses
 .endif
 BOOT_TARBALL=	${BOOT_ARCHIVE:C/\.xz$//}
 # -----------------------------------------------------------------------------
 # The "pre-configure" hook
+#
 # Install a bootstrapping compiler directly into TOOLS_DIR so that
 # ./configure can find it.
+#
 USE_TOOLS+=	gmake xzcat xz
 pre-configure:
 	@${TEST} -f ${DISTDIR:Q}/${DIST_SUBDIR:Q}/${BOOT_ARCHIVE} || \
 	${FAIL_MSG}  "Put your trusted bootstrap archive as ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE}"
 	@${PHASE_MSG} "Extracting bootstrapping compiler for ${PKGNAME}"
 	${RUN} ${MKDIR} ${WRKDIR:Q}/build-extract
 @@ -71,75 +70,96 @@ pre-configure:
 			--prefix=${TOOLS_DIR:Q} && \
 		${MAKE_PROGRAM} install
 # -----------------------------------------------------------------------------
 # An unusual target "bootstrap"
+#
 # Build a bootstrapping compiler using an already installed GHC. This
 # can certainly impossible if you don't have one. It's absolutely
 # important to build it with the fewest possible run-time
 # dependencies, otherwise the resulting binary can easily get
 # unusable.
+#
 .PHONY: bootstrap
-#BUILDLINK_PASSTHRU_DIRS=	${PREFIX}/lib/${PKGNAME_NOREV}
+# Compiler wrappers must not remove -I/-L flags for this directory
 # tree, otherwise the GHC we are going to use for building our
 # bootstraping kit will not work at all. Ideally it should be added to
 # BUILDLINK_PASSTHRU_DIRS only .if make(bootstrap), but then running
 # "${MAKE} wrapper" before "${MAKE} bootstrap" will result in a
 # cryptic error which we can't easily catch.
 BOOTSTRAP_GHC_LIBDIR_CMD=	ghc --print-libdir
 .if !defined(BOOTSTRAP_GHC_LIBDIR)
 BOOTSTRAP_GHC_LIBDIR!=		${BOOTSTRAP_GHC_LIBDIR_CMD} 2>/dev/null || ${ECHO}
 .endif
 MAKEVARS+=			BOOTSTRAP_GHC_LIBDIR
 BUILDLINK_PASSTHRU_DIRS+=	${BOOTSTRAP_GHC_LIBDIR}
 # Default values for BUILDLINK_INCDIRS.<pkg> are only generated in the
 # barrier. See ../../mk/buildlink3/bsd.buildlink3.mk and
 # ../../mk/bsd.pkg.barrier.mk
 .PHONY: bootstrap
 .if make(bootstrap)
 _BARRIER_CMDLINE_TARGETS+=	bootstrap
 .endif
 .if !defined(_PKGSRC_BARRIER)
 bootstrap: barrier
 .else
 bootstrap: pre-bootstrap .WAIT ${WRKDIR}/${BOOT_ARCHIVE}
 	@${PHASE_MSG} "Done creating" ${WRKDIR}/${BOOT_ARCHIVE}
 .endif
 .PHONY: pre-bootstrap
-pre-bootstrap:
+pre-bootstrap: wrapper
-	@${TEST} \! -f ${_COOKIE.configure} || \
+.if empty(BOOTSTRAP_GHC_LIBDIR)
-		(${ERROR_MSG} "You have already configured the package in a way\
+	@if ${BOOTSTRAP_GHC_LIBDIR_CMD} 2>/dev/null 1>&2; then \
 		${ERROR_MSG} "Running \"${BOOTSTRAP_GHC_LIBDIR_CMD}\" has failed during wrapper phase."; \
 		${FAIL_MSG}  "Plase run \"${MAKE} clean\" and try again."; \
 	else \
 		${ERROR_MSG} "Failed to run \"${BOOTSTRAP_GHC_LIBDIR_CMD}\":"; \
 		${BOOTSTRAP_GHC_LIBDIR_CMD}; \
 		${ERROR_MSG} "You don't seem to have a working GHC in your PATH."; \
 		${FAIL_MSG}  "Please install one and then run \"${MAKE} clean bootstrap\"."; \
 	fi
 .endif
 	@if ${TEST} -f ${_COOKIE.configure}; then \
 		${ERROR_MSG} "You have already configured the package in a way\
 		that building bootstrapping compiler is impossible."; \
-		${FAIL_MSG}  "Please run \"${MAKE} clean patch\" first.");
+		${FAIL_MSG}  "Please run \"${MAKE} clean\" first."; \
-	@${TEST} -f ${_COOKIE.patch} || \
+	fi
 		${FAIL_MSG} "Please run \"${MAKE} patch\" first."
 	@${DO_NADA}
 ${WRKDIR}/lndir:
 	@${PHASE_MSG} "Building lndir(1) to duplicate the source tree."
 	cd ${WRKSRC:Q}/utils/lndir && \
 		${PKG_CC:Q} lndir.c -o ${.TARGET}
 ${WRKDIR}/stamp-lndir-boot: ${WRKDIR}/lndir
 	@${PHASE_MSG} "Duplicating the source tree for bootstrapping ${PKGNAME_NOREV}"
 	${MKDIR} ${WRKDIR:Q}/build-boot
 	cd ${WRKDIR:Q}/build-boot && \
 		${WRKDIR}/lndir -silent ../${PKGNAME_NOREV:Q}
 	${TOUCH} ${.TARGET}
 ${WRKDIR}/stamp-configure-boot: ${WRKDIR}/stamp-lndir-boot
 	@${PHASE_MSG} "Configuring bootstrapping compiler ${PKGNAME_NOREV}"
 	${MKDIR} ${WRKDIR:Q}/build-boot
 	cd ${WRKDIR:Q}/build-boot && \
-		${PKGSRC_SETENV} PATH=${PATH} \
+		${PKGSRC_SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} && \
-		CONF_CC_OPTS_STAGE0=${CFLAGS:Q} \
+		${CP} -f ${FILESDIR:Q}/bootstrap.build.mk mk/build.mk && \
-		CONF_GCC_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
+		${ECHO} >> mk/build.mk && \
-		CONF_LD_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
+		${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
-		CONF_CC_OPTS_STAGE1=${CFLAGS:Q} \
+			--configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.curses:Q} \
-		CONF_GCC_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
+			--configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_LIBDIRS.curses:Q}" \
-		CONF_LD_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
+			>> mk/build.mk
 		CONF_CC_OPTS_STAGE2=${CFLAGS:Q} \
 		CONF_GCC_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
 		CONF_LD_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
 		${SH} ./configure && \
 		${SED} -e "s,@CURSES_INCDIR@,${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.ncurses:Uinclude},g" \
 			-e "s,@CURSES_LIBDIR@,${BUILDLINK_PREFIX.curses:Q}/lib,g" \
 			${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk
 	${TOUCH} ${.TARGET}
 ${WRKDIR}/stamp-build-boot: ${WRKDIR}/stamp-configure-boot
 	@${PHASE_MSG} "Building bootstrapping compiler ${PKGNAME_NOREV}"
 	${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD}
 	${TOUCH} ${.TARGET}
 ${WRKDIR}/${BOOT_TARBALL}: ${WRKDIR}/stamp-build-boot
 	@${PHASE_MSG} "Creating binary distribution of bootstrapping ${PKGNAME_NOREV}"
 	${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD} binary-dist
 	${MV} -f ${WRKDIR:Q}/build-boot/${BOOT_TARBALL} ${.TARGET}
 # This can take up half an hour. Memory usage is also very high, about 680 MiB.

 @@ -16,15 +16,15 @@ wip/ghc TODO
 * Let ``./configure`` check for broken binutils and provide a better
   fix for ``patch-rts_StgCRun.c``.
 * Build more bootstrapping compilers to support more platforms.
 How to build a bootstrapping compiler
 -------------------------------------
 You need a working compiler to build one. If you think there are no
 bindists for your platform, you may need to cross-build a compiler
 yourself: `Cross-compiling GHC
 <http://hackage.haskell.org/trac/ghc/wiki/Building/CrossCompiling>`_
-Assuming you have a working ghc in your PATH, just run ``bmake patch
+Assuming you have a working ghc in your PATH, just run ``bmake clean
 && bmake bootstrap`` and see if you are lucky enough.

 @@ -19,17 +19,13 @@ SplitObjs          = NO
 GhcLibWays         = v
 GhcRTSWays         =
 # I'm not sure disabling GHCi significantly reduces the bindist size,
 # but we don't need it anyway.
 GhcWithInterpreter = NO
 # We don't want in-place GMP to be statically linked as it increases
 # the bindist size. Dynamic linkage is even worse.
 INTEGER_LIBRARY    = integer-simple
 # We'd like to distinguish bootstrapping bindists from normal ones.
 BIN_DIST_NAME      = ghc-$(ProjectVersion)-boot
 libraries/terminfo_CONFIGURE_OPTS += \
 	  --configure-option=--with-curses-includes=@CURSES_INCDIR@ \
 	  --configure-option=--with-curses-libraries=@CURSES_LIBDIR@