This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository hdf5.
commit 8104dabb2679e6237c55478a315074fd5bef8a5e Author: Gilles Filippini <p...@debian.org> Date: Thu Jul 24 11:48:04 2014 +0200 Don't break the cmake macro FindHDF5.cmake Fix h5cc and co helpers: - search libraries with their legacy names into /usr/lib/$MULTIARCH/hdf5/$flavor/ - insert -I$includedir into the result of the -show option --- debian/changelog | 10 ++ debian/libhdf5-flavor-dev.links.in | 4 + debian/patches/flavor-configure-option.patch | 239 +++++++++++++++++---------- debian/rules | 3 + 4 files changed, 171 insertions(+), 85 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7ee6a8..d943814 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +hdf5 (1.8.13+docs-3) UNRELEASED; urgency=medium + + * Fix h5cc and co helpers so that they don't break the cmake macro + FindHDF5.cmake: + - search libraries with their legacy names into + /usr/lib/$MULTIARCH/hdf5/$flavor/ + - insert -I$includedir into the result of the -show option + + -- Gilles Filippini <p...@debian.org> Thu, 24 Jul 2014 11:39:45 +0200 + hdf5 (1.8.13+docs-2) experimental; urgency=medium * Add lib and include links into /usr/lib/$MULTIARCH/hdf5/$flavor/ diff --git a/debian/libhdf5-flavor-dev.links.in b/debian/libhdf5-flavor-dev.links.in index cadfe92..8092826 100644 --- a/debian/libhdf5-flavor-dev.links.in +++ b/debian/libhdf5-flavor-dev.links.in @@ -2,11 +2,15 @@ usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libh usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_fortran.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_fortran.so usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_hl.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl.so usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@hl_fortran.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5hl_fortran.so +@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_cpp.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_cpp.so +@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_hl_cpp.so usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl_cpp.so usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5.a usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_fortran.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_fortran.a usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@_hl.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl.a usr/lib/@MULTIARCH@/libhdf5@FLAVORLIB@hl_fortran.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5hl_fortran.a +@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_cpp.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_cpp.a +@IFSERIAL@usr/lib/@MULTIARCH@/libhdf5_hl_cpp.a usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/libhdf5_hl_cpp.a usr/include/hdf5/@FLAVOR@ usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/include usr/lib/@MULTIARCH@/hdf5/@FLAVOR@ usr/lib/@MULTIARCH@/hdf5/@FLAVOR@/lib diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch index 0cc5e10..f7bd535 100644 --- a/debian/patches/flavor-configure-option.patch +++ b/debian/patches/flavor-configure-option.patch @@ -6,10 +6,10 @@ Description: Add option --with-flavor=<flavor-name> to configure * serial is built with no flavor name * $mpi parallel versions use --with-flavor=$mpi Author: Gilles Filippini <p...@debian.org> -Index: hdf5-1.8.13+docs/configure.ac +Index: hdf5/configure.ac =================================================================== ---- hdf5-1.8.13+docs.orig/configure.ac -+++ hdf5-1.8.13+docs/configure.ac +--- hdf5.orig/configure.ac ++++ hdf5/configure.ac @@ -4494,6 +4494,24 @@ fi ## AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"]) @@ -35,10 +35,10 @@ Index: hdf5-1.8.13+docs/configure.ac AC_CONFIG_FILES([src/libhdf5.settings Makefile src/Makefile -Index: hdf5-1.8.13+docs/src/libhdf5.settings.in +Index: hdf5/src/libhdf5.settings.in =================================================================== ---- hdf5-1.8.13+docs.orig/src/libhdf5.settings.in -+++ hdf5-1.8.13+docs/src/libhdf5.settings.in +--- hdf5.orig/src/libhdf5.settings.in ++++ hdf5/src/libhdf5.settings.in @@ -12,6 +12,7 @@ General Information: Byte sex: @BYTESEX@ Libraries: @STATIC_SHARED@ @@ -47,10 +47,10 @@ Index: hdf5-1.8.13+docs/src/libhdf5.settings.in Compiling Options: ------------------ -Index: hdf5-1.8.13+docs/src/Makefile.am +Index: hdf5/src/Makefile.am =================================================================== ---- hdf5-1.8.13+docs.orig/src/Makefile.am -+++ hdf5-1.8.13+docs/src/Makefile.am +--- hdf5.orig/src/Makefile.am ++++ hdf5/src/Makefile.am @@ -29,10 +29,10 @@ include $(top_srcdir)/config/lt_vers.am noinst_PROGRAMS = H5detect H5make_libsettings @@ -93,10 +93,10 @@ Index: hdf5-1.8.13+docs/src/Makefile.am @for dep in $? dummy; do \ if test $$dep != "dummy" -a -n "$(PERL)"; then \ case "$$dep" in \ -Index: hdf5-1.8.13+docs/test/testlibinfo.sh.in +Index: hdf5/test/testlibinfo.sh.in =================================================================== ---- hdf5-1.8.13+docs.orig/test/testlibinfo.sh.in -+++ hdf5-1.8.13+docs/test/testlibinfo.sh.in +--- hdf5.orig/test/testlibinfo.sh.in ++++ hdf5/test/testlibinfo.sh.in @@ -79,7 +79,7 @@ fi # built too. if [ -n $Shared_Lib ]; then @@ -118,11 +118,19 @@ Index: hdf5-1.8.13+docs/test/testlibinfo.sh.in fi # Check if executables has the lib information only if shared lib is not -Index: hdf5-1.8.13+docs/tools/misc/h5cc.in +Index: hdf5/tools/misc/h5cc.in =================================================================== ---- hdf5-1.8.13+docs.orig/tools/misc/h5cc.in -+++ hdf5-1.8.13+docs/tools/misc/h5cc.in -@@ -172,7 +172,7 @@ usage() { +--- hdf5.orig/tools/misc/h5cc.in ++++ hdf5/tools/misc/h5cc.in +@@ -29,6 +29,7 @@ + prefix="@prefix@" + exec_prefix="@exec_prefix@" + libdir="@libdir@" ++libdevdir="@libdir@/hdf5/@FLAVOR_NAME@" + includedir="@includedir@" + HL="@HL@" + +@@ -172,7 +173,7 @@ usage() { # libhdf5.settings file reside in the lib directory. showconfigure() { @@ -131,39 +139,59 @@ Index: hdf5-1.8.13+docs/tools/misc/h5cc.in status=$? } -@@ -329,9 +329,9 @@ if test "x$do_link" = "xyes"; then - shared_link="" - # conditionnaly link with the hl library - if test "X$HL" = "Xhl"; then -- libraries=" $libraries -lhdf5_hl -lhdf5 " -+ libraries=" $libraries -lhdf5@FLAVOR@_hl -lhdf5@FLAVOR@ " +@@ -333,7 +334,7 @@ if test "x$do_link" = "xyes"; then else -- libraries=" $libraries -lhdf5 " -+ libraries=" $libraries -lhdf5@FLAVOR@ " + libraries=" $libraries -lhdf5 " fi - link_args="$link_args -L${libdir}" +- link_args="$link_args -L${libdir}" ++ link_args="$link_args -L${libdevdir}" -@@ -361,11 +361,11 @@ if test "x$do_link" = "xyes"; then - new_libraries="" + case "$kind" in + gcc|linux*) +@@ -352,7 +353,7 @@ if test "x$do_link" = "xyes"; then + esac + + if test -n "$flag"; then +- shared_link="${flag}${libdir}" ++ shared_link="${flag}${libdevdir}" + fi + + if test "x$USE_SHARED_LIB" != "xyes"; then +@@ -362,10 +363,10 @@ if test "x$do_link" = "xyes"; then for lib in $libraries; do case "$lib" in -- -lhdf5) + -lhdf5) - new_libraries="$new_libraries ${libdir}/libhdf5.a" -+ -lhdf5@FLAVOR@) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5.a" ;; -- -lhdf5_hl) + -lhdf5_hl) - new_libraries="$new_libraries ${libdir}/libhdf5_hl.a" -+ -lhdf5@FLAVOR@_hl) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@_hl.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5_hl.a" ;; *) new_libraries="$new_libraries $lib" -Index: hdf5-1.8.13+docs/c++/src/h5c++.in +@@ -394,7 +395,7 @@ if test "x$do_link" = "xyes"; then + # paths and libraries from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in + # from the hdf5 build. The order of the flags is intended to give precedence + # to the user's flags. +- $SHOW $CLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link ++ $SHOW $CLINKER -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CFLAGS $CFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link + status=$? + fi + +Index: hdf5/c++/src/h5c++.in =================================================================== ---- hdf5-1.8.13+docs.orig/c++/src/h5c++.in -+++ hdf5-1.8.13+docs/c++/src/h5c++.in -@@ -161,7 +161,7 @@ usage() { +--- hdf5.orig/c++/src/h5c++.in ++++ hdf5/c++/src/h5c++.in +@@ -27,6 +27,7 @@ + prefix="@prefix@" + exec_prefix="@exec_prefix@" + libdir="@libdir@" ++libdevdir="@libdir@/hdf5/@FLAVOR_NAME@" + includedir="@includedir@" + HL="@HL@" + +@@ -161,7 +162,7 @@ usage() { # libhdf5.settings file reside in the lib directory. showconfigure() { @@ -172,27 +200,67 @@ Index: hdf5-1.8.13+docs/c++/src/h5c++.in status=$? } -@@ -347,11 +347,11 @@ if test "x$do_link" = "xyes"; then - new_libraries="" +@@ -319,7 +320,7 @@ if test "x$do_link" = "xyes"; then + else + libraries=" $libraries -lhdf5_cpp -lhdf5 " + fi +- link_args="$link_args -L${libdir}" ++ link_args="$link_args -L${libdevdir}" + + case "$kind" in + gcc|linux*) +@@ -338,7 +339,7 @@ if test "x$do_link" = "xyes"; then + esac + + if test -n "$flag"; then +- shared_link="${flag}${libdir}" ++ shared_link="${flag}${libdevdir}" + fi + + if test "x$USE_SHARED_LIB" != "xyes"; then +@@ -348,16 +349,16 @@ if test "x$do_link" = "xyes"; then for lib in $libraries; do case "$lib" in -- -lhdf5) + -lhdf5) - new_libraries="$new_libraries ${libdir}/libhdf5.a" -+ -lhdf5@FLAVOR@) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5.a" ;; -- -lhdf5_hl) + -lhdf5_hl) - new_libraries="$new_libraries ${libdir}/libhdf5_hl.a" -+ -lhdf5@FLAVOR@_hl) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@_hl.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5_hl.a" ;; -lhdf5_cpp) - new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a" -Index: hdf5-1.8.13+docs/fortran/src/h5fc.in +- new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5_cpp.a" + ;; + -lhdf5_hl_cpp) +- new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5_hl_cpp.a" + ;; + *) + new_libraries="$new_libraries $lib" +@@ -387,7 +388,7 @@ if test "x$do_link" = "xyes"; then + # from the hdf5 build. The order of the flags is intended to give precedence + # to the user's flags. + +- $SHOW $CXXLINKER $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link ++ $SHOW $CXXLINKER -I$includedir $H5BLD_CPPFLAGS $CPPFLAGS $H5BLD_CXXFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $LIBS $link_args $shared_link + + status=$? + fi +Index: hdf5/fortran/src/h5fc.in =================================================================== ---- hdf5-1.8.13+docs.orig/fortran/src/h5fc.in -+++ hdf5-1.8.13+docs/fortran/src/h5fc.in -@@ -156,7 +156,7 @@ usage() { +--- hdf5.orig/fortran/src/h5fc.in ++++ hdf5/fortran/src/h5fc.in +@@ -27,6 +27,7 @@ + prefix="@prefix@" + exec_prefix="@exec_prefix@" + libdir="@libdir@" ++libdevdir="@libdir@/hdf5/@FLAVOR@" + includedir="@includedir@" + HL="@HL@" + +@@ -156,7 +157,7 @@ usage() { # libhdf5.settings file reside in the lib directory. showconfigure() { @@ -201,48 +269,49 @@ Index: hdf5-1.8.13+docs/fortran/src/h5fc.in status=$? } -@@ -302,9 +302,9 @@ if test "x$do_link" = "xyes"; then - shared_link="" - # conditionnaly link with the hl library - if test "X$HL" = "Xhl"; then -- libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 " -+ libraries=" $libraries -lhdf5@FLAVOR@hl_fortran -lhdf5@FLAVOR@_hl -lhdf5@FLAVOR@_fortran -lhdf5@FLAVOR@ " +@@ -306,7 +307,7 @@ if test "x$do_link" = "xyes"; then else -- libraries=" $libraries -lhdf5_fortran -lhdf5 " -+ libraries=" $libraries -lhdf5@FLAVOR@_fortran -lhdf5@FLAVOR@ " + libraries=" $libraries -lhdf5_fortran -lhdf5 " + fi +- link_args="$link_args -L${libdir}" ++ link_args="$link_args -L${libdevdir}" + + case "$host_os" in + linux*) flag="-Wl,-rpath -Wl," ;; +@@ -318,7 +319,7 @@ if test "x$do_link" = "xyes"; then + esac + + if test -n "$flag"; then +- shared_link="${flag}${libdir}" ++ shared_link="${flag}${libdevdir}" fi - link_args="$link_args -L${libdir}" -@@ -327,17 +327,17 @@ if test "x$do_link" = "xyes"; then - new_libraries="" + if test "x$USE_SHARED_LIB" != "xyes"; then +@@ -328,16 +329,16 @@ if test "x$do_link" = "xyes"; then for lib in $libraries; do case "$lib" in -- -lhdf5) + -lhdf5) - new_libraries="$new_libraries ${libdir}/libhdf5.a" -+ -lhdf5@FLAVOR@) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5.a" ;; -- -lhdf5_hl) + -lhdf5_hl) - new_libraries="$new_libraries ${libdir}/libhdf5_hl.a" -+ -lhdf5@FLAVOR@_hl) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@_hl.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5_hl.a" ;; -- -lhdf5_fortran) + -lhdf5_fortran) - new_libraries="$new_libraries ${libdir}/libhdf5_fortran.a" -+ -lhdf5@FLAVOR@_fortran) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@_fortran.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5_fortran.a" ;; -- -lhdf5hl_fortran) + -lhdf5hl_fortran) - new_libraries="$new_libraries ${libdir}/libhdf5hl_fortran.a" -+ -lhdf5@FLAVOR@hl_fortran) -+ new_libraries="$new_libraries ${libdir}/libhdf5@FLAVOR@hl_fortran.a" ++ new_libraries="$new_libraries ${libdevdir}/libhdf5hl_fortran.a" ;; *) new_libraries="$new_libraries $lib" -Index: hdf5-1.8.13+docs/fortran/src/Makefile.am +Index: hdf5/fortran/src/Makefile.am =================================================================== ---- hdf5-1.8.13+docs.orig/fortran/src/Makefile.am -+++ hdf5-1.8.13+docs/fortran/src/Makefile.am +--- hdf5.orig/fortran/src/Makefile.am ++++ hdf5/fortran/src/Makefile.am @@ -29,10 +29,10 @@ AM_FCFLAGS+=-I$(top_srcdir)/src -I$(top_ AM_FCLIBS=$(LIBHDF5) @@ -274,10 +343,10 @@ Index: hdf5-1.8.13+docs/fortran/src/Makefile.am # h5fc is generated during configure. # Remove it only when distclean. -Index: hdf5-1.8.13+docs/hl/src/Makefile.am +Index: hdf5/hl/src/Makefile.am =================================================================== ---- hdf5-1.8.13+docs.orig/hl/src/Makefile.am -+++ hdf5-1.8.13+docs/hl/src/Makefile.am +--- hdf5.orig/hl/src/Makefile.am ++++ hdf5/hl/src/Makefile.am @@ -25,16 +25,16 @@ include $(top_srcdir)/config/lt_vers.am AM_CPPFLAGS+=-I$(top_srcdir)/src @@ -299,10 +368,10 @@ Index: hdf5-1.8.13+docs/hl/src/Makefile.am # Public header files (to be installed) include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h -Index: hdf5-1.8.13+docs/hl/fortran/src/Makefile.am +Index: hdf5/hl/fortran/src/Makefile.am =================================================================== ---- hdf5-1.8.13+docs.orig/hl/fortran/src/Makefile.am -+++ hdf5-1.8.13+docs/hl/fortran/src/Makefile.am +--- hdf5.orig/hl/fortran/src/Makefile.am ++++ hdf5/hl/fortran/src/Makefile.am @@ -27,10 +27,10 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src @@ -330,10 +399,10 @@ Index: hdf5-1.8.13+docs/hl/fortran/src/Makefile.am # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules -Index: hdf5-1.8.13+docs/config/commence.am +Index: hdf5/config/commence.am =================================================================== ---- hdf5-1.8.13+docs.orig/config/commence.am -+++ hdf5-1.8.13+docs/config/commence.am +--- hdf5.orig/config/commence.am ++++ hdf5/config/commence.am @@ -32,14 +32,14 @@ CP=cp RUNEXEC=$(RUNSERIAL) diff --git a/debian/rules b/debian/rules index b1da913..16efde4 100755 --- a/debian/rules +++ b/debian/rules @@ -103,12 +103,14 @@ configure-stamp-debian: debian/control.in flavorpkgstr="" ; \ flavorlibstr="" ; \ ifmpi="#"; \ + ifserial=""; \ if [ "$$flavor" != "serial" ]; then \ if echo "$$helper" | grep -Eq '\-cpp'; then \ continue ; \ fi ; \ flavorpkgstr="-$$flavor" ; \ ifmpi="" ; \ + ifserial="#"; \ fi ; \ flavorlibstr="_$$flavor" ; \ helper=`echo $$helper | sed 's/-flavor/'$$flavorpkgstr'/'` ; \ @@ -116,6 +118,7 @@ configure-stamp-debian: debian/control.in -e 's/@FLAVORPKG@/'$$flavorpkgstr'/g' \ -e 's/@FLAVOR@/'$$flavor'/g' \ -e 's/@IFMPI@/'$$ifmpi'/g' \ + -e 's/@IFSERIAL@/'$$ifserial'/g' \ -e 's/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \ -e 's/@SONAME@/$(soname)/g' \ $$file >$$helper ; \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel