[netcdf] 05/08: Add patch to fix tst_fileinfo linking to libhdf5.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository netcdf.

commit 3463a6a2a38cd2be8dc84df20b6a6cc3a884967f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 14 12:53:52 2016 +0200

    Add patch to fix tst_fileinfo linking to libhdf5.
---
 debian/changelog                            |  1 +
 debian/patches/series                       |  1 +
 debian/patches/tst_fileinfo-link-hdf5.patch | 32 +++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a4201ce..0d1c7f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ netcdf (1:4.4.1~rc2-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Refresh patches.
+  * Add patch to fix tst_fileinfo linking to libhdf5.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 14 May 2016 01:11:10 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 60a8cb7..dac6fb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 link-private.patch
 privacy-breach-logo.patch
 hdf5-library-path.patch
+tst_fileinfo-link-hdf5.patch
diff --git a/debian/patches/tst_fileinfo-link-hdf5.patch b/debian/patches/tst_fileinfo-link-hdf5.patch
new file mode 100644
index 0000000..81bc634
--- /dev/null
+++ b/debian/patches/tst_fileinfo-link-hdf5.patch
@@ -0,0 +1,32 @@
+Description: Fix linking to libhdf5 in addition to libnetcdf.
+ Build failed with:
+  /usr/bin/cc  -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2    -Wl,-z,relro -Wl,-z,now CMakeFiles/tst_fileinfo.dir/tst_fileinfo.c.o  -o tst_fileinfo -rdynamic ../liblib/libnetcdf.so.11.2.0 -Wl,-rpath,"/build/netcdf-4.4.1~rc2/obj-x86_64-linux-gnu/liblib" 
+  /usr/bin/ld: CMakeFiles/tst_fileinfo.dir/tst_fileinfo.c.o: undefined reference to symbol 'H5check_version@@HDF5_SERIAL_1.8.7'
+  //usr/lib/x86_64-linux-gnu/libhdf5_serial.so.10: error adding symbols: DSO missing from command line
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/ncdump/CMakeLists.txt
++++ b/ncdump/CMakeLists.txt
+@@ -62,6 +62,21 @@ IF(ENABLE_TESTS)
+ IF(ENABLE_FILEINFO)
+   ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c)
+   TARGET_LINK_LIBRARIES(tst_fileinfo netcdf)
++  IF(USE_HDF5 OR USE_NETCDF4)
++    # Some version of cmake define HDF5_hdf5_LIBRARY instead of
++    # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES
++    IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES)
++      SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY})
++    ENDIF()
++    IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES)
++      SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY})
++    ENDIF()
++    # The order of the libraries is important here for static
++    # builds:
++    # Make sure that HDF5_C_LIBRARY appears *after*
++    # HDF5_HL_LIBRARY.
++    TARGET_LINK_LIBRARIES(tst_fileinfo ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES})
++  ENDIF()
+   add_sh_test(ncdump tst_fileinfo)
+ ENDIF()
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git