From d055e523d3bcbd5e0582a4ac537a168e1044c52c Mon Sep 17 00:00:00 2001
From: Clemens Lang <cal@macports.org>
Date: Sun, 15 Mar 2015 07:21:00 +0100
Subject: 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 ++++
...nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch | 19 +++++++++++++++++++
...mpshad_use-dynamiclib-flag-on-OS-X.full+lite.patch | 19 +++++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 44 insertions(+)
create mode 100644 debian/patches/0074_nxcomp_use-dynamiclib-flag-on-OS-X.full+lite.patch
create mode 100644 debian/patches/0075_nxcompshad_use-dynamiclib-flag-on-OS-X.full+lite.patch
diff --git a/debian/changelog b/debian/changelog
index b6bb7c158..2f24bf25a 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@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 000000000..04369f0d7
--- /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@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 000000000..a75424511
--- /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@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 af1173630..9e2973870 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
--
cgit v1.2.3