From 4b153f5b057c0f8bd476883c009a91aaba03575b Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Thu, 28 Dec 2017 23:12:50 +0100
Subject: nx-X11/config/cf/{gnu,lnx}Lib.rules: enable new ELF dtags to force
 RUNPATH creation for nxagent.

---
 nx-X11/config/cf/gnuLib.rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'nx-X11/config/cf/gnuLib.rules')

diff --git a/nx-X11/config/cf/gnuLib.rules b/nx-X11/config/cf/gnuLib.rules
index 7b057c1d0..fe0e82dc0 100644
--- a/nx-X11/config/cf/gnuLib.rules
+++ b/nx-X11/config/cf/gnuLib.rules
@@ -40,7 +40,7 @@ XCOMM XXX To rpath or not to rpath...
 #endif
 #ifndef RpathLoadFlags
 #if UseRpath
-#define RpathLoadFlags -Wl,-rpath=$(USRLIBDIRPATH)
+#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=$(USRLIBDIRPATH)
 #else
 #define RpathLoadFlags /**/
 #endif
@@ -60,9 +60,9 @@ XCOMM XXX To rpath or not to rpath...
 #ifndef ExtraLoadFlags
 #ifdef UseInstalled
 XCOMM XXX Maybe superfluous.
-#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH)
+#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH)
 #else
-#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR)
+#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(BUILDLIBDIR)
 #endif
 #endif
 
-- 
cgit v1.2.3


From ffc09a73d3fad32f3765caf62546a3e7cc5b9cd8 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <ionic@ionic.de>
Date: Fri, 29 Dec 2017 21:44:56 +0100
Subject: nx-X11: build programs with a temporary RPATH/RUNPATH value and a
 relinked version with the system location.

While the install target explicitly installs the relinked
system-location version of a program, we do not actually use this.

Currently, we copy nxagent directly out of the build root.
---
 nx-X11/config/cf/gnuLib.rules | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'nx-X11/config/cf/gnuLib.rules')

diff --git a/nx-X11/config/cf/gnuLib.rules b/nx-X11/config/cf/gnuLib.rules
index fe0e82dc0..5dee4280b 100644
--- a/nx-X11/config/cf/gnuLib.rules
+++ b/nx-X11/config/cf/gnuLib.rules
@@ -40,11 +40,18 @@ XCOMM XXX To rpath or not to rpath...
 #endif
 #ifndef RpathLoadFlags
 #if UseRpath
-#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=$(USRLIBDIRPATH)
+#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=\$$ORIGIN/$(BUILDLIBDIR)
 #else
 #define RpathLoadFlags /**/
 #endif
 #endif
+#ifndef RpathInstallLoadFlags
+#if UseRpath
+#define RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=$(USRLIBDIRPATH)
+#else
+#define RpathInstallLoadFlags /**/
+#endif
+#endif
 #ifndef LibraryRpathLoadFlags
 #define LibraryRpathLoadFlags RpathLoadFlags
 #endif
@@ -62,7 +69,15 @@ XCOMM XXX To rpath or not to rpath...
 XCOMM XXX Maybe superfluous.
 #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH)
 #else
-#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(BUILDLIBDIR)
+#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR)
+#endif
+#endif
+#ifndef ExtraInstallLoadFlags
+#ifdef UseInstalled
+XCOMM XXX Maybe superfluous.
+#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH)
+#else
+#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR)
 #endif
 #endif
 
-- 
cgit v1.2.3