| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 1 | From 63070df4b0dc7af37a720915b5e6494204463c9a Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 15 Aug 2017 17:10:57 +0800 |
| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 4 | Subject: [PATCH] dso link change |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | This patch makes the link to the dependencies of libdw explicit, as |
| 9 | recent ld no longer implicitly links them. See |
| 10 | http://lists.fedoraproject.org/pipermail/devel/2010-March/133601.html |
| 11 | as a similar example of the error message you can encounter without this |
| 12 | patch, and https://fedoraproject.org/wiki/UnderstandingDSOLinkChange and |
| 13 | https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking for |
| 14 | more details. |
| 15 | |
| 16 | Rebase to 0.170 |
| 17 | |
| 18 | Signed-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 | |
| 24 | diff --git a/src/Makefile.am b/src/Makefile.am |
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 25 | index 1d592d4..853eda4 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 26 | --- a/src/Makefile.am |
| 27 | +++ b/src/Makefile.am |
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 28 | @@ -50,7 +50,7 @@ libdebuginfod = |
| 29 | endif |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 |
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 35 | if LIBDEBUGINFOD |
| 36 | libdebuginfod = ../debuginfod/libdebuginfod.so |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 37 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 38 | index 9141074..ee49d07 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 39 | --- a/tests/Makefile.am |
| 40 | +++ b/tests/Makefile.am |
| Patrick Williams | b58112e | 2024-03-07 11:16:36 -0600 | [diff] [blame] | 41 | @@ -694,7 +694,7 @@ libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread |
| 42 | libelf = ../libelf/libelf.a -lz $(zstd_LIBS) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 |