pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk handle the operating system having GNU yacc (actual...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/151c6af5145e
branches:  trunk
changeset: 481880:151c6af5145e
user:      grant <grant%pkgsrc.org@localhost>
date:      Thu Oct 14 09:51:43 2004 +0000

description:
handle the operating system having GNU yacc (actually bison) and
explicitly undef YACC.

YACC?=yacc is set in sys.mk, but this interferes with building some
packages that require bison because they try ${YACC} and fail.

diffstat:

 mk/tools.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r 679fa6ca1aab -r 151c6af5145e mk/tools.mk
--- a/mk/tools.mk       Thu Oct 14 09:47:57 2004 +0000
+++ b/mk/tools.mk       Thu Oct 14 09:51:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.41 2004/10/12 01:17:36 tv Exp $
+# $NetBSD: tools.mk,v 1.42 2004/10/14 09:51:43 grant Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -186,6 +186,7 @@
 #
 _TOOLS_NEED_GNU.${_tool_}=     YES
 .  for _pattern_ in ${_TOOLS_OPSYS_HAS_GNU.${_tool_}}
+_TOOLS_HAS_GNU.${_tool_}=      YES
 .    if !empty(MACHINE_PLATFORM:M${_pattern_})
 _TOOLS_NEED_GNU.${_tool_}=     NO
 .    endif
@@ -333,6 +334,9 @@
 MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
 .endif
 
+.if ${_TOOLS_HAS_GNU.yacc} == "YES"
+.  undef YACC
+.endif
 .if ${_TOOLS_REPLACE.yacc} == "YES"
 _TOOLS_OVERRIDE.yacc=  YES
 _TOOLS_PROGNAME.yacc=  ${YACC}



Home | Main Index | Thread Index | Old Index