Package: cadaver
Followup-For: Bug #720800
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
Dear Maintainer,
In Ubuntu 14.04, the attached patch was applied to achieve the following:
* Adjusted lib linking order to resolve FTBFS with --as-needed;
- Also removed d/rules addition for -lgcrypt based on above change.
Because Ubuntu uses ld --as-needed by default, the change made in the
current sid version still FTBFS in Ubuntu 14.04. The above change made
in the current Ubuntu version successfully builds in both jessie and
Ubuntu 14.04.
This patch may contain extraneous metadata; if so, kindly please
disregard those portions. Thanks for considering the patch!
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.8.0-33-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u cadaver-0.23.3/debian/patches/00list cadaver-0.23.3/debian/patches/00list
--- cadaver-0.23.3/debian/patches/00list
+++ cadaver-0.23.3/debian/patches/00list
@@ -1,2 +1,3 @@
manpage_hyphen.dpatch
+as-needed-ftbfs.dpatch
diff -u cadaver-0.23.3/debian/rules cadaver-0.23.3/debian/rules
--- cadaver-0.23.3/debian/rules
+++ cadaver-0.23.3/debian/rules
@@ -36,7 +36,7 @@
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
--enable-warnings --enable-netrc --with-ssl=gnutls \
- CFLAGS="$(CFLAGS)" LIBS="-lgcrypt"
+ CFLAGS="$(CFLAGS)"
build: build-arch build-indep
only in patch2:
unchanged:
--- cadaver-0.23.3.orig/debian/patches/as-needed-ftbfs.dpatch
+++ cadaver-0.23.3/debian/patches/as-needed-ftbfs.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## as-needed-ftbfs.dpatch by Daniel T Chen <crim...@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS using ld --as-needed, ala Ubuntu 14.04
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cadaver-0.23.3~/Makefile.in cadaver-0.23.3/Makefile.in
+--- cadaver-0.23.3~/Makefile.in 2008-02-11 05:29:53.000000000 -0500
++++ cadaver-0.23.3/Makefile.in 2013-11-26 10:51:16.086890396 -0500
+@@ -34,7 +34,7 @@
+ CFLAGS = @CFLAGS@
+ ALL_CFLAGS = $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@ @NEON_LIBS@
++LIBS = @LIBS@ @NEON_LIBS@ -lgcrypt
+
+ TARGET = $(PACKAGE)
+ SUBDIRS = lib/neon lib/intl
