[X2Go-Commits] [nx-libs] 01/17: nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. Fixes: #853.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.5.0.x
in repository nx-libs.

commit ca36175735d4ad5d389b3b7797391ff36b1854ba
Author: Bernard Cafarelli <voyageur at gentoo.org>
Date:   Sun Apr 26 20:13:12 2015 +0200

    nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'. Fixes: #853.
    
    v2: generally link to libdl in all of nx-X11. (Mike Gabriel)
    
    Adds:
      - 0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch
---
 debian/changelog                                   |    7 +++++++
 ...nx-X11_fix-underlinking-dlopen-dlsym.full.patch |   17 +++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ac212a8..0534c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,13 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
     Affects:
     - 0990_fix-DEBUG-and-TEST-builds.full.patch
 
+  [ Bernard Cafarelli ]
+  * nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'.
+    Fixes: #853.
+    v2: generally link to libdl in all of nx-X11. (Mike Gabriel)
+    Adds:
+    - 0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch
+
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 17 Mar 2015 19:19:32 +0100
 
 nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low
diff --git a/debian/patches/0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch b/debian/patches/0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch
new file mode 100644
index 0000000..70f0123
--- /dev/null
+++ b/debian/patches/0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch
@@ -0,0 +1,17 @@
+Description: Link to libdl to fix undefined references to 'dlopen' and 'dlsym'.
+Author: Bernard Cafarelli <voyageur at gentoo.org>
+v2: generally link to libdl in all of nx-X11. (Mike Gabriel)
+
+diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl
+index 788733c..be1fa14 100644
+--- a/nx-X11/config/cf/lnxLib.tmpl
++++ b/nx-X11/config/cf/lnxLib.tmpl
+@@ -17,7 +17,7 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+ #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
+ #endif
+ 
+-#define SharedX11Reqs
++#define SharedX11Reqs     $(LDPRELIB) -ldl
+ #define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
+ #define SharedOldXReqs	  $(LDPRELIB) $(XONLYLIB)
+ #define SharedXtReqs	  $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
diff --git a/debian/patches/series b/debian/patches/series
index c6c6b64..f0870d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -78,6 +78,7 @@
 0614_nxcompshad_use-dynamiclib-flag-on-OS-X.full.patch
 0620_nxcompext_use-correct-library-naming-scheme-on-OS-X.full.patch
 0621_nxcompshad_use-correct-library-naming-scheme-on-OS-X.full.patch
+0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch
 0990_fix-DEBUG-and-TEST-builds.full.patch
 0991_fix-hr-typos.full+lite.patch
 0991_fix-hr-typos.full.patch

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git