1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-29 02:07:39 +01:00

Missing -llzma in libunwind.pc

liblzuma used in decoding MiniDebuginfo is not listed in
libunwind.pc.

Changes in version 2 of patch:

* Don't check HAVE_LZMA. It is redundant.
* Make liblzma as private libraries in use.

Both are suggested by Mike Frysinger <vapier@gentoo.org>.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
This commit is contained in:
Masatake YAMATO 2013-09-05 19:44:41 +09:00 committed by Arun Sharma
parent af23f0a04b
commit dee708f4bc
3 changed files with 5 additions and 4 deletions

View file

@ -255,19 +255,21 @@ if test x$enable_msabi_support = xyes; then
fi fi
AC_MSG_RESULT([$enable_msabi_support]) AC_MSG_RESULT([$enable_msabi_support])
LIBLZMA=
AC_MSG_CHECKING([whether to support LZMA-compressed symbol tables]) AC_MSG_CHECKING([whether to support LZMA-compressed symbol tables])
AC_ARG_ENABLE(minidebuginfo, AC_ARG_ENABLE(minidebuginfo,
AS_HELP_STRING([--enable-minidebuginfo], [Enables support for LZMA-compressed symbol tables]),, [enable_minidebuginfo=auto]) AS_HELP_STRING([--enable-minidebuginfo], [Enables support for LZMA-compressed symbol tables]),, [enable_minidebuginfo=auto])
AC_MSG_RESULT([$enable_minidebuginfo]) AC_MSG_RESULT([$enable_minidebuginfo])
if test x$enable_minidebuginfo != xno; then if test x$enable_minidebuginfo != xno; then
AC_CHECK_LIB([lzma], [lzma_mf_is_supported], AC_CHECK_LIB([lzma], [lzma_mf_is_supported],
[AC_SUBST([LIBLZMA], [-lzma]) [LIBLZMA=-llzma
AC_DEFINE([HAVE_LZMA], [1], [Define if you have liblzma]) AC_DEFINE([HAVE_LZMA], [1], [Define if you have liblzma])
enable_minidebuginfo=yes], enable_minidebuginfo=yes],
[if test x$enable_minidebuginfo = xyes; then [if test x$enable_minidebuginfo = xyes; then
AC_MSG_FAILURE([liblzma not found]) AC_MSG_FAILURE([liblzma not found])
fi]) fi])
fi fi
AC_SUBST([LIBLZMA])
AM_CONDITIONAL(HAVE_LZMA, test x$enable_minidebuginfo = xyes) AM_CONDITIONAL(HAVE_LZMA, test x$enable_minidebuginfo = xyes)
LIBUNWIND___THREAD LIBUNWIND___THREAD

View file

@ -611,9 +611,7 @@ endif
libunwind_la_LDFLAGS = $(COMMON_SO_LDFLAGS) -XCClinker -nostdlib \ libunwind_la_LDFLAGS = $(COMMON_SO_LDFLAGS) -XCClinker -nostdlib \
$(LDFLAGS_STATIC_LIBCXA) -version-info $(SOVERSION) $(LDFLAGS_STATIC_LIBCXA) -version-info $(SOVERSION)
libunwind_la_LIBADD += -lc $(LIBCRTS) libunwind_la_LIBADD += -lc $(LIBCRTS)
if HAVE_LZMA libunwind_la_LIBADD += $(LIBLZMA)
libunwind_la_LIBADD += -llzma
endif
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I. AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/tdep-$(arch) -I.
AM_CCASFLAGS = $(AM_CPPFLAGS) AM_CCASFLAGS = $(AM_CPPFLAGS)

View file

@ -7,4 +7,5 @@ Name: libunwind
Description: libunwind base library Description: libunwind base library
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lunwind Libs: -L${libdir} -lunwind
Libs.private: @LIBLZMA@
Cflags: -I${includedir} Cflags: -I${includedir}