summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2004-05-27 23:57:45 +0000
committerkientzle <kientzle@FreeBSD.org>2004-05-27 23:57:45 +0000
commit06394130cb36b1d45f8ca9c802af18dcafd60157 (patch)
tree5bceee5fb848c838aa15288bddb94ffcca93d84a
parent3442b2603072c87fa26f8efd030ad6ad5fff0bf0 (diff)
downloadFreeBSD-src-06394130cb36b1d45f8ca9c802af18dcafd60157.zip
FreeBSD-src-06394130cb36b1d45f8ca9c802af18dcafd60157.tar.gz
Connect libarchive decompress support to the build.
Also, add it to archive_read_support_compression_all() so that typical clients get it pulled in by default.
-rw-r--r--lib/libarchive/Makefile4
-rw-r--r--lib/libarchive/Makefile.freebsd4
-rw-r--r--lib/libarchive/archive_read_support_compression_all.c1
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 9a86d07..13e3262 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -25,6 +25,7 @@ SRCS= archive_check_magic.c \
archive_read_open_file.c \
archive_read_support_compression_all.c \
archive_read_support_compression_bzip2.c \
+ archive_read_support_compression_compress.c \
archive_read_support_compression_gzip.c \
archive_read_support_compression_none.c \
archive_read_support_format_all.c \
@@ -105,11 +106,11 @@ MLINKS+= archive_read.3 archive_read_open_file.3
MLINKS+= archive_read.3 archive_read_set_bytes_per_block.3
MLINKS+= archive_read.3 archive_read_support_compression_all.3
MLINKS+= archive_read.3 archive_read_support_compression_bzip2.3
+MLINKS+= archive_read.3 archive_read_support_compression_compress.3
MLINKS+= archive_read.3 archive_read_support_compression_gzip.3
MLINKS+= archive_read.3 archive_read_support_compression_none.3
MLINKS+= archive_read.3 archive_read_support_format_all.3
MLINKS+= archive_read.3 archive_read_support_format_cpio.3
-MLINKS+= archive_read.3 archive_read_support_format_gnutar.3
MLINKS+= archive_read.3 archive_read_support_format_tar.3
MLINKS+= archive_util.3 archive_compression.3
MLINKS+= archive_util.3 archive_compression_name.3
@@ -131,6 +132,7 @@ MLINKS+= archive_write.3 archive_write_set_callbacks.3
MLINKS+= archive_write.3 archive_write_set_compression_bzip2.3
MLINKS+= archive_write.3 archive_write_set_compression_gzip.3
MLINKS+= archive_write.3 archive_write_set_format_pax.3
+MLINKS+= archive_write.3 archive_write_set_format_shar.3
MLINKS+= archive_write.3 archive_write_set_format_ustar.3
MLINKS+= libarchive.3 archive.3
diff --git a/lib/libarchive/Makefile.freebsd b/lib/libarchive/Makefile.freebsd
index 9a86d07..13e3262 100644
--- a/lib/libarchive/Makefile.freebsd
+++ b/lib/libarchive/Makefile.freebsd
@@ -25,6 +25,7 @@ SRCS= archive_check_magic.c \
archive_read_open_file.c \
archive_read_support_compression_all.c \
archive_read_support_compression_bzip2.c \
+ archive_read_support_compression_compress.c \
archive_read_support_compression_gzip.c \
archive_read_support_compression_none.c \
archive_read_support_format_all.c \
@@ -105,11 +106,11 @@ MLINKS+= archive_read.3 archive_read_open_file.3
MLINKS+= archive_read.3 archive_read_set_bytes_per_block.3
MLINKS+= archive_read.3 archive_read_support_compression_all.3
MLINKS+= archive_read.3 archive_read_support_compression_bzip2.3
+MLINKS+= archive_read.3 archive_read_support_compression_compress.3
MLINKS+= archive_read.3 archive_read_support_compression_gzip.3
MLINKS+= archive_read.3 archive_read_support_compression_none.3
MLINKS+= archive_read.3 archive_read_support_format_all.3
MLINKS+= archive_read.3 archive_read_support_format_cpio.3
-MLINKS+= archive_read.3 archive_read_support_format_gnutar.3
MLINKS+= archive_read.3 archive_read_support_format_tar.3
MLINKS+= archive_util.3 archive_compression.3
MLINKS+= archive_util.3 archive_compression_name.3
@@ -131,6 +132,7 @@ MLINKS+= archive_write.3 archive_write_set_callbacks.3
MLINKS+= archive_write.3 archive_write_set_compression_bzip2.3
MLINKS+= archive_write.3 archive_write_set_compression_gzip.3
MLINKS+= archive_write.3 archive_write_set_format_pax.3
+MLINKS+= archive_write.3 archive_write_set_format_shar.3
MLINKS+= archive_write.3 archive_write_set_format_ustar.3
MLINKS+= libarchive.3 archive.3
diff --git a/lib/libarchive/archive_read_support_compression_all.c b/lib/libarchive/archive_read_support_compression_all.c
index 26aa118..9df6c4a 100644
--- a/lib/libarchive/archive_read_support_compression_all.c
+++ b/lib/libarchive/archive_read_support_compression_all.c
@@ -33,6 +33,7 @@ int
archive_read_support_compression_all(struct archive *a)
{
archive_read_support_compression_bzip2(a);
+ archive_read_support_compression_compress(a);
archive_read_support_compression_gzip(a);
return (ARCHIVE_OK);
}
OpenPOWER on IntegriCloud