pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/bison devel/bison: do not suggest nls option on ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a15f0ba75ba2
branches:  trunk
changeset: 381347:a15f0ba75ba2
user:      brook <brook%pkgsrc.org@localhost>
date:      Tue Jul 05 00:15:09 2022 +0000

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

diffstat:

 devel/bison/options.mk |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 8032f85e7b61 -r a15f0ba75ba2 devel/bison/options.mk
--- a/devel/bison/options.mk    Mon Jul 04 21:52:04 2022 +0000
+++ b/devel/bison/options.mk    Tue Jul 05 00:15:09 2022 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: options.mk,v 1.5 2021/10/30 07:46:10 schmonz Exp $
+# $NetBSD: options.mk,v 1.6 2022/07/05 00:15:09 brook Exp $
+
+.include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bison
 PKG_SUPPORTED_OPTIONS= nls
-# TODO: avoid suggesting nls on macOS/x86_64 versions where bison will crash
+# avoid suggesting nls on macOS/x86_64 versions where bison will crash
 # schmonz reports 11.6 crashes, earlier likely doesn't, 12.0.1 doesn't
+.if ${OPSYS} != Darwin || (${OPSYS} == Darwin && ${OPSYS_VERSION} > 110600)
 PKG_SUGGESTED_OPTIONS=  nls
+.endif
 
 PLIST_VARS+=           nls
 



Home | Main Index | Thread Index | Old Index