[CRIU] [RFC PATCH 08/21] zdtm: specify rpath relative to $ORIGIN

Ivan Shapovalov intelfx at intelfx.name
Fri Feb 19 06:50:31 PST 2016


Signed-off-by: Ivan Shapovalov <intelfx at intelfx.name>
---
 test/zdtm/live/streaming/Makefile  | 2 +-
 test/zdtm/live/transition/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/zdtm/live/streaming/Makefile b/test/zdtm/live/streaming/Makefile
index 6ca1661..f1ab5d4 100644
--- a/test/zdtm/live/streaming/Makefile
+++ b/test/zdtm/live/streaming/Makefile
@@ -5,7 +5,7 @@ LDLIBS	= -lzdtmtst
 override CPPFLAGS += -I$(LIBDIR)
 CFLAGS	= -g -O2 -Wall -Werror -fno-strict-aliasing -fPIC
 CFLAGS	+= $(USERCFLAGS)
-LDFLAGS = -fPIC -pie -rdynamic -L$(LIBDIR) -Wl,-rpath,$(LIBDIR)
+LDFLAGS = -fPIC -pie -rdynamic -L$(LIBDIR) -Wl,-rpath,\$$ORIGIN/$(LIBDIR)
 
 TST_NOFILE	=	\
 		pipe_loop00	\
diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile
index 3a16122..26c84e5 100644
--- a/test/zdtm/live/transition/Makefile
+++ b/test/zdtm/live/transition/Makefile
@@ -5,7 +5,7 @@ LDLIBS	= -lzdtmtst
 override CPPFLAGS += -I$(LIBDIR)
 CFLAGS	= -g -O2 -Wall -Werror -fPIC
 CFLAGS	+= $(USERCFLAGS)
-LDFLAGS = -fPIC -pie -rdynamic -L$(LIBDIR) -Wl,-rpath,$(LIBDIR)
+LDFLAGS = -fPIC -pie -rdynamic -L$(LIBDIR) -Wl,-rpath,\$$ORIGIN/$(LIBDIR)
 
 TST_NOFILE	=	\
 		ipc		\
-- 
2.7.1



More information about the CRIU mailing list