1From 06279f50e924d1d55b43eb3b299f6633ecb1f7a4 Mon Sep 17 00:00:00 2001 2From: Changqing Li <changqing.li@windriver.com> 3Date: Wed, 22 Sep 2021 16:33:10 +0800 4Subject: [PATCH] Makefile.am: update rpath link 5 6since commit 6339062 Move liblttng-ust to 'src/lib/', 7liblttng-ust.so/liblttng-ust-common.so/liblttng-ust-tracepoint.so 8's location changed from one dir to multiple dirs. which make below 9error: 10ld: warning: liblttng-ust-common.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) 11ld: warning: liblttng-ust-tracepoint.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) 12 13Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/61] 14 15Signed-off-by: Changqing Li <changqing.li@windriver.com> 16--- 17 doc/examples/Makefile.am | 2 +- 18 1 file changed, 1 insertions(+), 1 deletions(-) 19 20diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am 21index 8ee0564..20d246c 100644 22--- a/doc/examples/Makefile.am 23+++ b/doc/examples/Makefile.am 24@@ -142,7 +142,7 @@ all-local: 25 CFLAGS='$(CFLAGS)' \ 26 AM_CFLAGS='$(AM_CFLAGS)' \ 27 LDFLAGS="$(LDFLAGS)" \ 28- AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/"' \ 29+ AM_LDFLAGS='$(AM_LDFLAGS) -L../../../src/lib/lttng-ust/.libs -Wl,-rpath="$(PWD)/../../src/lib/lttng-ust/.libs/" -Wl,-rpath-link="$(PWD)/../../src/lib/lttng-ust/.libs/:$(PWD)/../../src/lib/lttng-ust-tracepoint/.libs:$(PWD)/../../src/lib/lttng-ust-common/.libs/"' \ 30 LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ 31 AM_V_P="$(AM_V_P)" \ 32 AM_V_at="$(AM_V_at)" \ 33-- 342.17.1 35 36