Source: exodusii
Version: 6.02.dfsg.1-2
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
Please find attached a patch proposal to fix cmake HDF5 detection when
it isn't installed in the standard path.
This patch fix a FTBFS against hdf5 1.8.13 currently in experimental.
Thanks in advance,
_g.
- -- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBCAAGBQJT19d4AAoJEO/obGx//s+Dj64H/jua+UFRlF3OeSOkfgcsRZN8
Ova8tzGW2bFW+eV8p0lBC3Kw2zug14mCI5kbhHwxzOfAaH+YumiCyf6pneVsq1AS
pwnzq6v45Re/wZHVV1Eb3zempwnLnrix86EJ4woT50fJz6xULy8bONVkqnTEnAYh
oAn2Ti/m+BSyst1IuGepuZUzE0Ka0H4i7XqKac6F1cYddHRVteqUNZy682ty9gQB
asfkqRDghbpAMAAD0eihXz/M2/wAFGCSCMG3KOdRgSuImHMdPKSc6ejdlKEASOdo
yQ2BzPHadSrx30Fm1T6AmRZZyc8RnjGvH8LHHPmEfaTbuDB1VIUJ1stBpKe6wFs=
=yKWn
-----END PGP SIGNATURE-----
diff -Nru exodusii-6.02.dfsg.1/debian/changelog exodusii-6.02.dfsg.1/debian/changelog
--- exodusii-6.02.dfsg.1/debian/changelog 2013-12-17 05:43:40.000000000 +0100
+++ exodusii-6.02.dfsg.1/debian/changelog 2014-07-24 17:41:00.000000000 +0200
@@ -1,3 +1,11 @@
+exodusii (6.02.dfsg.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New patch fix-cmake-hdf5.patch: fix cmake HDF5 detection to support
+ hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <p...@debian.org> Thu, 24 Jul 2014 17:32:27 +0200
+
exodusii (6.02.dfsg.1-2) unstable; urgency=medium
* Add csh, zlib1g-dev and libhdf5-dev to B-D. Closes: #732325.
diff -Nru exodusii-6.02.dfsg.1/debian/patches/fix-cmake-hdf5.patch exodusii-6.02.dfsg.1/debian/patches/fix-cmake-hdf5.patch
--- exodusii-6.02.dfsg.1/debian/patches/fix-cmake-hdf5.patch 1970-01-01 01:00:00.000000000 +0100
+++ exodusii-6.02.dfsg.1/debian/patches/fix-cmake-hdf5.patch 2014-07-24 17:40:18.000000000 +0200
@@ -0,0 +1,118 @@
+Index: exodusii-6.02.dfsg.1/exodus/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/exodus/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
++++ exodusii-6.02.dfsg.1/exodus/CMakeLists.txt 2014-07-24 17:35:52.113595013 +0200
+@@ -38,21 +38,7 @@
+ $ENV{NETCDF_DIR}/ncdump
+ )
+
+-# Hack for HDF5
+-find_library( HDF5_LIBRARY hdf5
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
+-find_library( HDF5HL_LIBRARY hdf5_hl
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
++find_package(HDF5)
+
+ # Check for ZLib, but only if using HDF5.
+ FIND_PACKAGE(ZLIB)
+Index: exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/nemesis/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
++++ exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt 2014-07-24 17:38:03.798020419 +0200
+@@ -34,22 +34,7 @@
+ $ENV{ACCESS}/lib
+ )
+
+-# Hack for HDF5
+-find_library( HDF5_LIBRARY hdf5
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
+-
+-find_library( HDF5HL_LIBRARY hdf5_hl
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
++find_package(HDF5)
+
+ find_library(Z_LIBRARY z
+ /usr/local/zlib/lib
+@@ -73,11 +58,11 @@
+ )
+
+ ADD_LIBRARY(nemesis ${SOURCES})
+-TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
++TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${Z_LIBRARY} ${MATH_LIBRARY})
+ set_target_properties(nemesis PROPERTIES VERSION 3.09.0 SOVERSION 3)
+
+ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
+-TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
++TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${Z_LIBRARY} ${MATH_LIBRARY})
+
+ INSTALL(TARGETS nemesis
+ RUNTIME DESTINATION lib COMPONENT Runtime
+Index: exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/exodus/cbind/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
++++ exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt 2014-07-24 17:40:07.530177780 +0200
+@@ -278,7 +278,7 @@
+
+ ADD_LIBRARY(exoIIv2c ${EXODUS_LIBRARY_TYPE} ${cbind_SRCS})
+
+-TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY} ${ZLIB_LIBRARY})
++TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_C_LIBRARIES} ${HDF5_HL_LIBRARIES} ${ZLIB_LIBRARY})
+
+ IF(MSVC)
+ set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
+Index: exodusii-6.02.dfsg.1/exodus/forbind/CMakeLists.txt
+===================================================================
+--- exodusii-6.02.dfsg.1.orig/exodus/forbind/CMakeLists.txt 2013-12-14 19:32:57.000000000 +0100
++++ exodusii-6.02.dfsg.1/exodus/forbind/CMakeLists.txt 2014-07-24 17:40:15.758454657 +0200
+@@ -24,21 +24,7 @@
+ $ENV{NETCDF_DIR}/ncdump
+ )
+
+-# Hack for HDF5
+-find_library( HDF5_LIBRARY hdf5
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
+-find_library( HDF5HL_LIBRARY hdf5_hl
+- $ENV{ACCESS}/lib/shared
+- $ENV{ACCESS}/lib
+- $ENV{NETCDF_DIR}/lib
+- $ENV{NETCDF_DIR}/libsrc/.libs
+- /usr/local/hdf5/lib
+- )
++find_package(HDF5)
+
+ INCLUDE_DIRECTORIES(
+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
+@@ -53,7 +39,7 @@
+
+ ADD_LIBRARY(exoIIv2for ${EXODUS_LIBRARY_TYPE} ${forbind_SRCS})
+
+-TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY})
++TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_C_LIBRARIES} ${HDF5_HL_LIBRARIES})
+
+ IF(EXODUS_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(exoIIv2for PROPERTIES ${EXODUS_LIBRARY_PROPERTIES})
diff -Nru exodusii-6.02.dfsg.1/debian/patches/series exodusii-6.02.dfsg.1/debian/patches/series
--- exodusii-6.02.dfsg.1/debian/patches/series 2013-12-16 18:39:37.000000000 +0100
+++ exodusii-6.02.dfsg.1/debian/patches/series 2014-07-24 17:32:53.000000000 +0200
@@ -1,2 +1,3 @@
# security_warnings.patch
soversion.patch
+fix-cmake-hdf5.patch
