diff options
| author | roberto <roberto@FreeBSD.org> | 2014-08-14 12:16:03 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2014-08-14 12:16:03 +0000 |
| commit | cb8cf293f9a0b317dafb457a49942c647e8a7c21 (patch) | |
| tree | f8a60db3f8e502f9f6cf4bfcf25108da7e51f469 /Makefile.inc1 | |
| parent | ac37b42b286ee53dc9a45bbd1bf51dd6cb87b95a (diff) | |
| download | FreeBSD-src-cb8cf293f9a0b317dafb457a49942c647e8a7c21.zip FreeBSD-src-cb8cf293f9a0b317dafb457a49942c647e8a7c21.tar.gz | |
MFC r269662:
10 has a new flex (2.5.37) and the config.h for unbound has been updated to
take this into account. Alas it breaks source upgrade from any version of
9 because flex is not built as a bootstrap-tools (it would be for older
versions).
That means "libunbound/configlexer.c" is built with the old flex but using
config.h for the new one. Build is thus broken going from 9.* to 10.
Make flex a bootstrap-tools entry if host is less than 1000033 to take into
account the flex update in 10.
Tested on both 9.2-RC3 and 9.3 by myself and dim@. Running buildworld in
head but as both 10 and 11 has the new flex, it will not matter.
Reviewed by: imp
Approved by: des, imp
MFC after: 1 week
Phabric: D554
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ba60270..cdda759 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1218,10 +1218,6 @@ _mklocale= usr.bin/mklocale _sed= usr.bin/sed .endif -.if ${BOOTSTRAPPING} < 900006 -_lex= usr.bin/lex -.endif - .if ${BOOTSTRAPPING} < 1000002 _m4= usr.bin/m4 .endif @@ -1244,6 +1240,10 @@ _nmtree= lib/libnetbsd \ _cat= bin/cat .endif +.if ${BOOTSTRAPPING} < 1000033 +_lex= usr.bin/lex +.endif + .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041 _awk= usr.bin/awk .endif |
