Tue Jul 5 00:15:09 2022 UTC ()
devel/bison: do not suggest nls option on Darwin

The previous commit message included the following comment:

    TODO: avoid suggesting nls on macOS/x86_64 versions where bison
    will crash.

Additionally, options.mk contains a comment suggesting the crash only
occurs for versions less than or equal to approximately 11.6.  This
commit adds conditionals to options.mk to suggest the nls option only
when crashes are not expected.


(brook)
diff -r1.5 -r1.6 pkgsrc/devel/bison/options.mk

cvs diff -r1.5 -r1.6 pkgsrc/devel/bison/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/bison/options.mk 2021/10/30 07:46:10 1.5
+++ pkgsrc/devel/bison/options.mk 2022/07/05 00:15:09 1.6
@@ -1,20 +1,24 @@ @@ -1,20 +1,24 @@
1# $NetBSD: options.mk,v 1.5 2021/10/30 07:46:10 schmonz Exp $ 1# $NetBSD: options.mk,v 1.6 2022/07/05 00:15:09 brook Exp $
 2
 3.include "../../mk/bsd.prefs.mk"
2 4
3PKG_OPTIONS_VAR= PKG_OPTIONS.bison 5PKG_OPTIONS_VAR= PKG_OPTIONS.bison
4PKG_SUPPORTED_OPTIONS= nls 6PKG_SUPPORTED_OPTIONS= nls
5# TODO: avoid suggesting nls on macOS/x86_64 versions where bison will crash 7# avoid suggesting nls on macOS/x86_64 versions where bison will crash
6# schmonz reports 11.6 crashes, earlier likely doesn't, 12.0.1 doesn't 8# schmonz reports 11.6 crashes, earlier likely doesn't, 12.0.1 doesn't
 9.if ${OPSYS} != Darwin || (${OPSYS} == Darwin && ${OPSYS_VERSION} > 110600)
7PKG_SUGGESTED_OPTIONS= nls 10PKG_SUGGESTED_OPTIONS= nls
 11.endif
8 12
9PLIST_VARS+= nls 13PLIST_VARS+= nls
10 14
11.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
12 16
13### 17###
14### NLS support 18### NLS support
15### 19###
16.if !empty(PKG_OPTIONS:Mnls) 20.if !empty(PKG_OPTIONS:Mnls)
17USE_PKGLOCALEDIR= yes 21USE_PKGLOCALEDIR= yes
18USE_TOOLS+= msgfmt 22USE_TOOLS+= msgfmt
19CONFIGURE_ARGS+= --enable-nls 23CONFIGURE_ARGS+= --enable-nls
20CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes 24CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes