[med-svn] [ncbi-vdb] 01/05: Make sure libraries are properly linked with libmbed

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ncbi-vdb.

commit 53c9411d0eef0c6e70e803047a6ebd19f2a7e4e9
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 25 12:40:13 2016 +0100

    Make sure libraries are properly linked with libmbed
---
 debian/changelog                                  |  7 +++
 debian/patches/use_debian_packaged_libmbedx.patch | 54 +++++++++++++++++++++++
 debian/rules                                      |  3 ++
 3 files changed, 64 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7792e31..924c5ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ncbi-vdb (2.8.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Make sure libraries are properly linked with libmbed
+    Closes: #844900
+
+ -- Andreas Tille <tille at debian.org>  Fri, 25 Nov 2016 12:39:03 +0100
+
 ncbi-vdb (2.8.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/use_debian_packaged_libmbedx.patch b/debian/patches/use_debian_packaged_libmbedx.patch
index bca8613..942579f 100644
--- a/debian/patches/use_debian_packaged_libmbedx.patch
+++ b/debian/patches/use_debian_packaged_libmbedx.patch
@@ -15,3 +15,57 @@ Description: Somehow Build system expects a copy of libmbedx509.a which is
  	kns          \
  	kfg          \
  	krypto       \
+@@ -127,7 +124,7 @@ VDB_LIB = \
+ 
+ $(LIBDIR)/libncbi-vdb.$(SHLX): $(VDB_OBJ)
+ 	echo $(SRCDIR)
+-	$(LD) --dlib --vers $(SRCDIR)/libncbi-vdb.vers -o $@ $(VDB_LIB)
++	$(LD) --dlib --vers $(SRCDIR)/libncbi-vdb.vers -o $@ $(VDB_LIB) -lmbedx509 -lmbedtls -lmbedcrypto
+ 
+ $(LIBDIR)/libncbi-vdb.$(LIBX): $(VDB_OBJ)
+ 	$(LD) --slib --vers $(SRCDIR)/libncbi-vdb.vers -o $@ $(VDB_LIB)
+--- a/libs/kns/Makefile
++++ b/libs/kns/Makefile
+@@ -105,7 +105,8 @@ KNS_OBJ = \
+ 
+ KNS_LIB = \
+     -lkfs \
+-	-dklib
++	-dklib \
++	-lmbedx509 -lmbedtls -lmbedcrypto
+ 
+ $(ILIBDIR)/libkns.$(LIBX): $(KNS_OBJ)
+ 	$(LD) --slib -o $@ $^ $(KNS_LIB)
+--- a/libs/kns/tls-priv.h
++++ b/libs/kns/tls-priv.h
+@@ -37,7 +37,7 @@
+ #include MBEDTLS_CONFIG_FILE 
+ #endif
+ 
+-#include <mbedtls/net.h>
++#include <mbedtls/net_sockets.h>
+ #include <mbedtls/debug.h>
+ #include <mbedtls/ssl.h>
+ #include <mbedtls/aes.h>
+--- a/libs/kns/tls.c
++++ b/libs/kns/tls.c
+@@ -58,7 +58,7 @@ struct KTLSStream;
+ #include MBEDTLS_CONFIG_FILE 
+ #endif
+ 
+-#include <mbedtls/net.h>
++#include <mbedtls/net_sockets.h>
+ #include <mbedtls/debug.h>
+ #include <mbedtls/ssl.h>
+ #include <mbedtls/aes.h>
+--- a/libs/hdf5/Makefile
++++ b/libs/hdf5/Makefile
+@@ -112,7 +112,7 @@ ifdef HDF5_LIBDIR
+ endif
+ 
+ $(LIBDIR)/libkdf5.$(SHLX): $(KDF5_OBJ)
+-	$(LD) --dlib --vers $(SRCDIR)/../ncbi-vdb/libncbi-vdb.vers -o $@ $^ $(KDF5_LIB)
++	$(LD) --dlib --vers $(SRCDIR)/../ncbi-vdb/libncbi-vdb.vers -o $@ $^ $(KDF5_LIB) -lmbedx509 -lmbedtls -lmbedcrypto
+ 
+ $(LIBDIR)/libkdf5.$(LIBX): $(KDF5_OBJ)
+ 	$(LD) --slib --vers $(SRCDIR)/../ncbi-vdb/libncbi-vdb.vers -o $@ $^ $(KDF5_LIB)
diff --git a/debian/rules b/debian/rules
index 3aa46c0..4005d21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,9 @@ override_dh_auto_install:
 		    --multiarch \
 		    --devunversioned \
 		    --exclude-la \
+		    --override s/libmbedcrypto0-dev/libmbedtls-dev/ \
+		    --override s/libmbedtls10-dev/libmbedtls-dev/ \
+		    --override s/libmbedx509-0-dev/libmbedtls-dev/ \
 		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/lib/libncbi-ngs-c++.a usr/lib/$(BUILDTYPE) \
 		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp.a usr/lib/$(BUILDTYPE) \
 		    --movedev debian/tmp/usr/$(DEBPKGNAME)/$(OS)/gcc/*/dbg/ilib/libkapp-norsrc.a usr/lib/$(BUILDTYPE) \

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