[med-svn] [mash] 01/01: fix FTBFS on kfreebsd-amd64

[Sascha Steinbiss]

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

satta pushed a commit to branch master
in repository mash.

commit 563d8cb6f39a4d10779377f041e8c913189cb9f1
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Jul 22 08:22:36 2016 +0000

    fix FTBFS on kfreebsd-amd64
---
 debian/changelog                                    |  8 ++++++++
 debian/patches/link_dynamically_against_capnp.patch | 15 +++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf7028e..7c3fe4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mash (1.1-3) unstable; urgency=medium
+
+  * Link shared external libcapnp and libkj.
+    This fixes an FTBFS on kfreebsd-amd64 (Closes: #832068)
+    Thanks to Aaron M. Ucko for the hint.
+
+ -- Sascha Steinbiss <satta at debian.org>  Fri, 22 Jul 2016 08:17:49 +0000
+
 mash (1.1-2) unstable; urgency=medium
 
   * Drop memcpy wrapper to allow building on more platforms.
diff --git a/debian/patches/link_dynamically_against_capnp.patch b/debian/patches/link_dynamically_against_capnp.patch
new file mode 100644
index 0000000..ce0c6fb
--- /dev/null
+++ b/debian/patches/link_dynamically_against_capnp.patch
@@ -0,0 +1,15 @@
+Description: link dynamically against libcapnp and friends
+Author: Sascha Steinbiss <satta at debian.org>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -31,8 +31,8 @@
+ 
+ all : mash libmash.a
+ 
+-mash : libmash.a
+-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o mash libmash.a @capnp@/lib/libcapnp.a @capnp@/lib/libkj.a @mathlib@ -lstdc++ -lz -lm -lpthread $(LDFLAGS)
++mash : $(OBJECTS)
++	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o mash $(OBJECTS) -lkj -lcapnp @mathlib@ -lstdc++ -lz -lm -lpthread $(LDFLAGS)
+ 
+ libmash.a : $(OBJECTS)
+ 	ar -cr libmash.a $(OBJECTS)
diff --git a/debian/patches/series b/debian/patches/series
index c235a78..6776cfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hardening.patch
 use_debian_mathjax.patch
 drop_memcpy_wrapper.patch
+link_dynamically_against_capnp.patch

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