[med-svn] [sra-sdk] 01/03: Fix build problem (thanks to Gert Wollny <gw.fossdev at gmail.com> for the patch)

[Andreas Tille]

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

tille pushed a commit to branch master
in repository sra-sdk.

commit c04cf0e977a7539c7c7f72764a3f0975f7dfcc0d
Author: Andreas Tille <tille at debian.org>
Date:   Tue Oct 22 20:29:25 2013 +0200

    Fix build problem (thanks to Gert Wollny <gw.fossdev at gmail.com> for the patch)
---
 debian/changelog                                   |    2 ++
 debian/patches/build-with-system-libbz2-libz.patch |   36 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5072ad4..52e964b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ sra-sdk (2.3.3-4~dfsg-1) UNRELEASED; urgency=low
      - libsra-schema seems to be not built any more in this version so
        drop the special handling of it
   * debian/doc: USAGE is not provided by upstream any more
+  * debian/patches/build-with-system-libbz2-libz.patch: Fix build problem
+    (thanks to Gert Wollny <gw.fossdev at gmail.com> for the patch)
 
  -- Andreas Tille <tille at debian.org>  Tue, 13 Aug 2013 11:04:25 +0200
 
diff --git a/debian/patches/build-with-system-libbz2-libz.patch b/debian/patches/build-with-system-libbz2-libz.patch
new file mode 100644
index 0000000..0477ae7
--- /dev/null
+++ b/debian/patches/build-with-system-libbz2-libz.patch
@@ -0,0 +1,36 @@
+Author: Gert Wollny <gw.fossdev at gmail.com>
+LastChanged: Tue, 22 Oct 2013 00:15:19 +0200
+Description: Fix issue when trying to build against Debian packaged
+             libbz2
+
+diff --git a/libs/ncbi-vdb/Makefile b/libs/ncbi-vdb/Makefile
+index 7b08def..a9c1618 100644
+--- a/libs/ncbi-vdb/Makefile
++++ b/libs/ncbi-vdb/Makefile
+@@ -88,7 +88,6 @@ endif
+ 
+ VDB_LIB_CMN = \
+ 	align-access \
+-	bz2 \
+ 	kfg \
+ 	kfs \
+ 	klib \
+@@ -98,8 +97,7 @@ VDB_LIB_CMN = \
+ 	ksrch \
+ 	$(LIBKXML) \
+ 	kurl \
+-	vfs \
+-	z
++	vfs
+ 
+ VDB_LIB_RD = \
+ 	$(VDB_LIB_CMN) \
+@@ -116,7 +114,7 @@ VDB_OBJ = \
+ 	$(addprefix $(ILIBDIR)/lib,$(addsuffix .a,$(VDB_LIB_RD)))
+ 
+ VDB_LIB = \
+-	$(addprefix -s,$(VDB_LIB_RD))
++	$(addprefix -s,$(VDB_LIB_RD)) -lbz2 -lz
+ 
+ $(LIBDIR)/libncbi-vdb.$(SHLX): $(VDB_OBJ)
+ 	$(LD) --dlib --vers $(SRCDIR) -o $@ $(VDB_LIB)
diff --git a/debian/patches/series b/debian/patches/series
index 2d5a674..8bbe9de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 do_not_build_external_libs.patch
 10_portability.patch
+build-with-system-libbz2-libz.patch

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/sra-sdk.git