[med-svn] [Git][med-team/ncbi-vdb][master] Similar means as dor libkdf5 for libdiagnose

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ncbi-vdb


Commits:
88005853 by Andreas Tille at 2018-08-29T06:51:48Z
Similar means as dor libkdf5 for libdiagnose

- - - - -


1 changed file:

- debian/patches/fix_linking.patch


Changes:

=====================================
debian/patches/fix_linking.patch
=====================================
@@ -24,14 +24,23 @@
  	$(LD) --slib --vers $(SRCDIR)/libncbi-vdb.vers -o $@ $(VDB_LIB)
 --- a/build/ld.linux.dlib.sh
 +++ b/build/ld.linux.dlib.sh
-@@ -286,6 +292,12 @@ then
+@@ -286,6 +286,21 @@ then
      CMD="$CMD -lm"
  fi
  
 +# kdf5 lib needs extra libraries at the **end** of the linker line
 +if pwd | grep -q "libs/hdf5$" ; then
-+    echo "Try to add extra libs to LDFLAGS ... unfortunately this fails as well"
-+    echo CMD="$CMD -lkproc -lkfs -lkdb -lkns -lkfg"
++    echo "Try to add extra libs to LDFLAGS for libkdf5"
++    CMD="$CMD -lkfs -lkq -lkproc -lkdb -lkns -lkfg -lksproc -lmbedx509 -lmbedtls -lmbedcrypto -lz"
++fi
++
++# diagnose lib needs extra libraries at the **end** of the linker line
++if pwd | grep -q "libs/diagnose$" ; then
++    echo "Try to add extra libs to LDFLAGS for libdiagnose"
++    echo "FIXME: May be this should rather be a substitution of CMD since -lmbedx509 -lmbedtls -lmbedcrypto and others are now duplicated."
++    echo "       The end of the option string should be:"
++    echo "  .../dbg/ilib -lbz2 -lm -lvfs -lkfg -lkfs -lkfg -lvfs -lkq  -lkns  -lmbedx509 -lmbedtls -lmbedcrypto -lkproc -lz -ldl -lkrypto -lklib -lkfs -lascp -lksproc -lpthread"
++    CMD="$CMD -lvfs -lkfg -lkfs -lkfg -lvfs -lkq -lkns -lmbedx509 -lmbedtls -lmbedcrypto -lkproc -lz -ldl -lkrypto -lklib -lkfs -lascp -lksproc -lpthread"
 +fi
 +
  # produce shared library



View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/commit/8800585355ba19a73a500e03458ee799694188aa

-- 
View it on GitLab: https://salsa.debian.org/med-team/ncbi-vdb/commit/8800585355ba19a73a500e03458ee799694188aa
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180829/4171bd4f/attachment.html>