diff options
| author | Kang-Che Sung | 2017-02-17 19:04:24 +0800 |
|---|---|---|
| committer | Denys Vlasenko | 2017-02-17 20:15:27 +0100 |
| commit | 74c2215086d45ae9cbc0114235895e5bcc887071 (patch) | |
| tree | e69ba03f38ae15941beb5f2baa2701e00c7445a7 /archival | |
| parent | 7c67f1e9abf8bc26868236bbe3aa35aa130e2696 (diff) | |
| download | busybox-74c2215086d45ae9cbc0114235895e5bcc887071.zip busybox-74c2215086d45ae9cbc0114235895e5bcc887071.tar.gz | |
Fix FEATURE_{GZIP,BZIP2}_DECOMPRESS link error
... when gzip is selected but not gunzip nor zcat, or when bzip2 is
selected but not bunzip2 nor bzcat.
This regression is introduced in b130f9f758b6404c6d0911a1c120937ae6ab47f8
("Allow 'gzip -d' and 'bzip2 -d' without gunzip or bunzip2")
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/libarchive/Kbuild.src | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src index eaf6745..942e755 100644 --- a/archival/libarchive/Kbuild.src +++ b/archival/libarchive/Kbuild.src @@ -51,8 +51,8 @@ lib-$(CONFIG_LZOP) += lzo1x_1.o lzo1x_1o.o lzo1x_d.o lib-$(CONFIG_UNLZOP) += lzo1x_1.o lzo1x_1o.o lzo1x_d.o lib-$(CONFIG_LZOPCAT) += lzo1x_1.o lzo1x_1o.o lzo1x_d.o lib-$(CONFIG_LZOP_COMPR_HIGH) += lzo1x_9x.o -lib-$(CONFIG_BUNZIP2) += open_transformer.o decompress_bunzip2.o -lib-$(CONFIG_BZCAT) += open_transformer.o decompress_bunzip2.o +# 'bzip2 -d', bunzip2 or bzcat selects FEATURE_BZIP2_DECOMPRESS +lib-$(CONFIG_FEATURE_BZIP2_DECOMPRESS) += open_transformer.o decompress_bunzip2.o lib-$(CONFIG_FEATURE_UNZIP_BZIP2) += open_transformer.o decompress_bunzip2.o lib-$(CONFIG_UNLZMA) += open_transformer.o decompress_unlzma.o lib-$(CONFIG_LZCAT) += open_transformer.o decompress_unlzma.o @@ -62,8 +62,8 @@ lib-$(CONFIG_UNXZ) += open_transformer.o decompress_unxz.o lib-$(CONFIG_XZCAT) += open_transformer.o decompress_unxz.o lib-$(CONFIG_XZ) += open_transformer.o decompress_unxz.o lib-$(CONFIG_FEATURE_UNZIP_XZ) += open_transformer.o decompress_unxz.o -lib-$(CONFIG_GUNZIP) += open_transformer.o decompress_gunzip.o -lib-$(CONFIG_ZCAT) += open_transformer.o decompress_gunzip.o +# 'gzip -d', gunzip or zcat selects FEATURE_GZIP_DECOMPRESS +lib-$(CONFIG_FEATURE_GZIP_DECOMPRESS) += open_transformer.o decompress_gunzip.o lib-$(CONFIG_UNCOMPRESS) += open_transformer.o decompress_uncompress.o lib-$(CONFIG_UNZIP) += open_transformer.o decompress_gunzip.o unsafe_prefix.o lib-$(CONFIG_RPM2CPIO) += open_transformer.o decompress_gunzip.o get_header_cpio.o |