diff options
| author | rillig <rillig@pkgsrc.org> | 2020-06-29 18:07:45 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-06-29 18:07:45 +0000 |
| commit | 6d6c7b894a72ae1de675968f58c1b6cfd3c53c94 (patch) | |
| tree | 8d099b260305490aa13a1df4dd3cb40cf37da573 /mk | |
| parent | cbd8fd597a25430ced9d444302ff800d7e823240 (diff) | |
| download | pkgsrc-6d6c7b894a72ae1de675968f58c1b6cfd3c53c94.tar.gz | |
mk/haskell.mk: fix PLIST status detection
Before, running "HS_UPDATE_PLIST=yes bmake update" in wm/xmonad did not
apply the proper substitutions to the generated PLIST file since the
PLIST file was created empty during the GENERATE_PLIST command, and that
empty PLIST file changed the status to "plain" instead of "missing".
Because of that, the HS_INTF and related placeholders were not defined.
The 2 conditions for the status "missing" had to be written in separate
.if clauses because of a bug in bmake that was introduced in 2015 and
will be fixed with the next bmake update. For further details, see
src/usr.bin/make/unit-tests/cond-short.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/haskell.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/haskell.mk b/mk/haskell.mk index e49a9d57083..6decd311228 100644 --- a/mk/haskell.mk +++ b/mk/haskell.mk @@ -1,4 +1,4 @@ -# $NetBSD: haskell.mk,v 1.21 2020/06/21 22:21:02 rillig Exp $ +# $NetBSD: haskell.mk,v 1.22 2020/06/29 18:07:45 rillig Exp $ # # This Makefile fragment handles Haskell Cabal packages. # See: http://www.haskell.org/cabal/ @@ -218,6 +218,8 @@ CONFIGURE_ARGS+= -O${HASKELL_OPTIMIZATION_LEVEL} .if !exists(${PKGDIR}/PLIST) _HS_PLIST_STATUS= missing +.elif !${${GREP} "." ${PKGDIR}/PLIST || ${TRUE}:L:sh} +_HS_PLIST_STATUS= missing .elif ${${GREP} HS_INTF ${PKGDIR}/PLIST || ${TRUE}:L:sh} _HS_PLIST_STATUS= lib-ok .elif !${${GREP} "/package-id" ${PKGDIR}/PLIST || ${TRUE}:L:sh} |