Skip to content

N
nx-libs
Commit 7c43682e authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

nx-X11/config/cf/{gnu,lnx}Lib.rules: add RPATH entries for temporary nxcomp and…

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.
parent 1086c4aa
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
nx-X11/config/cf/gnuLib.rules
View file @ 7c43682e
...@@ -40,7 +40,7 @@ XCOMM XXX To rpath or not to rpath... ...@@ -40,7 +40,7 @@ XCOMM XXX To rpath or not to rpath...
#endif #endif
#ifndef RpathLoadFlags #ifndef RpathLoadFlags
#if UseRpath #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 #else
#define RpathLoadFlags /**/ #define RpathLoadFlags /**/
#endif #endif
...@@ -69,7 +69,7 @@ XCOMM XXX To rpath or not to rpath... ...@@ -69,7 +69,7 @@ XCOMM XXX To rpath or not to rpath...
XCOMM XXX Maybe superfluous. XCOMM XXX Maybe superfluous.
#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH)
#else #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
#endif #endif
#ifndef ExtraInstallLoadFlags #ifndef ExtraInstallLoadFlags
...@@ -77,7 +77,7 @@ XCOMM XXX Maybe superfluous. ...@@ -77,7 +77,7 @@ XCOMM XXX Maybe superfluous.
XCOMM XXX Maybe superfluous. XCOMM XXX Maybe superfluous.
#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) #define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH)
#else #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
#endif #endif
......
nx-X11/config/cf/lnxLib.rules
View file @ 7c43682e
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
# endif # endif
#ifndef RpathLoadFlags #ifndef RpathLoadFlags
#if UseRpath #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 #else
#define RpathLoadFlags /**/ #define RpathLoadFlags /**/
#endif #endif
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
# define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH) # define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH)
# endif # endif
# else # 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
# else # else
# define ExtraLoadFlags RpathLoadFlags # define ExtraLoadFlags RpathLoadFlags
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH) # define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH)
# endif # endif
# else # 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
# else # else
# define ExtraInstallLoadFlags RpathInstallLoadFlags # define ExtraInstallLoadFlags RpathInstallLoadFlags
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment