[libdata-messagepack-stream-perl] 01/01: Use Debian libmsgpack package rather than compiling msgpack source included by upstream.

[Christopher Hoskin]

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

grinorcole-guest pushed a commit to branch master
in repository libdata-messagepack-stream-perl.

commit be92880af07adb0910358efd7d1484b55ca0ed22
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sat Feb 14 21:37:42 2015 +0000

    Use Debian libmsgpack package rather than compiling msgpack source included by upstream.
---
 .gitignore                                |  1 +
 debian/changelog                          |  3 ---
 debian/control                            |  1 +
 debian/patches/series                     |  1 +
 debian/patches/use-packaged-msgpack.patch | 38 +++++++++++++++++++++++++++++++
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/debian/changelog b/debian/changelog
index a6f37d7..d43cab4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,9 +12,6 @@ libdata-messagepack-stream-perl (0.07-1) UNRELEASED; urgency=low
     (and the "yet another ..." part might be improved)
   - (lintian complains about outdated config.{guess,sub} in the msgpack src
     but:)
-  - now the real problem: building a static msgpack library from the embedded
-    source is not the Debianesque way; the package should use (build-depend on)
-    libmsgpack-dev, needs a patch to Makefile.PL at least.
 
   * Initial Release. Closes: #776348
 
diff --git a/debian/control b/debian/control
index 9d74014..2fbe897 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Christopher Hoskin <christopher.hoskin at gmail.com>
 Build-Depends: debhelper (>= 9.20120312~),
  libdata-messagepack-perl,
+ libmsgpack-dev,
  perl (>= 5.11.1)
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libdata-messagepack-stream-perl.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5aefb91
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-packaged-msgpack.patch
diff --git a/debian/patches/use-packaged-msgpack.patch b/debian/patches/use-packaged-msgpack.patch
new file mode 100644
index 0000000..0561904
--- /dev/null
+++ b/debian/patches/use-packaged-msgpack.patch
@@ -0,0 +1,38 @@
+Description: Use packaged msgpack
+ Remove from Makefile.PL the code to build the msgpack source code included in
+ the upstream source. Link to the binary from the libmsgpack package instead.
+Author: Christopher Hoskin <christopher.hoskin at gmail.com>
+Forwarded: not-needed
+Last-Update: 2015-02-14
+
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -30,27 +30,12 @@
+ 
+ use_ppport 3.19;
+ cc_src_paths 'src';
+-cc_include_paths 'msgpack-0.5.7/src';
+ cc_warnings;
+ 
+ test_requires 'Data::MessagePack';
+ 
+-my ($amd64) = qx{ $^X -V } =~ /(amd64|x86_64)/i;
+-my $opt = '--disable-shared';
+-$opt .= ' --with-pic' if $amd64;
++makemaker_args->{LIBS} = '-lmsgpack';
+ 
+-makemaker_args->{MYEXTLIB} = 'msgpack-0.5.7/src/.libs/libmsgpack$(LIB_EXT)';
+-
+-{
+-    package MY;
+-    sub postamble {
+-        <<"__EOF__";
+-\$(MYEXTLIB):
+-	cd msgpack-0.5.7 && ./configure $opt && \$(MAKE)
+-
+-__EOF__
+-    }
+-}
+ 
+ readme_from 'lib/Data/MessagePack/Stream.pm';
+ author_tests 'xt';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdata-messagepack-stream-perl.git