This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x-rpm-debug in repository nx-libs. from 6cea4ec Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug new effddf8 nx-X11: reintroduce creation of libX11 compat symlinks. new 47d2d33 Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nx-X11/programs/Xserver/Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit effddf8a008260b60ea9c8fe2196c03009c67f37 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 30 00:17:57 2017 +0100 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. --- nx-X11/config/cf/Imake.rules | 23 +++++++++++++++++++++++ nx-X11/programs/Xserver/Imakefile | 2 ++ 2 files changed, 25 insertions(+) diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index 46538a6..8fc344a 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 f6dd115..5d86a53 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. */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit 47d2d33238c3787b92442825094a4a1c6eeaedf8 Merge: 6cea4ec effddf8 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Dec 30 00:29:22 2017 +0100 Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug nx-X11/programs/Xserver/Imakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org