summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorpho <pho@pkgsrc.org>2015-02-17 09:29:17 +0000
committerpho <pho@pkgsrc.org>2015-02-17 09:29:17 +0000
commit83b3b504bc54c09b70e978abde6e6ab51b615434 (patch)
treeb4c0fa700b1c27f382e41fd9d223df3f7726c949 /lang
parentf2090aac05ae46ff4861f120c942f124b6362070 (diff)
downloadpkgsrc-83b3b504bc54c09b70e978abde6e6ab51b615434.tar.gz
Add upstream Trac URL for our workaround to non-standard curses path
Diffstat (limited to 'lang')
-rw-r--r--lang/ghc7/Makefile6
-rw-r--r--lang/ghc7/bootstrap.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/lang/ghc7/Makefile b/lang/ghc7/Makefile
index 1dcc2365f86..4466dcff422 100644
--- a/lang/ghc7/Makefile
+++ b/lang/ghc7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/02/13 19:28:40 pho Exp $
+# $NetBSD: Makefile,v 1.18 2015/02/17 09:29:17 pho Exp $
# -----------------------------------------------------------------------------
# Package metadata
#
@@ -94,9 +94,7 @@ post-patch:
post-configure:
${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.
+# See https://ghc.haskell.org/trac/ghc/ticket/10096
${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
--configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.curses:Q} \
--configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_LIBDIRS.curses:Q}" \
diff --git a/lang/ghc7/bootstrap.mk b/lang/ghc7/bootstrap.mk
index c273edc4d25..47d2931fade 100644
--- a/lang/ghc7/bootstrap.mk
+++ b/lang/ghc7/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.21 2015/02/11 09:38:08 pho Exp $
+# $NetBSD: bootstrap.mk,v 1.22 2015/02/17 09:29:17 pho Exp $
# -----------------------------------------------------------------------------
# Select a bindist of bootstrapping compiler on a per-platform basis.
#
@@ -225,6 +225,8 @@ ${WRKDIR}/stamp-lndir-boot: ${WRKDIR}/lndir
${WRKDIR}/lndir -silent ../${PKGNAME_NOREV:Q}
${TOUCH} ${.TARGET}
+# For terminfo_CONFIGURE_OPTS, see
+# https://ghc.haskell.org/trac/ghc/ticket/10096
${WRKDIR}/stamp-configure-boot: ${WRKDIR}/stamp-lndir-boot
@${PHASE_MSG} "Configuring bootstrapping compiler ${PKGNAME_NOREV}"
${MKDIR} ${WRKDIR:Q}/build-boot