CVS commit: pkgsrc/devel/gmake

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Mar 14 13:28:58 UTC 2020

Modified Files:
        pkgsrc/devel/gmake: options.mk

Log Message:
gmake: try harder to unbreak circular dependency

Having builtin gettext (the lib) doesn't always imply that we have a
builtin msgfmt (the tool).


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gmake/options.mk

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

Modified files:

Index: pkgsrc/devel/gmake/options.mk
diff -u pkgsrc/devel/gmake/options.mk:1.8 pkgsrc/devel/gmake/options.mk:1.9
--- pkgsrc/devel/gmake/options.mk:1.8   Thu Oct 31 15:05:52 2019
+++ pkgsrc/devel/gmake/options.mk       Sat Mar 14 13:28:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2019/10/31 15:05:52 jperkin Exp $
+# $NetBSD: options.mk,v 1.9 2020/03/14 13:28:57 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gmake
 PKG_SUPPORTED_OPTIONS= nls
@@ -12,7 +12,8 @@ PLIST_VARS+=          nls
 # to avoid a circular dependency (gmake->gettext-tools->ncurses->gmake).
 .include "../../devel/gettext-lib/builtin.mk"
 .if !empty(PKG_OPTIONS:Mnls) && \
-    !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
+    !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) && \
+    !empty(TOOLS_PLATFORM.msgfmt:U)
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            msgfmt
 .  include "../../devel/gettext-lib/buildlink3.mk"