From: Kang-Che Sung Date: Fri, 17 Feb 2017 11:04:24 +0000 (+0800) Subject: Fix FEATURE_{GZIP,BZIP2}_DECOMPRESS link error X-Git-Tag: 1_27_0~115 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=74c2215086d45ae9cbc0114235895e5bcc887071;p=oweals%2Fbusybox.git 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 Signed-off-by: Denys Vlasenko --- diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src index eaf67451f..942e755b9 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