pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/archivers/xz xz: Only enable nls by default if msgfmt ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b97bc7083f2b
branches:  trunk
changeset: 373958:b97bc7083f2b
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jan 12 11:35:28 2018 +0000

description:
xz: Only enable nls by default if msgfmt is builtin.

Avoids circular dependency issues as xz with nls depends on gettext-tools if
msgfmt comes from pkgsrc, which in turn depends on xz.

diffstat:

 archivers/xz/options.mk |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r b514bdbcc025 -r b97bc7083f2b archivers/xz/options.mk
--- a/archivers/xz/options.mk   Fri Jan 12 11:32:29 2018 +0000
+++ b/archivers/xz/options.mk   Fri Jan 12 11:35:28 2018 +0000
@@ -1,8 +1,14 @@
-# $NetBSD: options.mk,v 1.4 2017/09/20 12:05:46 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2018/01/12 11:35:28 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xz
 PKG_SUPPORTED_OPTIONS= nls
+
+# Only add nls as a default option if msgfmt is builtin, otherwise there
+# are circular dependency issues with xz -> gettext-tools -> xz.
+.include "../../mk/bsd.prefs.mk"
+.if exists(${TOOLS_PLATFORM.msgfmt})
 PKG_SUGGESTED_OPTIONS= nls
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,6 +16,7 @@
 
 .if !empty(PKG_OPTIONS:Mnls)
 USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            msgfmt
 PLIST.nls=             yes
 CONFIGURE_ARGS+=       --enable-nls
 .include "../../devel/gettext-lib/buildlink3.mk"



Home | Main Index | Thread Index | Old Index