pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk For "Setup" try dynamic linkage first
details: https://anonhg.NetBSD.org/pkgsrc/rev/23bab4535838
branches: trunk
changeset: 346313:23bab4535838
user: pho <pho%pkgsrc.org@localhost>
date: Tue Dec 31 07:16:25 2019 +0000
description:
For "Setup" try dynamic linkage first
diffstat:
mk/haskell.mk | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diffs (61 lines):
diff -r 46429b4e9391 -r 23bab4535838 mk/haskell.mk
--- a/mk/haskell.mk Tue Dec 31 07:10:30 2019 +0000
+++ b/mk/haskell.mk Tue Dec 31 07:16:25 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.5 2019/12/29 16:59:55 pho Exp $
+# $NetBSD: haskell.mk,v 1.6 2019/12/31 07:16:25 pho Exp $
#
# This Makefile fragment handles Haskell Cabal packages.
# See: http://www.haskell.org/cabal/
@@ -214,25 +214,27 @@
.endif
# We might not have any working Haskell interpreter so compile
-# Setup.?hs to a binary.
+# Setup.?hs to a binary. Since dynamic linkage is much faster, we try
+# it and then fall back to static linkage if that didn't work.
pre-configure: ${WRKSRC}/Setup
${WRKSRC}/Setup:
- ${RUN} cd ${WRKSRC} && \
- ${_HASKELL_BIN:Q} --make Setup
+ ${RUN}cd ${WRKSRC} && \
+ ( ${_HASKELL_BIN:Q} --make Setup -dynamic || \
+ ${_HASKELL_BIN:Q} --make Setup -static )
# Define configure target.
do-configure:
- ${RUN} cd ${WRKSRC:Q} && \
+ ${RUN}cd ${WRKSRC:Q} && \
${SETENV} ${CONFIGURE_ENV} \
./Setup configure ${CONFIGURE_ARGS}
# Define build target.
do-build:
- ${RUN} cd ${WRKSRC:Q} && \
+ ${RUN}cd ${WRKSRC:Q} && \
./Setup build
.if ${HASKELL_ENABLE_HADDOCK_DOCUMENTATION} == "yes"
- ${RUN} cd ${WRKSRC:Q} && \
+ ${RUN}cd ${WRKSRC:Q} && \
./Setup haddock
.endif
@@ -243,7 +245,7 @@
INSTALLATION_DIRS+= ${_HASKELL_PKG_DESCR_DIR}
do-install:
- ${RUN} cd ${WRKSRC} && \
+ ${RUN}cd ${WRKSRC} && \
./Setup register --gen-pkg-config=dist/package-description && \
./Setup copy --destdir=${DESTDIR:Q} && \
if [ -f dist/package-description ]; then \
@@ -252,7 +254,7 @@
# Define test target.
do-test:
- ${RUN} cd ${WRKSRC} && \
+ ${RUN}cd ${WRKSRC} && \
./Setup test
# Substitutions for INSTALL and DEINSTALL.
Home |
Main Index |
Thread Index |
Old Index