Thu Jan 2 16:34:47 2020 UTC ()
Pass -v to ./Setup when PKG_VERBOSE is defined


(pho)
diff -r1.8 -r1.9 pkgsrc/mk/haskell.mk
cvs diff -r1.8 -r1.9 pkgsrc/mk/haskell.mk (expand / switch to unified diff)

--- pkgsrc/mk/haskell.mk 2020/01/01 04:54:10 1.8
+++ pkgsrc/mk/haskell.mk 2020/01/02 16:34:47 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: haskell.mk,v 1.8 2020/01/01 04:54:10 pho Exp $ 1# $NetBSD: haskell.mk,v 1.9 2020/01/02 16:34:47 pho Exp $
2# 2#
3# This Makefile fragment handles Haskell Cabal packages. 3# This Makefile fragment handles Haskell Cabal packages.
4# See: http://www.haskell.org/cabal/ 4# See: http://www.haskell.org/cabal/
5# 5#
6# Note to users: 6# Note to users:
7# 7#
8# * Users choose one favourite Haskell compiler. Though the only 8# * Users choose one favourite Haskell compiler. Though the only
9# compiler currently supported is GHC. 9# compiler currently supported is GHC.
10# 10#
11# * You can't install a cabal package for more than one compilers 11# * You can't install a cabal package for more than one compilers
12# simultaneously. In the future, this limitation can possibly be 12# simultaneously. In the future, this limitation can possibly be
13# eliminated using the method used by 13# eliminated using the method used by
14# "../../lang/python/pyversion.mk". 14# "../../lang/python/pyversion.mk".
@@ -212,52 +212,52 @@ _check-ignored-plist: error-check @@ -212,52 +212,52 @@ _check-ignored-plist: error-check
212# Setup.?hs to a binary. Since dynamic linkage is much faster, we try 212# Setup.?hs to a binary. Since dynamic linkage is much faster, we try
213# it and then fall back to static linkage if that didn't work. 213# it and then fall back to static linkage if that didn't work.
214pre-configure: ${WRKSRC}/Setup 214pre-configure: ${WRKSRC}/Setup
215 215
216${WRKSRC}/Setup: 216${WRKSRC}/Setup:
217 ${RUN}cd ${WRKSRC} && \ 217 ${RUN}cd ${WRKSRC} && \
218 ( ${_HASKELL_BIN:Q} --make Setup -dynamic || \ 218 ( ${_HASKELL_BIN:Q} --make Setup -dynamic || \
219 ${_HASKELL_BIN:Q} --make Setup -static ) 219 ${_HASKELL_BIN:Q} --make Setup -static )
220 220
221# Define configure target. 221# Define configure target.
222do-configure: 222do-configure:
223 ${RUN}cd ${WRKSRC:Q} && \ 223 ${RUN}cd ${WRKSRC:Q} && \
224 ${SETENV} ${CONFIGURE_ENV} \ 224 ${SETENV} ${CONFIGURE_ENV} \
225 ./Setup configure ${CONFIGURE_ARGS} 225 ./Setup configure ${PKG_VERBOSE:D-v} ${CONFIGURE_ARGS}
226 226
227# Define build target. 227# Define build target.
228do-build: 228do-build:
229 ${RUN}cd ${WRKSRC:Q} && \ 229 ${RUN}cd ${WRKSRC:Q} && \
230 ./Setup build 230 ./Setup build ${PKG_VERBOSE:D-v}
231.if ${HASKELL_ENABLE_HADDOCK_DOCUMENTATION} == "yes" 231.if ${HASKELL_ENABLE_HADDOCK_DOCUMENTATION} == "yes"
232 ${RUN}cd ${WRKSRC:Q} && \ 232 ${RUN}cd ${WRKSRC:Q} && \
233 ./Setup haddock 233 ./Setup haddock ${PKG_VERBOSE:D-v}
234.endif 234.endif
235 235
236# Define install target. We need installed-pkg-config to be installed 236# Define install target. We need installed-pkg-config to be installed
237# for package registration (if any). 237# for package registration (if any).
238_HASKELL_PKG_DESCR_DIR= ${PREFIX}/lib/${DISTNAME}/${_HASKELL_VERSION} 238_HASKELL_PKG_DESCR_DIR= ${PREFIX}/lib/${DISTNAME}/${_HASKELL_VERSION}
239_HASKELL_PKG_DESCR_FILE= ${_HASKELL_PKG_DESCR_DIR}/package-description 239_HASKELL_PKG_DESCR_FILE= ${_HASKELL_PKG_DESCR_DIR}/package-description
240 240
241INSTALLATION_DIRS+= ${_HASKELL_PKG_DESCR_DIR} 241INSTALLATION_DIRS+= ${_HASKELL_PKG_DESCR_DIR}
242do-install: 242do-install:
243 ${RUN}cd ${WRKSRC} && \ 243 ${RUN}cd ${WRKSRC} && \
244 ./Setup register --gen-pkg-config=dist/package-description && \ 244 ./Setup register ${PKG_VERBOSE:D-v} --gen-pkg-config=dist/package-description && \
245 ./Setup copy --destdir=${DESTDIR:Q} && \ 245 ./Setup copy ${PKG_VERBOSE:D-v} --destdir=${DESTDIR:Q} && \
246 if [ -f dist/package-description ]; then \ 246 if [ -f dist/package-description ]; then \
247 ${INSTALL_DATA} dist/package-description ${DESTDIR:Q}${_HASKELL_PKG_DESCR_FILE:Q}; \ 247 ${INSTALL_DATA} dist/package-description ${DESTDIR:Q}${_HASKELL_PKG_DESCR_FILE:Q}; \
248 fi \ 248 fi \
249 249
250# Define test target. 250# Define test target.
251do-test: 251do-test:
252 ${RUN}cd ${WRKSRC} && \ 252 ${RUN}cd ${WRKSRC} && \
253 ./Setup test 253 ./Setup test ${PKG_VERBOSE:D-v}
254 254
255# Substitutions for INSTALL and DEINSTALL. 255# Substitutions for INSTALL and DEINSTALL.
256FILES_SUBST+= DISTNAME=${DISTNAME} 256FILES_SUBST+= DISTNAME=${DISTNAME}
257FILES_SUBST+= HASKELL_PKG_BIN=${_HASKELL_PKG_BIN} 257FILES_SUBST+= HASKELL_PKG_BIN=${_HASKELL_PKG_BIN}
258FILES_SUBST+= HASKELL_PKG_DESCR_FILE=${_HASKELL_PKG_DESCR_FILE} 258FILES_SUBST+= HASKELL_PKG_DESCR_FILE=${_HASKELL_PKG_DESCR_FILE}
259 259
260INSTALL_TEMPLATES+= ../../mk/haskell/INSTALL.in 260INSTALL_TEMPLATES+= ../../mk/haskell/INSTALL.in
261DEINSTALL_TEMPLATES+= ../../mk/haskell/DEINSTALL.in 261DEINSTALL_TEMPLATES+= ../../mk/haskell/DEINSTALL.in
262 262
263.endif # HASKELL_MK 263.endif # HASKELL_MK