Mon Feb 3 09:48:44 2014 UTC ()
tell incdir of ncurses from pkgsrc to bootstrap.


(obache)
diff -r1.6 -r1.7 pkgsrc/lang/ghc7/bootstrap.mk
diff -r1.2 -r1.3 pkgsrc/lang/ghc7/files/bootstrap.build.mk
cvs diff -r1.6 -r1.7 pkgsrc/lang/ghc7/bootstrap.mk (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/bootstrap.mk 2014/02/03 07:06:55 1.6
+++ pkgsrc/lang/ghc7/bootstrap.mk 2014/02/03 09:48:44 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bootstrap.mk,v 1.6 2014/02/03 07:06:55 obache Exp $ 1# $NetBSD: bootstrap.mk,v 1.7 2014/02/03 09:48:44 obache Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Select a bindist of bootstrapping compiler based on a per-platform 3# Select a bindist of bootstrapping compiler based on a per-platform
4# basis. 4# basis.
5# 5#
6# BOOT_ARCHIVE 6# BOOT_ARCHIVE
7# This variable is set to the name of compressed archive file of a 7# This variable is set to the name of compressed archive file of a
8# bootstrapping compiler for the current platform. 8# bootstrapping compiler for the current platform.
9# 9#
10# BOOT_TARBALL 10# BOOT_TARBALL
11# Similar to BOOT_ARCHIVE, but "*.tar" not "*.tar.xz". 11# Similar to BOOT_ARCHIVE, but "*.tar" not "*.tar.xz".
12# 12#
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14.if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD" 14.if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
@@ -106,27 +106,29 @@ ${WRKDIR}/stamp-configure-boot: ${WRKDIR @@ -106,27 +106,29 @@ ${WRKDIR}/stamp-configure-boot: ${WRKDIR
106 ${MKDIR} ${WRKDIR:Q}/build-boot 106 ${MKDIR} ${WRKDIR:Q}/build-boot
107 cd ${WRKDIR:Q}/build-boot && \ 107 cd ${WRKDIR:Q}/build-boot && \
108 ${PKGSRC_SETENV} PATH=${PATH} \ 108 ${PKGSRC_SETENV} PATH=${PATH} \
109 CONF_CC_OPTS_STAGE0=${CFLAGS:Q} \ 109 CONF_CC_OPTS_STAGE0=${CFLAGS:Q} \
110 CONF_GCC_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \ 110 CONF_GCC_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
111 CONF_LD_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \ 111 CONF_LD_LINKER_OPTS_STAGE0="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
112 CONF_CC_OPTS_STAGE1=${CFLAGS:Q} \ 112 CONF_CC_OPTS_STAGE1=${CFLAGS:Q} \
113 CONF_GCC_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \ 113 CONF_GCC_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
114 CONF_LD_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \ 114 CONF_LD_LINKER_OPTS_STAGE1="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
115 CONF_CC_OPTS_STAGE2=${CFLAGS:Q} \ 115 CONF_CC_OPTS_STAGE2=${CFLAGS:Q} \
116 CONF_GCC_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \ 116 CONF_GCC_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" \
117 CONF_LD_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \ 117 CONF_LD_LINKER_OPTS_STAGE2="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib" \
118 ${SH} ./configure && \ 118 ${SH} ./configure && \
119 ${SED} -e "s,@CURSES_PREFIX@,${BUILDLINK_PREFIX.curses:Q},g" /${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk 119 ${SED} -e "s,@CURSES_INCDIR@,${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.ncurses:Uinclude},g" \
 120 -e "s,@CURSES_LIBDIR@,${BUILDLINK_PREFIX.curses:Q}/lib,g" \
 121 ${FILESDIR:Q}/bootstrap.build.mk > mk/build.mk
120 ${TOUCH} ${.TARGET} 122 ${TOUCH} ${.TARGET}
121 123
122${WRKDIR}/stamp-build-boot: ${WRKDIR}/stamp-configure-boot 124${WRKDIR}/stamp-build-boot: ${WRKDIR}/stamp-configure-boot
123 @${PHASE_MSG} "Building bootstrapping compiler ${PKGNAME_NOREV}" 125 @${PHASE_MSG} "Building bootstrapping compiler ${PKGNAME_NOREV}"
124 ${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD} 126 ${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD}
125 ${TOUCH} ${.TARGET} 127 ${TOUCH} ${.TARGET}
126 128
127${WRKDIR}/${BOOT_TARBALL}: ${WRKDIR}/stamp-build-boot 129${WRKDIR}/${BOOT_TARBALL}: ${WRKDIR}/stamp-build-boot
128 @${PHASE_MSG} "Creating binary distribution of bootstrapping ${PKGNAME_NOREV}" 130 @${PHASE_MSG} "Creating binary distribution of bootstrapping ${PKGNAME_NOREV}"
129 ${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD} binary-dist 131 ${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD} binary-dist
130 ${MV} -f ${WRKDIR:Q}/build-boot/${BOOT_TARBALL} ${.TARGET} 132 ${MV} -f ${WRKDIR:Q}/build-boot/${BOOT_TARBALL} ${.TARGET}
131 133
132# This can take up half an hour. Memory usage is also very high, about 680 MiB. 134# This can take up half an hour. Memory usage is also very high, about 680 MiB.
cvs diff -r1.2 -r1.3 pkgsrc/lang/ghc7/files/bootstrap.build.mk (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/files/bootstrap.build.mk 2014/01/30 07:57:35 1.2
+++ pkgsrc/lang/ghc7/files/bootstrap.build.mk 2014/02/03 09:48:44 1.3
@@ -21,15 +21,15 @@ GhcRTSWays = @@ -21,15 +21,15 @@ GhcRTSWays =
21 21
22# I'm not sure disabling GHCi significantly reduces the bindist size, 22# I'm not sure disabling GHCi significantly reduces the bindist size,
23# but we don't need it anyway. 23# but we don't need it anyway.
24GhcWithInterpreter = NO 24GhcWithInterpreter = NO
25 25
26# We don't want in-place GMP to be statically linked as it increases 26# We don't want in-place GMP to be statically linked as it increases
27# the bindist size. Dynamic linkage is even worse. 27# the bindist size. Dynamic linkage is even worse.
28INTEGER_LIBRARY = integer-simple 28INTEGER_LIBRARY = integer-simple
29 29
30# We'd like to distinguish bootstrapping bindists from normal ones. 30# We'd like to distinguish bootstrapping bindists from normal ones.
31BIN_DIST_NAME = ghc-$(ProjectVersion)-boot 31BIN_DIST_NAME = ghc-$(ProjectVersion)-boot
32 32
33libraries/terminfo_CONFIGURE_OPTS += \ 33libraries/terminfo_CONFIGURE_OPTS += \
34 --configure-option=--with-curses-includes=@CURSES_PREFIX@/include \ 34 --configure-option=--with-curses-includes=@CURSES_INCDIR@ \
35 --configure-option=--with-curses-libraries=@CURSES_PREFIX@/lib 35 --configure-option=--with-curses-libraries=@CURSES_LIBDIR@