From 766787e93abcb3dc97d8c1a76dc2b746e5235b81 Mon Sep 17 00:00:00 2001 From: PHO Date: Thu, 1 Apr 2010 16:32:19 +0900 Subject: [PATCH] GHC depends on some ncurses specific functions. --- Makefile | 7 +++++-- files/bootstrap-bsd.mk | 4 ++-- files/bootstrap.mk | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 80f6c1c..a2aec8c 100644 --- a/Makefile +++ b/Makefile @@ -134,6 +134,7 @@ do-configure: --configure-option=--with-curses-includes=${PREFIX}/include \ --configure-option=--with-curses-libraries=${PREFIX}/lib" >> ${WRKSRC}/mk/build.mk +pre-build: # 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 @@ -142,8 +143,10 @@ 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 # 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 @@ -173,7 +176,7 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl BUILDLINK_DEPMETHOD.libxslt = build .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" # I guess pdcurses works well but not tested. .include "../../textproc/libxslt/buildlink3.mk" -.include "../../mk/termcap.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/files/bootstrap-bsd.mk b/files/bootstrap-bsd.mk index e621c0a..59c63ac 100644 --- a/files/bootstrap-bsd.mk +++ b/files/bootstrap-bsd.mk @@ -11,8 +11,8 @@ SplitObjs = NO GhcWithNativeCodeGen = NO GhcWithInterpreter = NO GhcWithSMP = NO -ghc_stage2_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv -lutil -lrt -utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv -lutil -lrt -ltermcap +ghc_stage2_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lutil -lrt +utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lutil -lrt -lncurses SRC_CC_OPTS += -I[[PREFIX]]/include INTEGER_LIBRARY = integer-simple diff --git a/files/bootstrap.mk b/files/bootstrap.mk index 066ccd0..3c4e813 100644 --- a/files/bootstrap.mk +++ b/files/bootstrap.mk @@ -11,8 +11,8 @@ SplitObjs = NO GhcWithNativeCodeGen = NO GhcWithInterpreter = NO GhcWithSMP = NO -ghc_stage2_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv -utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -Llibraries/integer-gmp/gmp -L[[PREFIX]]/lib -lm -liconv -ltermcap +ghc_stage2_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv +utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lncurses SRC_CC_OPTS += -I[[PREFIX]]/include INTEGER_LIBRARY = integer-simple -- 2.40.0