From ca36175735d4ad5d389b3b7797391ff36b1854ba Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Sun, 26 Apr 2015 20:13:12 +0200 Subject: 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 +++++++ ...0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/0630_nx-X11_fix-underlinking-dlopen-dlsym.full.patch diff --git a/debian/changelog b/debian/changelog index ac212a802..0534c5e91 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 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 000000000..70f012345 --- /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 +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 c6c6b6445..f0870d926 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 -- cgit v1.2.3