Sat Feb 1 13:08:57 2014 UTC ()
first command in do-configure is same as default one, so removed it
and let rest parts to be post-configure.


(obache)
diff -r1.7 -r1.8 pkgsrc/lang/ghc7/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/lang/ghc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ghc7/Makefile 2014/02/01 13:06:19 1.7
+++ pkgsrc/lang/ghc7/Makefile 2014/02/01 13:08:57 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2014/02/01 13:06:19 obache Exp $ 1# $NetBSD: Makefile,v 1.8 2014/02/01 13:08:57 obache Exp $
2# ----------------------------------------------------------------------------- 2# -----------------------------------------------------------------------------
3# Package metadata 3# Package metadata
4# 4#
5DISTNAME= ghc-7.6.3-src 5DISTNAME= ghc-7.6.3-src
6PKGNAME= ${DISTNAME:S/-src$//} 6PKGNAME= ${DISTNAME:S/-src$//}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= lang 8CATEGORIES= lang
9MASTER_SITES= http://www.haskell.org/ghc/dist/${PKGVERSION_NOREV}/ 9MASTER_SITES= http://www.haskell.org/ghc/dist/${PKGVERSION_NOREV}/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pho@cielonegro.org 12MAINTAINER= pho@cielonegro.org
13HOMEPAGE= http://www.haskell.org/ghc/ 13HOMEPAGE= http://www.haskell.org/ghc/
14COMMENT= Compiler for the functional language Haskell 14COMMENT= Compiler for the functional language Haskell
@@ -87,30 +87,28 @@ post-patch: @@ -87,30 +87,28 @@ post-patch:
87 @${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}" 87 @${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
88 ${RUN} cd ${WRKSRC:Q}/libraries/integer-gmp && autoconf 88 ${RUN} cd ${WRKSRC:Q}/libraries/integer-gmp && autoconf
89 89
90 90
91# Define the target "pre-configure" and non-standard "bootstrap". 91# Define the target "pre-configure" and non-standard "bootstrap".
92.include "../../lang/ghc7/bootstrap.mk" 92.include "../../lang/ghc7/bootstrap.mk"
93 93
94.for i in ${DISTFILES:M*-boot-*} 94.for i in ${DISTFILES:M*-boot-*}
95SITES.${i}?= ${MASTER_SITE_LOCAL} 95SITES.${i}?= ${MASTER_SITE_LOCAL}
96.endfor 96.endfor
97 97
98# Our pre-configure phase installs a bindist of bootstrapping compiler 98# Our pre-configure phase installs a bindist of bootstrapping compiler
99# directly into TOOLS_DIR so that ./configure can find it. 99# directly into TOOLS_DIR so that ./configure can find it.
100do-configure: 
101 ${RUN} cd ${WRKSRC:Q} && \ 
102 ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS} 
103 100
 101post-configure:
104# Here we generate mk/build.mk dynamically. 102# Here we generate mk/build.mk dynamically.
105 ${RUN} ${RM} -f ${WRKSRC:Q}/mk/build.mk 103 ${RUN} ${RM} -f ${WRKSRC:Q}/mk/build.mk
106 104
107# We need to tell the libraries/terminfo/configure that our ncurses is 105# We need to tell the libraries/terminfo/configure that our ncurses is
108# in a non-standard path. Without that, the resulting GHC tries to 106# in a non-standard path. Without that, the resulting GHC tries to
109# link programs by executing ld(1) without passing it -L${PREFIX:Q}/lib. 107# link programs by executing ld(1) without passing it -L${PREFIX:Q}/lib.
110 ${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \ 108 ${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
111 --configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/include \ 109 --configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/include \
112 --configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/lib" >> ${WRKSRC:Q}/mk/build.mk 110 --configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/lib" >> ${WRKSRC:Q}/mk/build.mk
113 111
114# The ghc compiler does normally split the generated asm files into small 112# The ghc compiler does normally split the generated asm files into small
115# parts before sending them to gcc, to enable the linker to eliminate 113# parts before sending them to gcc, to enable the linker to eliminate
116# unused parts. This does however not play nice with the pkgsrc 114# unused parts. This does however not play nice with the pkgsrc