On Mon, Feb 09, 2015 at 05:47:10PM -0500, Nikolai Lifanov wrote: > On 2015-02-09 05:46, Glen Barber wrote: > >Author: gjb > >Date: Mon Feb 9 10:46:39 2015 > >New Revision: 278450 > >URL: https://svnweb.freebsd.org/changeset/base/278450 > > > >Log: > > Revert r278445. > > > > I was going to use __FreeBSD_version to determine if > > xz(1) should be multi-threaded by default, but doing > > this will cause problems if/when the changes are merged > > from head. > > > > Sponsored by: The FreeBSD Foundation > > > >Modified: > > head/release/Makefile > > > >Modified: head/release/Makefile > > > > Can you just X-MFC this with xz 5.2.0 import? > You can then refer to xz in OBJDIR to get this to work on older releases. >
That is the intent, but not this commit.
The problem is the Makefile would contain things like:
.if (${FREEBSD_VERSION} >= 1100059) || ((${FREEBSD_VERSION < 1100000 \
&& ${FREEBSD_VERSION} >= 1000555)) [...].
and other varying levels of ridiculousness.
It's bad enough we have to do this in the ports tree. I certainly do
not intend to implement this behavior in the src tree.
With regards to the OBJDIR, actual releases (not always snapshots) are
always built from the same major FreeBSD version or higher. Meaning,
code/features that exist in releng/10.1 are available already in
stable/10 at the time.
In this particular case, I care less about snapshot builds and more
about the release builds, which in this particular case, we are far off
in the future enough that it is guaranteed the feature needed will be
available.
Glen
pgphiuaYQKJMk.pgp
Description: PGP signature
