aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-30 00:17:57 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-30 03:36:11 +0100
commitecaa13ce6817282c1b9a3a75a2c022876834be83 (patch)
treed28cc8442517b959238539cd21dd782be877192e
parent3d17c665b23ad1bdefade873bec7273efb53aa99 (diff)
downloadnx-libs-ecaa13ce6817282c1b9a3a75a2c022876834be83.tar.gz
nx-libs-ecaa13ce6817282c1b9a3a75a2c022876834be83.tar.bz2
nx-libs-ecaa13ce6817282c1b9a3a75a2c022876834be83.zip
nx-X11: reintroduce creation of libX11 compat symlinks.
We need this to be able to execute the resulting nxagent binary from within the build directory.
-rw-r--r--nx-X11/config/cf/Imake.rules23
-rw-r--r--nx-X11/programs/Xserver/Imakefile2
2 files changed, 25 insertions, 0 deletions
diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules
index 46538a683..8fc344ac5 100644
--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@ -58,6 +58,7 @@ XCOMM ---------------------------------------------------------------------
* ComplexProgramTarget_3 (program,locallib,syslib)
* ServerTargetWithFlags (server,subdirs,objects,libs,syslibs,flags)
* ServerTarget (server,subdirs,objects,libs,syslibs)
+ * LibX11Links ()
* MoveToBakFile (file)
* RMoveToBakFile (file)
* RanLibrary (args)
@@ -1150,6 +1151,28 @@ clean:: @@\
ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_))
#endif /* ServerTarget */
+
+/*
+ * Creates libX11 compat symlinks to enable execution of rpath-dependent
+ * programs.
+ */
+#ifndef LibX11Links
+#define LibX11Links() @@\
+AllTarget(libX11links) @@\
+libX11links: @@\
+ $(LN) libNX_X11.so $(BUILDLIBDIR)/libX11.so @@\
+ $(LN) libNX_X11.so.6 $(BUILDLIBDIR)/libX11.so.6 @@\
+ $(LN) libNX_X11.so.6.3.0 $(BUILDLIBDIR)/libX11.so.6.3.0 @@\
+ touch libX11links @@\
+ @@\
+clean:: @@\
+ RemoveFile($(BUILDLIBDIR)/libX11.so) @@\
+ RemoveFile($(BUILDLIBDIR)/libX11.so.6) @@\
+ RemoveFile($(BUILDLIBDIR)/libX11.so.6.3.0) @@\
+ RemoveFile(libX11links)
+#endif /* LibX11Links */
+
+
#if DoRanlibCmd
#define RanLibrary(args) $(RANLIB) args
#else
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index f6dd11521..5d86a534d 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -391,6 +391,8 @@ NX_XSHADOWLIBNAME = libXcompshad.so
ServerTarget(nxagent,$(NXAGENTDIRS),$(NXAGENTOBJS), \
$(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS),$(NXAGENTNXLIBS) $(NXAGENTSYSLIBS) $(NXCOMPEXTSYSLIBS))
+LibX11Links()
+
/*
* Hard coded target to build a static nxagent server.
*/