diff options
| author | Simon Horman <horms@verge.net.au> | 2008-02-19 14:50:26 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-02-19 14:50:26 +0900 |
| commit | ffde99f4920fe60798d527c2bcdf91d1d2385b86 (patch) | |
| tree | 02e367c79f4115fea8fb9bde7131d100747dafa2 /kexec | |
| parent | 487794c3a650dac933e8aeaaf618b466cc306519 (diff) | |
Use zlib if present
Hi,
This fixes a minor regression that occured with Jeremy's recent
reworking of the build system. I guess he wasn't dealing with
compressed images and thus didn't notice that zlib support had
been disabled.
The fix involves updating an #ifdef to use the new symbol,
and ensuring that -lz is passed to the linker as neccessary.
Cc: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec')
| -rw-r--r-- | kexec/Makefile | 1 | ||||
| -rw-r--r-- | kexec/kexec.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kexec/Makefile b/kexec/Makefile index 29534d0..7832a13 100644 --- a/kexec/Makefile +++ b/kexec/Makefile @@ -36,6 +36,7 @@ KEXEC_MANPAGE = $(MANDIR)/man8/kexec.8 -include $(KEXEC_DEPS) +$(KEXEC): LDFLAGS+=$(LIBS) $(KEXEC): $(KEXEC_OBJS) $(UTIL_LIB) @$(MKDIR) -p $(@D) $(LINK.o) -o $@ $^ diff --git a/kexec/kexec.c b/kexec/kexec.c index abc1cce..4094dd7 100644 --- a/kexec/kexec.c +++ b/kexec/kexec.c @@ -32,7 +32,7 @@ #include "config.h" -#ifdef HAVE_ZLIB_H +#ifdef HAVE_LIBZ #include <zlib.h> #endif #include <sha256.h> @@ -446,7 +446,7 @@ char *slurp_file_len(const char *filename, off_t size) return buf; } -#if HAVE_ZLIB_H +#if HAVE_LIBZ char *slurp_decompress_file(const char *filename, off_t *r_size) { gzFile fp; |