aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2013-12-03 18:15:58 +1100
committerH. Peter Anvin <hpa@zytor.com>2013-12-03 10:53:46 -0800
commitc6fc1a4b086a5d6504bc5e1048f039f7a644d73b (patch)
tree7239e3f427fb4899a7324bf3cb4cb694861373b9
parent71a849a7e2d5e73321e986fa91d1f34b387e71ba (diff)
downloadklibc-c6fc1a4b086a5d6504bc5e1048f039f7a644d73b.tar.gz
[klibc] gzip: Fix typo CONFIG_KLIB_ZIP -> CONFIG_KLIBC_ZIPklibc-2.0.3
We were using CONFIG_KLIB_ZIP in a couple of places where we meant to use CONFIG_KLIBC_ZIP. I also added the option to the defconfig. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--defconfig1
-rw-r--r--usr/gzip/Kbuild4
2 files changed, 3 insertions, 2 deletions
diff --git a/defconfig b/defconfig
index c10a4f5f425d2..04b98e9cf9573 100644
--- a/defconfig
+++ b/defconfig
@@ -1,6 +1,7 @@
CONFIG_KLIBC=y
CONFIG_KLIBC_ERRLIST=y
CONFIG_KLIBC_ZLIB=y
+# CONFIG_KLIBC_ZIP is not set
# i386 option
CONFIG_REGPARM=y
# ARM options
diff --git a/usr/gzip/Kbuild b/usr/gzip/Kbuild
index 64fae0497b009..9bbf0a4715092 100644
--- a/usr/gzip/Kbuild
+++ b/usr/gzip/Kbuild
@@ -10,8 +10,8 @@ gzip-y := gzip.o util.o unzip.o inflate.o
always := gunzip zcat
# Optional ZIP support
-gzip-$(CONFIG_KLIB_ZIP) += zip.o deflate.o trees.o bits.o
-cflags-$(CONFIG_KLIB_ZIP) += -DSUPPORT_ZIP
+gzip-$(CONFIG_KLIBC_ZIP) += zip.o deflate.o trees.o bits.o
+cflags-$(CONFIG_KLIBC_ZIP) += -DSUPPORT_ZIP
EXTRA_KLIBCCFLAGS := $(cflags-y)
# Additionally linked targets