Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . hdf5 (1.8.8-7.1) UNRELEASED; urgency=low . * Non-maintainer upload. * Rename parallel libs with a -mpi suffix to not conflict with the serial version. Author: Julien Cristau --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- hdf5-1.8.8.orig/config/commence.am +++ hdf5-1.8.8/config/commence.am @@ -32,6 +32,17 @@ CP=cp RUNEXEC=$(RUNSERIAL) # Libraries to link to while building +if BUILD_PARALLEL_CONDITIONAL +LIBHDF5=$(top_builddir)/src/libhdf5-mpi.la +LIBH5TEST=$(top_builddir)/test/libh5test-mpi.la +LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran-mpi.la +LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran-mpi.la +LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp-mpi.la +LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools-mpi.la +LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl-mpi.la +LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran-mpi.la +LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp-mpi.la +else LIBHDF5=$(top_builddir)/src/libhdf5.la LIBH5TEST=$(top_builddir)/test/libh5test.la LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la @@ -41,6 +52,8 @@ LIBH5TOOLS=$(top_builddir)/tools/lib/lib LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la +endif + # Install directories that automake doesn't know about docdir = $(exec_prefix)/doc --- hdf5-1.8.8.orig/c++/src/Makefile.am +++ hdf5-1.8.8/c++/src/Makefile.am @@ -25,10 +25,15 @@ include $(top_srcdir)/config/lt_vers.am INCLUDES=-I$(top_srcdir)/src # This is our main target +if BUILD_PARALLEL_CONDITIONAL +lib_LTLIBRARIES=libhdf5_cpp-mpi.la +else lib_LTLIBRARIES=libhdf5_cpp.la +endif # Add libtool numbers to the HDF5 C++ library (from config/lt_vers.am) libhdf5_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_cpp_mpi_la_LDFLAGS= $(libhdf5_cpp_la_LDFLAGS) # Shared C++ libraries aren't universally supported. if CXX_SHARED_CONDITIONAL @@ -46,9 +51,11 @@ libhdf5_cpp_la_SOURCES=H5Exception.cpp H H5EnumType.cpp H5IntType.cpp H5FloatType.cpp H5StrType.cpp \ H5ArrayType.cpp H5VarLenType.cpp H5CompType.cpp H5DataSet.cpp \ H5CommonFG.cpp H5Group.cpp H5File.cpp +libhdf5_cpp_mpi_la_SOURCES = $(libhdf5_cpp_la_SOURCES) # HDF5 C++ library depends on HDF5 Library. libhdf5_cpp_la_LIBADD=$(LIBHDF5) +libhdf5_cpp_mpi_la_LIBADD=$(LIBHDF5) # Public headers include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \ --- hdf5-1.8.8.orig/hl/c++/src/Makefile.am +++ hdf5-1.8.8/hl/c++/src/Makefile.am @@ -25,10 +25,15 @@ include $(top_srcdir)/config/lt_vers.am INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src # This is our main target +if BUILD_PARALLEL_CONDITIONAL +lib_LTLIBRARIES=libhdf5_hl_cpp-mpi.la +else lib_LTLIBRARIES=libhdf5_hl_cpp.la +endif # Add libtool numbers to the HDF5 HL C++ library (from config/lt_vers.am) libhdf5_hl_cpp_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_cpp_mpi_la_LDFLAGS = $(libhdf5_hl_cpp_la_LDFLAGS) # Shared C++ libraries aren't universally supported. if CXX_SHARED_CONDITIONAL @@ -39,9 +44,11 @@ endif # Source files for the library # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp +libhdf5_hl_cpp_mpi_la_SOURCES=$(libhdf5_hl_cpp_la_SOURCES) # HDF5 HL C++ library depends on HDF5 HL Library and HDF5 C++ Library. libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP) +libhdf5_hl_cpp_mpi_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP) # Public headers include_HEADERS=H5PacketTable.h --- hdf5-1.8.8.orig/hl/src/Makefile.am +++ hdf5-1.8.8/hl/src/Makefile.am @@ -25,16 +25,23 @@ include $(top_srcdir)/config/lt_vers.am AM_CPPFLAGS+=-I$(top_srcdir)/src # This library is our main target. +if BUILD_PARALLEL_CONDITIONAL +lib_LTLIBRARIES=libhdf5_hl-mpi.la +else lib_LTLIBRARIES=libhdf5_hl.la +endif # Add libtool numbers to the HDF5 HL library (from config/lt_vers.am) libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_hl_mpi_la_LDFLAGS= $(libhdf5_hl_la_LDFLAGS) # List sources to include in the HDF5 HL Library. libhdf5_hl_la_SOURCES=H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c +libhdf5_hl_mpi_la_SOURCES=$(libhdf5_hl_la_SOURCES) # HDF5 HL library depends on HDF5 Library. libhdf5_hl_la_LIBADD=$(LIBHDF5) +libhdf5_hl_mpi_la_LIBADD=$(LIBHDF5) # Public header files (to be installed) include_HEADERS=hdf5_hl.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h --- hdf5-1.8.8.orig/hl/fortran/src/Makefile.am +++ hdf5-1.8.8/hl/fortran/src/Makefile.am @@ -27,10 +27,15 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_src AM_FCFLAGS+=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src # Our main target, the high-level fortran library +if BUILD_PARALLEL_CONDITIONAL +lib_LTLIBRARIES=libhdf5hl_fortran-mpi.la +else lib_LTLIBRARIES=libhdf5hl_fortran.la +endif # Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am) libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5hl_fortran_mpi_la_LDFLAGS = $(libhdf5hl_fortran_la_LDFLAGS) # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, @@ -48,9 +53,11 @@ endif # List sources to include in the HDF5 HL Fortran library. libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \ H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90 +libhdf5hl_fortran_mpi_la_SOURCES=$(libhdf5hl_fortran_la_SOURCES) # HDF5 HL Fortran library depends on HDF5 HL Library and HDF5 Fortran Library. libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F) +libhdf5hl_fortran_mpi_la_LIBADD=$(LIBH5_HL) $(LIBH5F) # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules --- hdf5-1.8.8.orig/src/Makefile.am +++ hdf5-1.8.8/src/Makefile.am @@ -30,10 +30,15 @@ noinst_PROGRAMS = H5detect H5make_libset H5detect_CFLAGS = -g $(AM_CFLAGS) # Our main target, the HDF5 library +if BUILD_PARALLEL_CONDITIONAL +lib_LTLIBRARIES=libhdf5-mpi.la +else lib_LTLIBRARIES=libhdf5.la +endif # Add libtool numbers to the HDF5 library (from config/lt_vers.am) libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_mpi_la_LDFLAGS= $(libhdf5_la_LDFLAGS) # H5Tinit.c and H5lib_settings.c are generated files and should be cleaned. MOSTLYCLEANFILES=H5Tinit.c H5lib_settings.c @@ -103,6 +108,8 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5 H5Zdeflate.c H5Zfletcher32.c H5Znbit.c H5Zshuffle.c H5Zszip.c \ H5Zscaleoffset.c H5Ztrans.c +libhdf5_mpi_la_SOURCES = $(libhdf5_la_SOURCES) + # Public headers include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5version.h \ --- hdf5-1.8.8.orig/fortran/src/Makefile.am +++ hdf5-1.8.8/fortran/src/Makefile.am @@ -29,10 +29,15 @@ AM_FCFLAGS+=-I$(top_srcdir)/src -I$(top_ AM_FCLIBS=$(LIBHDF5) # This is our main target, the fortran library +if BUILD_PARALLEL_CONDITIONAL +lib_LTLIBRARIES=libhdf5_fortran-mpi.la +else lib_LTLIBRARIES=libhdf5_fortran.la +endif # Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am) libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) +libhdf5_fortran_mpi_la_LDFLAGS = $(libhdf5_fortran_la_LDFLAGS) # Some Fortran compilers can't build shared libraries, so sometimes we # want to build a shared C library and a static Fortran library. If so, @@ -79,8 +84,11 @@ libhdf5_fortran_la_SOURCES=H5f90global.f H5Aff$(F_STATUS).f90 H5Dff$(F_STATUS).f90 H5Eff$(F_STATUS).f90 H5Lff$(F_STATUS).f90 \ H5Off$(F_STATUS).f90 H5Pff$(F_STATUS).f90 H5Rff$(F_STATUS).f90 H5Tff$(F_STATUS).f90 $(PARALLEL_COND_SRC) +libhdf5_fortran_mpi_la_SOURCES = $(libhdf5_fortran_la_SOURCES) + # HDF5 Fortran library depends on HDF5 Library. libhdf5_fortran_la_LIBADD=$(LIBHDF5) +libhdf5_fortran_mpi_la_LIBADD=$(LIBHDF5) # h5fc is generated during configure. # Remove it only when distclean.