Page MenuHomeFreeBSD

Making flex a bootstrap tools to avoid build breakage going from 9.* to 10
ClosedPublic

Authored by roberto on Aug 6 2014, 3:22 PM.

Details

Reviewers
dim
imp
des
Summary

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 flex update in 10.

Test Plan

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.

Diff Detail

Repository
rS FreeBSD src repository
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

roberto retitled this revision from to Making flex a bootstrap tools to avoid build breakage going from 9.* to 10.Aug 6 2014, 3:22 PM
roberto updated this object.
roberto edited the test plan for this revision. (Show Details)
roberto added reviewers: des, dim.
roberto updated this revision to Diff 984.
imp added a reviewer: imp.Aug 6 2014, 3:42 PM
imp accepted this revision.
imp added a subscriber: imp.

Looks like the right fix to me for the problem you described.

For bonus points, please sort this so the bootstrapping if statements are in strictly increasing order. This will make my life easier in the future. Thanks!

This revision is now accepted and ready to land.Aug 6 2014, 3:42 PM

imp: will sort as you requested. The window of breakage is limited to the time between the new flex import and now but as source upgrades are still supported, we need to fix this. Will merge to stable/10 ASAP.

roberto edited edge metadata.Aug 7 2014, 10:18 AM
roberto updated this revision to Diff 995.

Sorting entry as asked by imp.

roberto closed this revision.Aug 7 2014, 11:56 AM

Committed as r269662.