From owner-svn-src-all@FreeBSD.ORG Tue Feb 10 00:12:42 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33BE7CD2; Tue, 10 Feb 2015 00:12:42 +0000 (UTC) Received: from mail.lifanov.com (mail.lifanov.com [206.125.175.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B7507B1; Tue, 10 Feb 2015 00:12:41 +0000 (UTC) Received: by mail.lifanov.com (Postfix, from userid 58) id 89D081C84AA; Mon, 9 Feb 2015 17:47:11 -0500 (EST) Received: from app.lifanov.com (chat.lifanov.com [206.125.175.13]) by mail.lifanov.com (Postfix) with ESMTPA id BA2711C84A8; Mon, 9 Feb 2015 17:47:10 -0500 (EST) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 09 Feb 2015 17:47:10 -0500 From: Nikolai Lifanov To: Glen Barber Subject: Re: svn commit: r278450 - head/release In-Reply-To: <201502091046.t19AkdCM067270@svn.freebsd.org> References: <201502091046.t19AkdCM067270@svn.freebsd.org> Message-ID: <150387d27ebf311cb4751fe39c2a080c@mail.lifanov.com> X-Sender: lifanov@mail.lifanov.com User-Agent: Roundcube Webmail/1.0.5 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, owner-svn-src-head@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2015 00:12:42 -0000 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