CVS commit: pkgsrc/mk

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 28 19:08:37 UTC 2024

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
mk/haskell.mk: Revert the revision 1.59

My optimization broke bulk build. I'll need to do something else later.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/mk/haskell.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.63 pkgsrc/mk/haskell.mk:1.64
--- pkgsrc/mk/haskell.mk:1.63   Sun Apr 28 14:17:49 2024
+++ pkgsrc/mk/haskell.mk        Sun Apr 28 19:08:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.63 2024/04/28 14:17:49 pho Exp $
+# $NetBSD: haskell.mk,v 1.64 2024/04/28 19:08:37 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
@@ -116,13 +116,13 @@ _DEF_VARS.haskell= \
        INSTALL_TEMPLATES \
        DEINSTALL_TEMPLATES \
        UNLIMIT_RESOURCES \
+       _HASKELL_VERSION_CMD \
        _HASKELL_BIN \
        _HASKELL_GLOBAL_PKG_DB \
        _HASKELL_PKG_BIN \
        _HASKELL_PKG_DESCR_FILE_OR_DIR \
        _HASKELL_PKG_ID_FILE \
-       _HASKELL_VERSION \
-       _HS_ORIG_LD_CMD
+       _HASKELL_VERSION
 _USE_VARS.haskell= \
        DISTNAME \
        PKG_VERBOSE \
@@ -161,7 +161,7 @@ HASKELL_ENABLE_TESTS?=                      no
 HASKELL_DISABLE_EXECUTABLES?=          # empty
 HASKELL_UNRESTRICT_DEPENDENCIES?=      # empty
 
-.include "../../lang/ghc96/buildlink3.mk"
+.include "../../lang/ghc98/buildlink3.mk"
 
 # Some Cabal packages requires preprocessors to build, and we don't
 # want them to implicitly depend on such tools. Place dummy scripts by
@@ -174,14 +174,11 @@ HASKELL_UNRESTRICT_DEPENDENCIES?= # empt
 .include "../../mk/haskell/developer.mk"
 
 # Tools
-_HASKELL_BIN=          ${BUILDLINK_PREFIX.ghc:U${LOCALBASE}}/bin/ghc
-_HASKELL_PKG_BIN=      ${BUILDLINK_PREFIX.ghc:U${LOCALBASE}}/bin/ghc-pkg
+_HASKELL_BIN=          ${BUILDLINK_PREFIX.ghc:U${PREFIX}}/bin/ghc
+_HASKELL_PKG_BIN=      ${BUILDLINK_PREFIX.ghc:U${PREFIX}}/bin/ghc-pkg
 
-.if !defined(_HASKELL_VERSION)
-_HASKELL_VERSION_CMD=  ${_HASKELL_BIN:Q} --numeric-version
-_HASKELL_VERSION:=     ghc-${_HASKELL_VERSION_CMD:sh}
-.endif
-MAKEVARS+=             _HASKELL_VERSION
+_HASKELL_VERSION_CMD=  ${_HASKELL_BIN} -V 2>/dev/null | ${CUT} -d ' ' -f 8
+_HASKELL_VERSION=      ghc-${_HASKELL_VERSION_CMD:sh}
 
 # Determine the path to the global Haskell package database. We need this
 # in our INSTALL and DEINSTALL hooks.
@@ -299,7 +296,7 @@ CONFIGURE_ARGS+=    ${LDFLAGS:S/^/--ghc-opt
 # wrapper is going to inject the relro flags. In this case these flags
 # don't make sense so ld(1) emits warnings. Use the original,
 # non-wrapped ld(1) for merging objects as a dirty workaround.
-_HS_ORIG_LD_CMD=       ${SETENV} PATH=${_PATH_ORIG} which ${LD}
+_HS_ORIG_LD_CMD=       ${SETENV} PATH=${_PATH_ORIG} which ld
 CONFIGURE_ARGS+=       --ghc-options=-pgmlm\ ${_HS_ORIG_LD_CMD:sh}
 CONFIGURE_ARGS+=       --ghc-options=-optlm\ -r
 
@@ -341,11 +338,8 @@ _HS_PLIST_STATUS=  ok
 # executable-only there's no such file. As a workaround we read the
 # description of "base" (which always exists) and extract the platform
 # from it.
-.if !defined(_HS_PLIST.platform)
-_HS_PLIST.platform.cmd=                ${_HASKELL_PKG_BIN:Q} --simple-output field base data-dir
-_HS_PLIST.platform:=           ${_HS_PLIST.platform.cmd:sh:H:T}
-.endif
-MAKEVARS+=                     _HS_PLIST.platform
+_HS_PLIST.platform.cmd=                ${_HASKELL_PKG_BIN} --simple-output field base data-dir
+_HS_PLIST.platform=            ${_HS_PLIST.platform.cmd:sh:H:T}
 # Abbreviated compiler version. Used for shared libraries.
 _HS_PLIST.short-ver=           ${_HASKELL_VERSION:S,-,,}