aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-01-11 10:01:18 +0100
committerMihai Moldovan <ionic@ionic.de>2018-01-11 10:01:22 +0100
commit7c43682e8e7a4f11af08a1b5e80244218adaa52d (patch)
tree1a8b7aa6570e45e4f8d653b778563043ddbf4e13
parent1086c4aa5b4ad65bb51dac1dbab606f14ebaf98b (diff)
downloadnx-libs-7c43682e8e7a4f11af08a1b5e80244218adaa52d.tar.gz
nx-libs-7c43682e8e7a4f11af08a1b5e80244218adaa52d.tar.bz2
nx-libs-7c43682e8e7a4f11af08a1b5e80244218adaa52d.zip
nx-X11/config/cf/{gnu,lnx}Lib.rules: add RPATH entries for temporary nxcomp and nxcompshad libraries.
No change to the actually installed relinked nxagent(-relink) binary that gets installed - only affects the temporary executable build binary.
-rw-r--r--nx-X11/config/cf/gnuLib.rules6
-rw-r--r--nx-X11/config/cf/lnxLib.rules6
2 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/config/cf/gnuLib.rules b/nx-X11/config/cf/gnuLib.rules
index 5dee4280b..0fc808b6e 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,--enable-new-dtags -Wl,-rpath=\$$ORIGIN/$(BUILDLIBDIR)
+#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs
#else
#define RpathLoadFlags /**/
#endif
@@ -69,7 +69,7 @@ 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=\$$ORIGIN/$(BUILDLIBDIR)
+#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs
#endif
#endif
#ifndef ExtraInstallLoadFlags
@@ -77,7 +77,7 @@ XCOMM XXX Maybe superfluous.
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)
+#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs
#endif
#endif
diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules
index 5b89cdd96..3db2181f1 100644
--- a/nx-X11/config/cf/lnxLib.rules
+++ b/nx-X11/config/cf/lnxLib.rules
@@ -51,7 +51,7 @@
# endif
#ifndef RpathLoadFlags
#if UseRpath
-#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath,\$$ORIGIN/$(BUILDLIBDIR)
+#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath,\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs
#else
#define RpathLoadFlags /**/
#endif
@@ -82,7 +82,7 @@
# define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH)
# endif
# else
-# define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,\$$ORIGIN/$(BUILDLIBDIR)
+# define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs
# endif
# else
# define ExtraLoadFlags RpathLoadFlags
@@ -95,7 +95,7 @@
# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH)
# endif
# else
-# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,\$$ORIGIN/$(BUILDLIBDIR)
+# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,\$$ORIGIN/$(BUILDLIBDIR):\$$ORIGIN/../../../nxcomp/src/.libs:\$$ORIGIN/../../../nxcompshad/src/.libs
# endif
# else
# define ExtraInstallLoadFlags RpathInstallLoadFlags