From 63070df4b0dc7af37a720915b5e6494204463c9a Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 15 Aug 2017 17:10:57 +0800 Subject: [PATCH] dso link change Upstream-Status: Pending This patch makes the link to the dependencies of libdw explicit, as recent ld no longer implicitly links them. See http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html as a similar example of the error message you can encounter without this patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for more details. Rebase to 0.170 Signed-off-by: Hongxu Jia --- src/Makefile.am | 2 +- tests/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1d592d4..853eda4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,7 +50,7 @@ libdebuginfod = endif else libasm = ../libasm/libasm.so -libdw = ../libdw/libdw.so +libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl libelf = ../libelf/libelf.so if LIBDEBUGINFOD libdebuginfod = ../debuginfod/libdebuginfod.so diff --git a/tests/Makefile.am b/tests/Makefile.am index 9141074..ee49d07 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -694,7 +694,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread libelf = ../libelf/libelf.a -lz $(zstd_LIBS) libasm = ../libasm/libasm.a else -libdw = ../libdw/libdw.so +libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl libelf = ../libelf/libelf.so libasm = ../libasm/libasm.so endif