pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/gmake gmake: try harder to unbreak circular depe...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c78768b537e
branches:  trunk
changeset: 413002:9c78768b537e
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Mar 14 13:28:57 2020 +0000

description:
gmake: try harder to unbreak circular dependency

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

diffstat:

 devel/gmake/options.mk |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r aae017917a6e -r 9c78768b537e devel/gmake/options.mk
--- a/devel/gmake/options.mk    Sat Mar 14 13:28:38 2020 +0000
+++ b/devel/gmake/options.mk    Sat Mar 14 13:28:57 2020 +0000
@@ -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 @@
 # 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"



Home | Main Index | Thread Index | Old Index