diff options
author | Mark Wielaard <mjw@redhat.com> | 2015-10-16 23:07:12 +0200 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2015-10-26 13:52:31 +0100 |
commit | 528cb45fc99a1f402ac153891ac7c007921699ef (patch) | |
tree | 0dffe0f711a8b037cb6f73b5b54ec2993186171a | |
parent | 5eb3e901f9ffdc02d80f5df8f6963261a23f977c (diff) | |
download | elfutils-528cb45fc99a1f402ac153891ac7c007921699ef.tar.gz |
Make zlib mandatory.
Explicitly link libelf and libdw with -lz.
Signed-off-by: Mark Wielaard <mjw@redhat.com>
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 10 | ||||
-rw-r--r-- | libdw/ChangeLog | 4 | ||||
-rw-r--r-- | libdw/Makefile.am | 2 | ||||
-rw-r--r-- | libelf/ChangeLog | 4 | ||||
-rw-r--r-- | libelf/Makefile.am | 2 | ||||
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | tests/ChangeLog | 5 | ||||
-rw-r--r-- | tests/Makefile.am | 4 |
10 files changed, 36 insertions, 8 deletions
@@ -1,3 +1,7 @@ +2015-10-16 Mark Wielaard <mjw@redhat.com> + + * configure.ac: Make zlib mandatory. + 2015-10-15 Mark Wielaard <mjw@redhat.com> * configure.ac: Set version to 0.164. diff --git a/configure.ac b/configure.ac index 5d691c9f..e0107549 100644 --- a/configure.ac +++ b/configure.ac @@ -240,11 +240,17 @@ AC_SUBST([LIBEBL_SUBDIR]) AC_DEFINE_UNQUOTED(LIBEBL_SUBDIR, "$LIBEBL_SUBDIR") AH_TEMPLATE([LIBEBL_SUBDIR], [$libdir subdirectory containing libebl modules.]) -dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am -dnl conditional and config.h USE_ZLIB/USE_BZLIB #define. +dnl zlib is mandatory. save_LIBS="$LIBS" LIBS= eu_ZIPLIB(zlib,ZLIB,z,gzdirect,gzip) +AS_IF([test "x$with_zlib" = xno], [AC_MSG_ERROR("zlib not found")]) +LIBS="$save_LIBS" + +dnl Test for bzlib and xz/lzma, gives BZLIB/LZMALIB .am +dnl conditional and config.h USE_BZLIB/USE_LZMALIB #define. +save_LIBS="$LIBS" +LIBS= eu_ZIPLIB(bzlib,BZLIB,bz2,BZ2_bzdopen,bzip2) eu_ZIPLIB(lzma,LZMA,lzma,lzma_auto_decoder,[LZMA (xz)]) zip_LIBS="$LIBS" diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 4242a7c1..99ec2e8c 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2015-10-16 Mark Wielaard <mjw@redhat.com> + + * Makefile.am (libdw.so): Add -lz. + 2015-10-14 Chih-Hung Hsieh <chh@google.com> * cfi.c (execute_cfi): Move nested functions 'enough_registers' diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 2da0db67..082d96c7 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -112,7 +112,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ -Wl,--version-script,$<,--no-undefined \ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ - -ldl $(argp_LDADD) $(zip_LIBS) + -ldl -lz $(argp_LDADD) $(zip_LIBS) @$(textrel_check) $(AM_V_at)ln -fs $@ $@.$(VERSION) diff --git a/libelf/ChangeLog b/libelf/ChangeLog index 18d77974..fbe8e3ae 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2015-10-16 Mark Wielaard <mjw@redhat.com> + + * Makefile.am (libelf_so_LDLIBS): Add -lz. + 2015-10-14 Mark Wielaard <mjw@redhat.com> * elf.h: Update from glibc. Add section compression constants and diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 91a7d073..4a4131c1 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -93,7 +93,7 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ libelf_pic_a_SOURCES = am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) -libelf_so_LDLIBS = +libelf_so_LDLIBS = -lz if USE_LOCKS libelf_so_LDLIBS += -lpthread endif diff --git a/src/ChangeLog b/src/ChangeLog index f9e3b4a5..d6d2936e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2015-10-16 Mark Wielaard <mjw@redhat.com> + * Makefile.am [BUILD_STATIC](libdw): Add -lz. + [BUILD_STATIC](libelf): Likewise. + +2015-10-16 Mark Wielaard <mjw@redhat.com> + * elflint.c (check_symtab): Don't check TLS symbol value against TLS phdr offset in debuginfo files. (check_sections): Don't try to match section offsets to phdrs offsets diff --git a/src/Makefile.am b/src/Makefile.am index 04ae3cbc..e2c494c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,8 +72,8 @@ CLEANFILES += make-debug-archive if BUILD_STATIC libasm = ../libasm/libasm.a -libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl -libelf = ../libelf/libelf.a +libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl +libelf = ../libelf/libelf.a -lz else libasm = ../libasm/libasm.so libdw = ../libdw/libdw.so diff --git a/tests/ChangeLog b/tests/ChangeLog index 1913fbbb..69a25fc6 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,10 @@ 2015-10-16 Mark Wielaard <mjw@redhat.com> + * Makefile.am [BUILD_STATIC] (libdw): Add -lz. + [BUILD_STATIC] (libelf): Likewise. + +2015-10-16 Mark Wielaard <mjw@redhat.com> + * Makefile.am (dwfl_proc_attach_LDFLAGS): Add AM_LDFLAGS. 2015-10-09 Josh Stone <jistone@redhat.com> diff --git a/tests/Makefile.am b/tests/Makefile.am index e04707cd..30cf137c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -353,8 +353,8 @@ libasm = -lasm libebl = -lebl else !STANDALONE if BUILD_STATIC -libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl -libelf = ../libelf/libelf.a +libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl +libelf = ../libelf/libelf.a -lz libasm = ../libasm/libasm.a else libdw = ../libdw/libdw.so |