From owner-freebsd-current@FreeBSD.ORG Sun May 16 18:36:47 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 569D1106566C for ; Sun, 16 May 2010 18:36:47 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from monday.kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id 055598FC08 for ; Sun, 16 May 2010 18:36:46 +0000 (UTC) Received: (from root@localhost) by monday.kientzle.com (8.14.3/8.14.3) id o4GIamF7005051; Sun, 16 May 2010 18:36:48 GMT (envelope-from kientzle@freebsd.org) Received: from horton.x.kientzle.com (fw2.kientzle.com [10.123.1.2]) by kientzle.com with SMTP id e88trz6tvwynimcespzufp6jc2; Sun, 16 May 2010 18:36:47 +0000 (UTC) (envelope-from kientzle@freebsd.org) Message-ID: <4BF03B2D.20402@freebsd.org> Date: Sun, 16 May 2010 11:36:29 -0700 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.8.1.23) Gecko/20100314 SeaMonkey/1.1.18 MIME-Version: 1.0 To: d@delphij.net References: <4BE9EA4F.9010803@delphij.net> In-Reply-To: <4BE9EA4F.9010803@delphij.net> Content-Type: multipart/mixed; boundary="------------040205040805000403040103" Cc: FreeBSD Current , Luigi Rizzo Subject: Re: [mini headsup] updating from 7.x to -CURRENT after lzma import X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 May 2010 18:36:47 -0000 This is a multi-part message in MIME format. --------------040205040805000403040103 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Xin LI wrote: > The recent lzma import has enabled libarchive's lzma support. However, > it have come to our attention that building -HEAD on earlier FreeBSD > versions (specifically, 7.x after 700044 through 8.x before 800022) have > been broken. > > The reason behind this is that 'make buildworld' will build a new ar(1) > binary which links to libarchive, causing build to break on these systems. The following patch partially fixes this problem by just disabling all compression support in ar. (There's definitely no gain in compressing static libraries unless ld can read them. ;-) I don't think this totally fixes the problem. I'd appreciate if someone could try this and let me know how far you get. Tim --------------040205040805000403040103 Content-Type: text/x-patch; name="ar_no_compression.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ar_no_compression.patch" Index: acpyacc.y =================================================================== --- acpyacc.y (revision 208162) +++ acpyacc.y (working copy) @@ -250,7 +250,7 @@ if ((a = archive_read_new()) == NULL) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); - archive_read_support_compression_all(a); + archive_read_support_compression_none(a); archive_read_support_format_ar(a); AC(archive_read_open_file(a, fname, DEF_BLKSZ)); if ((r = archive_read_next_header(a, &entry))) Index: write.c =================================================================== --- write.c (revision 208162) +++ write.c (working copy) @@ -247,7 +247,7 @@ if ((a = archive_read_new()) == NULL) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); - archive_read_support_compression_all(a); + archive_read_support_compression_none(a); archive_read_support_format_ar(a); AC(archive_read_open_filename(a, archive, DEF_BLKSZ)); for (;;) { Index: read.c =================================================================== --- read.c (revision 208162) +++ read.c (working copy) @@ -87,7 +87,7 @@ if ((a = archive_read_new()) == NULL) bsdar_errc(bsdar, EX_SOFTWARE, 0, "archive_read_new failed"); - archive_read_support_compression_all(a); + archive_read_support_compression_none(a); archive_read_support_format_ar(a); AC(archive_read_open_file(a, bsdar->filename, DEF_BLKSZ)); --------------040205040805000403040103--