Date: Sun, 16 May 2010 11:36:29 -0700 From: Tim Kientzle <kientzle@freebsd.org> To: d@delphij.net Cc: FreeBSD Current <freebsd-current@freebsd.org>, Luigi Rizzo <rizzo@iet.unipi.it> Subject: Re: [mini headsup] updating from 7.x to -CURRENT after lzma import Message-ID: <4BF03B2D.20402@freebsd.org> In-Reply-To: <4BE9EA4F.9010803@delphij.net> References: <4BE9EA4F.9010803@delphij.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4BF03B2D.20402>