Author: roberto
Date: Thu Aug 14 12:16:03 2014
New Revision: 269967
URL: http://svnweb.freebsd.org/changeset/base/269967
Log:
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
Modified:
stable/10/Makefile.inc1
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1 Thu Aug 14 08:42:16 2014 (r269966)
+++ stable/10/Makefile.inc1 Thu Aug 14 12:16:03 2014 (r269967)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
