Re: svn commit: r278450 - head/release
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 < 110 \
&& ${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
Re: svn commit: r278450 - head/release
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. - Nikolai Lifanov ___ 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"
Re: svn commit: r278450 - head/release
On Feb 9, 2015, at 08:50, Adrian Chadd wrote: > > ... this is why we should have some kind of version identifier in each > tool, or capability lists. Otherwise lulz will ensue like this. Well, we have: xz --version will output a version string that should be easy to parse. -- Rui Paulo ___ 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"
Re: svn commit: r278450 - head/release
... this is why we should have some kind of version identifier in each tool, or capability lists. Otherwise lulz will ensue like this. -adrian On 9 February 2015 at 08:44, Rui Paulo wrote: > On Feb 9, 2015, at 02: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. > > You can do "nm -D liblzma" and check for lzma_stream_encoder_mt. Or you > could check if xz(1) has threading support via xz -h (ugly). > > -- > Rui Paulo > > > > ___ 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"
Re: svn commit: r278450 - head/release
On Feb 9, 2015, at 02: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. You can do "nm -D liblzma" and check for lzma_stream_encoder_mt. Or you could check if xz(1) has threading support via xz -h (ugly). -- Rui Paulo ___ 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"
svn commit: r278450 - head/release
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
==
--- head/release/Makefile Mon Feb 9 10:42:27 2015(r278449)
+++ head/release/Makefile Mon Feb 9 10:46:39 2015(r278450)
@@ -59,10 +59,6 @@ TARGET_ARCH= ${TARGET}
IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
DISTDIR= dist
-# Get the __FreeBSD_version for the build
-FREEBSD_VERSION!= awk '/^\#define __FreeBSD_version/ {print $$3}' \
- ${.CURDIR}/../sys/sys/param.h
-
.if !defined(NO_XZTHREADS) && empty(XZ_THREADS)
XZ_THREADS=0
.else
___
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"
