summaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenys Vlasenko2016-12-08 12:24:48 +0100
committerDenys Vlasenko2016-12-08 12:24:48 +0100
commit548620c18b1f0988dbeab1009788daf9f002e927 (patch)
tree3bfb327ed325f7aa869f51fe639e15811f3c556c /archival
parent4051a99f5fe4b1e1914e26924d166a629bf3c71e (diff)
downloadbusybox-548620c18b1f0988dbeab1009788daf9f002e927.zip
busybox-548620c18b1f0988dbeab1009788daf9f002e927.tar.gz
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival')
-rw-r--r--archival/bbunzip.c7
-rw-r--r--archival/libarchive/Kbuild.src9
2 files changed, 14 insertions, 2 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 7d5402e..d5db462 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -9,6 +9,8 @@
/* lzop_main() uses bbunpack(), need this: */
//kbuild:lib-$(CONFIG_LZOP) += bbunzip.o
+/* bzip2_main() too: */
+//kbuild:lib-$(CONFIG_BZIP2) += bbunzip.o
/* Note: must be kept in sync with archival/lzop.c */
enum {
@@ -190,7 +192,10 @@ int FAST_FUNC bbunpack(char **argv,
return exitcode;
}
-#if ENABLE_UNCOMPRESS || ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNXZ
+#if ENABLE_UNCOMPRESS \
+ || ENABLE_BUNZIP2 || ENABLE_BZCAT \
+ || ENABLE_UNLZMA || ENABLE_LZCAT || ENABLE_LZMA \
+ || ENABLE_UNXZ || ENABLE_XZCAT || ENABLE_XZ
static
char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
{
diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src
index b159a78..ad5c5c4 100644
--- a/archival/libarchive/Kbuild.src
+++ b/archival/libarchive/Kbuild.src
@@ -48,16 +48,23 @@ lib-$(CONFIG_CPIO) += get_header_cpio.o
lib-$(CONFIG_TAR) += get_header_tar.o unsafe_prefix.o
lib-$(CONFIG_FEATURE_TAR_TO_COMMAND) += data_extract_to_command.o
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
lib-$(CONFIG_UNLZMA) += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_LZCAT) += open_transformer.o decompress_unlzma.o
+lib-$(CONFIG_LZMA) += open_transformer.o decompress_unlzma.o
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_GUNZIP) += open_transformer.o decompress_gunzip.o
+lib-$(CONFIG_ZCAT) += 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
lib-$(CONFIG_RPM) += open_transformer.o decompress_gunzip.o get_header_cpio.o
-
lib-$(CONFIG_GZIP) += open_transformer.o
lib-$(CONFIG_BZIP2) += open_transformer.o
lib-$(CONFIG_LZOP) += open_transformer.o