[Debian-ha-commits] [sbd] 01/01: Apply ld-as-needed.patch (Closes: #842886)

[Adrian Vondendriesch]

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

discostu-guest pushed a commit to branch master
in repository sbd.

commit b31eb6bdf9a060c360237ff6c3cf6b5bee91739a
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Mon Jan 16 18:09:03 2017 +0100

    Apply ld-as-needed.patch (Closes: #842886)
---
 debian/changelog                  |  7 +++++++
 debian/patches/ld-as-needed.patch | 15 +++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2aca73c..3616e81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sbd (1.2.0-109-gc511b06-3) UNRELEASED; urgency=medium
+
+  * debian/patches/ld-as-needed.patch: Use LDADD instead of LDFLAGS to fix
+    FTBFS with ld --as-needed (Closes: 842886).
+
+ -- Adrian Vondendriesch <adrian.vondendriesch at credativ.de>  Mon, 16 Jan 2017 18:10:17 +0100
+
 sbd (1.2.0-109-gc511b06-2) unstable; urgency=medium
 
   * patch: fix compiling failure regarding format-security.
diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
new file mode 100644
index 0000000..5854d79
--- /dev/null
+++ b/debian/patches/ld-as-needed.patch
@@ -0,0 +1,15 @@
+Description: use LDADD instead of LDFLAGS to fix FTBFS with ld --as-needed
+Author: Logan Rosen <logan at ubuntu.com>
+Bug: https://github.com/ClusterLabs/sbd/pull/9
+Last-Update: 2016-05-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,5 +11,5 @@
+ sbd_SOURCES += sbd-md.c
+ endif
+ 
+-sbd_LDFLAGS = $(glib_LIBS) $(libcoroipcc_LIBS)
++sbd_LDADD = $(glib_LIBS) $(libcoroipcc_LIBS)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2d174c3..028178a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 sbd.service.in-kill-path
 sbd-service_sysconfig-vs-default.patch
 cl_log-format-security.patch
+ld-as-needed.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/sbd.git