diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-07-15 08:51:21 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-07-15 08:51:21 +0000 |
| commit | d215d9034d05c218007cefec409d7279464cd74e (patch) | |
| tree | 9769ce3e450c53f6c0903178f7bcbe1e735cc203 /mk | |
| parent | 4fd84a74e4a2c2e5fa459ec873b00132827712d8 (diff) | |
| download | pkgsrc-d215d9034d05c218007cefec409d7279464cd74e.tar.gz | |
Revert back to avoiding the system bison. Whilst it is new enough to
satisfy the BISON_REQD check, it does not function correctly in the tools
environment when not called as /usr/bin/bison, as it is unable to find its
m4sugar.m4 without BISON_PKGDATADIR being set.
Whilst we could work around that in bison.mk I feel that's something of a
hack, and it is simpler and cleaner to just use the pkgsrc tool instead.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/tools.Darwin.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk index a21c6891cf1..0f71891f0cc 100644 --- a/mk/tools/tools.Darwin.mk +++ b/mk/tools/tools.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Darwin.mk,v 1.47 2013/07/09 15:22:31 jperkin Exp $ +# $NetBSD: tools.Darwin.mk,v 1.48 2013/07/15 08:51:21 jperkin Exp $ # # System-supplied tools for the Darwin (Mac OS X) operating system. @@ -6,8 +6,11 @@ TOOLS_PLATFORM.[?= [ # shell builtin TOOLS_PLATFORM.awk?= /usr/bin/awk TOOLS_PLATFORM.basename?= /usr/bin/basename TOOLS_PLATFORM.bash?= /bin/bash -TOOLS_PLATFORM.bison?= /usr/bin/bison -TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y +# Native bison (at least up to version 2.3 in OSX Lion) does not work +# well in the tools environment and cannot locate m4sugar.m4 without +# BISON_PKGDATADIR being set. For now just pull in the pkgsrc tool. +#TOOLS_PLATFORM.bison?= /usr/bin/bison +#TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y .if exists(/usr/bin/bsdtar) TOOLS_PLATFORM.bsdtar?= /usr/bin/bsdtar .endif |