1*4882a593SmuzhiyunFrom 06279f50e924d1d55b43eb3b299f6633ecb1f7a4 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Changqing Li <changqing.li@windriver.com> 3*4882a593SmuzhiyunDate: Wed, 22 Sep 2021 16:33:10 +0800 4*4882a593SmuzhiyunSubject: [PATCH] Makefile.am: update rpath link 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunsince commit 6339062 Move liblttng-ust to 'src/lib/', 7*4882a593Smuzhiyunliblttng-ust.so/liblttng-ust-common.so/liblttng-ust-tracepoint.so 8*4882a593Smuzhiyun's location changed from one dir to multiple dirs. which make below 9*4882a593Smuzhiyunerror: 10*4882a593Smuzhiyunld: warning: liblttng-ust-common.so.1, needed by ../../../src/lib/lttng-ust/.libs/liblttng-ust.so, not found (try using -rpath or -rpath-link) 11*4882a593Smuzhiyunld: 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*4882a593Smuzhiyun 13*4882a593SmuzhiyunUpstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/61] 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Changqing Li <changqing.li@windriver.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun doc/examples/Makefile.am | 2 +- 18*4882a593Smuzhiyun 1 file changed, 1 insertions(+), 1 deletions(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am 21*4882a593Smuzhiyunindex 8ee0564..20d246c 100644 22*4882a593Smuzhiyun--- a/doc/examples/Makefile.am 23*4882a593Smuzhiyun+++ b/doc/examples/Makefile.am 24*4882a593Smuzhiyun@@ -142,7 +142,7 @@ all-local: 25*4882a593Smuzhiyun CFLAGS='$(CFLAGS)' \ 26*4882a593Smuzhiyun AM_CFLAGS='$(AM_CFLAGS)' \ 27*4882a593Smuzhiyun LDFLAGS="$(LDFLAGS)" \ 28*4882a593Smuzhiyun- 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*4882a593Smuzhiyun+ 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*4882a593Smuzhiyun LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ 31*4882a593Smuzhiyun AM_V_P="$(AM_V_P)" \ 32*4882a593Smuzhiyun AM_V_at="$(AM_V_at)" \ 33*4882a593Smuzhiyun-- 34*4882a593Smuzhiyun2.17.1 35*4882a593Smuzhiyun 36