pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Remove unused variables
details: https://anonhg.NetBSD.org/pkgsrc/rev/52cc4e743f0c
branches: trunk
changeset: 407022:52cc4e743f0c
user: pho <pho%pkgsrc.org@localhost>
date: Wed Jan 01 04:35:29 2020 +0000
description:
Remove unused variables
diffstat:
mk/haskell.mk | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diffs (38 lines):
diff -r 12b9eb30c0c0 -r 52cc4e743f0c mk/haskell.mk
--- a/mk/haskell.mk Wed Jan 01 04:23:42 2020 +0000
+++ b/mk/haskell.mk Wed Jan 01 04:35:29 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.6 2019/12/31 07:16:25 pho Exp $
+# $NetBSD: haskell.mk,v 1.7 2020/01/01 04:35:29 pho Exp $
#
# This Makefile fragment handles Haskell Cabal packages.
# See: http://www.haskell.org/cabal/
@@ -104,12 +104,10 @@
_GHC_VERSION \
_GHC_VERSION_CMD \
_GHC_VERSION_FULL \
- _GHC_VERSION_SUFFIX \
_HASKELL_BIN \
_HASKELL_PKG_BIN \
_HASKELL_PKG_DESCR_FILE \
- _HASKELL_VERSION \
- _HASKELL_VERSION_SUFFIX
+ _HASKELL_VERSION
_USER_VARS.haskell= \
HASKELL_ENABLE_SHARED_LIBRARY \
HASKELL_ENABLE_LIBRARY_PROFILING \
@@ -152,12 +150,9 @@
_HASKELL_PKG_BIN= ${_GHC_PKG_BIN} # Expose to the outer scope.
# Determine GHC version.
-.if exists(${_GHC_BIN})
-_GHC_VERSION!= ${_GHC_BIN} -V | ${CUT} -d ' ' -f 8
-.endif
-_GHC_VERSION_SUFFIX= ghc${_GHC_VERSION}
+_GHC_VERSION_CMD= ${_GHC_BIN} -V | ${CUT} -d ' ' -f 8
+_GHC_VERSION= ${_GHC_VERSION_CMD:sh}
_GHC_VERSION_FULL= ghc-${_GHC_VERSION}
-_HASKELL_VERSION_SUFFIX= ${_GHC_VERSION_SUFFIX}
_HASKELL_VERSION= ${_GHC_VERSION_FULL} # Expose to the outer scope.
# Determine GHC shlib suffix
Home |
Main Index |
Thread Index |
Old Index