Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk/haskell.mk: fix PLIST status detection



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f0d83b219dd7
branches:  trunk
changeset: 435050:f0d83b219dd7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jun 29 18:07:45 2020 +0000

description:
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:

 mk/haskell.mk |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 933911edf789 -r f0d83b219dd7 mk/haskell.mk
--- a/mk/haskell.mk     Mon Jun 29 18:04:13 2020 +0000
+++ b/mk/haskell.mk     Mon Jun 29 18:07:45 2020 +0000
@@ -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 @@
 
 .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}



Home | Main Index | Thread Index | Old Index