Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Aug 2014 11:44:30 +0000 (UTC)
From:      Ollivier Robert <roberto@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r269662 - head
Message-ID:  <53e3669e.5845.3a38a5f4@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: roberto
Date: Thu Aug  7 11:44:30 2014
New Revision: 269662
URL: http://svnweb.freebsd.org/changeset/base/269662

Log:
  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:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Aug  7 10:23:50 2014	(r269661)
+++ head/Makefile.inc1	Thu Aug  7 11:44:30 2014	(r269662)
@@ -1207,10 +1207,6 @@ _vtfontcvt=	usr.bin/vtfontcvt
 _sed=		usr.bin/sed
 .endif
 
-.if ${BOOTSTRAPPING} < 900006
-_lex=		usr.bin/lex
-.endif
-
 .if ${BOOTSTRAPPING} < 1000002
 _m4=		usr.bin/m4
 .endif
@@ -1233,6 +1229,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e3669e.5845.3a38a5f4>