Page MenuHomeFreeBSD

Band-aid to let lib/libmagic compile on older branches

Authored by dim on Jan 13 2015, 6:20 PM.



Sicne the MFC of file 5.21 in r276416, stable/9 cannot be built from any
FreeBSD 8.x version. This is because the build-tools stage requires
libmagic, but lib/libmagic/config.h was generated on -current, and it
now enables using the xlocale.h APIs, which are not supported on 8.x
(and on 9.x before __FreeBSD_version 900506).

See also the start of this thread on -stable:

Applying this diff directly to stable/9 makes it build on 8.4-RELEASE.
Let's first get it into -current, then MFC it after a suitable timeout.

Test Plan

Build world (or just the build-tools stage) from a few older versions of
FreeBSD, e.g 8.x building stable/9, 9.0-RELEASE building stable/9.

Diff Detail

rS FreeBSD src repository
Lint Skipped
Unit Tests Skipped

Event Timeline

dim updated this revision to Diff 3149.Jan 13 2015, 6:20 PM
dim retitled this revision from to Band-aid to let lib/libmagic compile on older branches.
dim updated this object.
dim edited the test plan for this revision. (Show Details)
dim added reviewers: delphij, theraven.
delphij accepted this revision.Jan 13 2015, 8:30 PM
delphij edited edge metadata.

Looks fine to me.

This revision is now accepted and ready to land.Jan 13 2015, 8:30 PM
dim closed this revision.Jan 13 2015, 8:38 PM
dim updated this revision to Diff 3159.

Closed by commit rS277147 (authored by @dim).