[X2Go-Commits] [nx-libs] 02/03: nxcomp{, shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.

[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 1b1253fc83de4f91c56eb3d755f749ce18f31eab
Author: Clemens Lang <cal at macports.org>
Date:   Sun Mar 15 07:21:00 2015 +0100

    nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
    
    Adds:
      - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
      - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
---
 debian/changelog                                   |    4 ++++
 ...omp_use-dynamiclib-flag-on-OS-X.full+lite.patch |   19 +++++++++++++++++++
 ...had_use-dynamiclib-flag-on-OS-X.full+lite.patch |   19 +++++++++++++++++++
 debian/patches/series                              |    2 ++
 4 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b6bb7c1..2f24bf2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
     - 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
     - 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
     - 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
+  * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
+    Adds:
+    - 0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
+    - 0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
 
  -- X2Go Release Manager <git-admin at x2go.org>  Sun, 15 Mar 2015 00:48:06 +0100
 
diff --git a/debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
new file mode 100644
index 0000000..04369f0
--- /dev/null
+++ b/debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
@@ -0,0 +1,19 @@
+Description: Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
+Author: Clemens Lang <cal at macports.org>
+
+--- a/nxcomp/configure.in
++++ b/nxcomp/configure.in
+@@ -183,11 +183,11 @@ if test "$FreeBSD" = yes; then
+ fi
+ 
+ dnl Under Darwin we don't have support for -soname option and
+-dnl we need the -bundle flag. Under Solaris, instead, we need
++dnl we need the -dynamiclib flag. Under Solaris, instead, we need
+ dnl the options -G -h.
+ 
+ if test "$DARWIN" = yes; then
+-  LDFLAGS="$LDFLAGS -bundle"
++  LDFLAGS="$LDFLAGS -dynamiclib"
+ elif test "$SUN" = yes; then
+   LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
+ else
diff --git a/debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch b/debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
new file mode 100644
index 0000000..a754245
--- /dev/null
+++ b/debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
@@ -0,0 +1,19 @@
+Description: Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
+Author: Clemens Lang <cal at macports.org>
+
+--- a/nxcompshad/configure.in
++++ b/nxcompshad/configure.in
+@@ -175,11 +175,11 @@ if test "$FreeBSD" = yes; then
+ fi
+ 
+ dnl Under Darwin we don't have support for -soname option and
+-dnl we need the -bundle flag. Under Solaris, instead, we need
++dnl we need the -dynamiclib flag. Under Solaris, instead, we need
+ dnl the options -G -h.
+ 
+ if test "$DARWIN" = yes; then
+-  LDFLAGS="$LDFLAGS -bundle"
++  LDFLAGS="$LDFLAGS -dynamiclib"
+ elif test "$SUN" = yes; then
+   LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
+ else
diff --git a/debian/patches/series b/debian/patches/series
index af11736..9e29738 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,6 +36,8 @@
 0071_nxcompext_use-MAKEDEPEND-in-path.full+lite.patch
 0072_nxcompshad_use-MAKEDEPEND-in-path.full+lite.patch
 0073_nxproxy_use-MAKEDEPEND-in-path.full+lite.patch
+0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
+0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
 0101_nxagent_set-rgb-path.full.patch
 0102_xserver-xext_set-securitypolicy-path.full.patch
 0103_nxagent_set-X0-config-path.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