1From 63070df4b0dc7af37a720915b5e6494204463c9a Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:10:57 +0800
4Subject: [PATCH] dso link change
5
6Upstream-Status: Pending
7
8This patch makes the link to the dependencies of libdw explicit, as
9recent ld no longer implicitly links them. See
10http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html
11as a similar example of the error message you can encounter without this
12patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and
13https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for
14more details.
15
16Rebase to 0.170
17
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19---
20 src/Makefile.am   | 2 +-
21 tests/Makefile.am | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/src/Makefile.am b/src/Makefile.am
25index 1d592d4..853eda4 100644
26--- a/src/Makefile.am
27+++ b/src/Makefile.am
28@@ -50,7 +50,7 @@ libdebuginfod =
29 endif
30 else
31 libasm = ../libasm/libasm.so
32-libdw = ../libdw/libdw.so
33+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
34 libelf = ../libelf/libelf.so
35 if LIBDEBUGINFOD
36 libdebuginfod = ../debuginfod/libdebuginfod.so
37diff --git a/tests/Makefile.am b/tests/Makefile.am
38index 9141074..ee49d07 100644
39--- a/tests/Makefile.am
40+++ b/tests/Makefile.am
41@@ -694,7 +694,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
42 libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
43 libasm = ../libasm/libasm.a
44 else
45-libdw = ../libdw/libdw.so
46+libdw = ../libdw/libdw.so $(zip_LIBS) $(libelf) $(libebl) -ldl
47 libelf = ../libelf/libelf.so
48 libasm = ../libasm/libasm.so
49 endif
50