[hdf5] 08/26: Refresh patches
Gilles Filippini
pini at debian.org
Sun Jan 24 15:33:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master-1.10
in repository hdf5.
commit fdb9b48e853c328cdde9436563064bc10a9493a4
Author: Gilles Filippini <pini at debian.org>
Date: Sat Jan 23 15:18:25 2016 +0100
Refresh patches
---
debian/patches/flavor-configure-option.patch | 113 +++++++++++++++------------
debian/patches/hurd-sigsetjmp.patch | 4 +-
debian/patches/path_max.diff | 4 +-
debian/patches/relax-version-check.patch | 2 +-
debian/patches/ullong_force.diff | 4 +-
5 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/debian/patches/flavor-configure-option.patch b/debian/patches/flavor-configure-option.patch
index a998516..4ffe9b2 100644
--- a/debian/patches/flavor-configure-option.patch
+++ b/debian/patches/flavor-configure-option.patch
@@ -10,7 +10,7 @@ Index: hdf5/configure.ac
===================================================================
--- hdf5.orig/configure.ac
+++ hdf5/configure.ac
-@@ -2933,6 +2933,24 @@ fi
+@@ -3055,6 +3055,24 @@ fi
##
AM_CONDITIONAL([HAVE_SHARED_CONDITIONAL], [test "X$enable_shared" = "Xyes"])
@@ -71,9 +71,24 @@ Index: hdf5/src/Makefile.am
-libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
+libhdf5 at FLAVOR@_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
H5A.c H5Abtree2.c H5Adense.c H5Adeprec.c H5Aint.c H5Atest.c \
- H5AC.c H5B.c H5Bcache.c H5Bdbg.c \
- H5B2.c H5B2cache.c H5B2dbg.c H5B2hdr.c H5B2int.c H5B2stat.c H5B2test.c \
-@@ -120,7 +120,9 @@ include_HEADERS = hdf5.h H5api_adpt.h H5
+ H5AC.c H5AClog.c \
+ H5B.c H5Bcache.c H5Bdbg.c \
+@@ -115,12 +115,12 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5
+
+ # Only compile parallel sources if necessary
+ if BUILD_PARALLEL_CONDITIONAL
+- libhdf5_la_SOURCES += H5ACmpio.c H5Cmpio.c H5Dmpio.c H5Fmpi.c H5FDmpi.c H5FDmpio.c H5Smpio.c
++ libhdf5 at FLAVOR@_la_SOURCES += H5ACmpio.c H5Cmpio.c H5Dmpio.c H5Fmpi.c H5FDmpi.c H5FDmpio.c H5Smpio.c
+ endif
+
+ # Only compile the direct VFD if necessary
+ if DIRECT_VFD_CONDITIONAL
+- libhdf5_la_SOURCES += H5FDdirect.c
++ libhdf5 at FLAVOR@_la_SOURCES += H5FDdirect.c
+ endif
+
+ # Public headers
+@@ -139,7 +139,9 @@ include_HEADERS = hdf5.h H5api_adpt.h H5
# install libhdf5.settings in lib directory
settingsdir=$(libdir)
@@ -84,7 +99,7 @@ Index: hdf5/src/Makefile.am
# Number format detection
# The LD_LIBRARY_PATH setting is a kludge.
-@@ -169,7 +171,7 @@ $(top_srcdir)/src/H5overflow.h: $(top_sr
+@@ -188,7 +190,7 @@ $(top_srcdir)/src/H5overflow.h: $(top_sr
# without HDF5 macros.
.PHONY: trace
@@ -320,22 +335,22 @@ Index: hdf5/fortran/src/Makefile.am
+lib_LTLIBRARIES=libhdf5 at FLAVOR@_fortran.la
# Add libtool numbers to the HDF5 Fortran library (from config/lt_vers.am)
--libhdf5_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_fortran_la_LDFLAGS= -version-info $(LT_F_VERS_INTERFACE):$(LT_F_VERS_REVISION):$(LT_F_VERS_AGE) $(AM_LDFLAGS)
+-libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5 at FLAVOR@_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_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,
-@@ -69,7 +69,7 @@ else
+@@ -43,7 +43,7 @@ else
endif
# Source files for the library.
--libhdf5_fortran_la_SOURCES=H5f90global.f90 \
+-libhdf5_fortran_la_SOURCES=H5f90global.F90 \
+libhdf5 at FLAVOR@_fortran_la_SOURCES=H5f90global.f90 \
- H5fortran_types.f90 H5_ff$(F_STATUS).f90 H5_ff.f90 H5Aff.f90 H5Dff.f90 H5Eff.f90 \
- H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 H5Off.f90 H5Pff.f90 H5Rff.f90 H5Sff.f90 \
- H5Tff.f90 H5Zff.f90 \
-@@ -80,7 +80,7 @@ libhdf5_fortran_la_SOURCES=H5f90global.f
- H5Off$(F_STATUS).f90 H5Pff$(F_STATUS).f90 H5Rff$(F_STATUS).f90 H5Tff$(F_STATUS).f90 $(PARALLEL_COND_SRC)
+ H5fortran_types.F90 H5_ff.F90 H5Aff.F90 H5Dff.F90 H5Eff.F90 \
+ H5Fff.F90 H5Gff.F90 H5Iff.F90 H5Lff.F90 H5Off.F90 H5Pff.F90 H5Rff.F90 H5Sff.F90 \
+ H5Tff.F90 H5Zff.F90 H5_gen.f90 \
+@@ -51,7 +51,7 @@ libhdf5_fortran_la_SOURCES=H5f90global.F
+ H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.f90
# HDF5 Fortran library depends on HDF5 Library.
-libhdf5_fortran_la_LIBADD=$(LIBHDF5)
@@ -343,6 +358,29 @@ Index: hdf5/fortran/src/Makefile.am
# h5fc is generated during configure.
# Remove it only when distclean.
+Index: hdf5/config/commence.am
+===================================================================
+--- hdf5.orig/config/commence.am
++++ hdf5/config/commence.am
+@@ -32,14 +32,14 @@ CP=cp
+ RUNEXEC=$(RUNSERIAL)
+
+ # Libraries to link to while building
+-LIBHDF5=$(top_builddir)/src/libhdf5.la
++LIBHDF5=$(top_builddir)/src/libhdf5 at FLAVOR@.la
+ LIBH5TEST=$(top_builddir)/test/libh5test.la
+-LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
++LIBH5F=$(top_builddir)/fortran/src/libhdf5 at FLAVOR@_fortran.la
+ LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
+ LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
+ LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
+-LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
+-LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
++LIBH5_HL=$(top_builddir)/hl/src/libhdf5 at FLAVOR@_hl.la
++LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@hl_fortran.la
+ LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
+
+ # Install directories that automake doesn't know about
Index: hdf5/hl/fortran/src/Makefile.am
===================================================================
--- hdf5.orig/hl/fortran/src/Makefile.am
@@ -355,8 +393,8 @@ Index: hdf5/hl/fortran/src/Makefile.am
+lib_LTLIBRARIES=libhdf5 at FLAVOR@hl_fortran.la
# Add libtool numbers to the HDF5 HL Fortran library (from config/lt_vers.am)
--libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_HL_F_VERS_INTERFACE):$(LT_HL_F_VERS_REVISION):$(LT_HL_F_VERS_AGE) $(AM_LDFLAGS)
+-libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5 at FLAVOR@hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_HL_S_AGE) $(AM_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,
@@ -364,39 +402,16 @@ Index: hdf5/hl/fortran/src/Makefile.am
#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 \
-+libhdf5 at FLAVOR@hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
- H5DSff.f90 H5LTff.f90 H5IMff.f90 H5TBff.f90
+-libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
++libhdf5 at FLAVOR@hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
+ H5DSff.F90 H5LTff.F90 H5TBff.F90 H5IMff.F90 H5LTff_gen.F90 H5TBff_gen.F90
- # HDF5 HL Fortran library depends on HDF5 Library.
+ # HDF5 HL Fortran library depends on HDF5 Library.
-libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
+libhdf5 at FLAVOR@hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
# Fortran module files can have different extensions and different names
# (e.g., different capitalizations) on different platforms. Write rules
-Index: hdf5/config/commence.am
-===================================================================
---- hdf5.orig/config/commence.am
-+++ hdf5/config/commence.am
-@@ -32,14 +32,14 @@ CP=cp
- RUNEXEC=$(RUNSERIAL)
-
- # Libraries to link to while building
--LIBHDF5=$(top_builddir)/src/libhdf5.la
-+LIBHDF5=$(top_builddir)/src/libhdf5 at FLAVOR@.la
- LIBH5TEST=$(top_builddir)/test/libh5test.la
--LIBH5F=$(top_builddir)/fortran/src/libhdf5_fortran.la
-+LIBH5F=$(top_builddir)/fortran/src/libhdf5 at FLAVOR@_fortran.la
- LIBH5FTEST=$(top_builddir)/fortran/test/libh5test_fortran.la
- LIBH5CPP=$(top_builddir)/c++/src/libhdf5_cpp.la
- LIBH5TOOLS=$(top_builddir)/tools/lib/libh5tools.la
--LIBH5_HL=$(top_builddir)/hl/src/libhdf5_hl.la
--LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
-+LIBH5_HL=$(top_builddir)/hl/src/libhdf5 at FLAVOR@_hl.la
-+LIBH5F_HL=$(top_builddir)/hl/fortran/src/libhdf5 at FLAVOR@hl_fortran.la
- LIBH5CPP_HL=$(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
-
- # Install directories that automake doesn't know about
Index: hdf5/hl/src/Makefile.am
===================================================================
--- hdf5.orig/hl/src/Makefile.am
@@ -409,16 +424,16 @@ Index: hdf5/hl/src/Makefile.am
+lib_LTLIBRARIES=libhdf5 at FLAVOR@_hl.la
# Add libtool numbers to the HDF5 hl library (from config/lt_vers.am)
--libhdf5_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS)
-+libhdf5 at FLAVOR@_hl_la_LDFLAGS= -version-info $(LT_HL_VERS_INTERFACE):$(LT_HL_VERS_REVISION):$(LT_HL_VERS_AGE) $(AM_LDFLAGS)
+-libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
++libhdf5 at FLAVOR@_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS)
# List sources to include in the HDF5 HL Library.
--libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c
-+libhdf5 at FLAVOR@_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c
+-libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c H5LD.c
++libhdf5 at FLAVOR@_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c H5LD.c
- # HDF5 HL library depends on HDF5 Library.
+ # HDF5 HL library depends on HDF5 Library.
-libhdf5_hl_la_LIBADD=$(LIBHDF5)
+libhdf5 at FLAVOR@_hl_la_LIBADD=$(LIBHDF5)
# Public header files (to be installed)
- include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h
+ include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h H5LDpublic.h
diff --git a/debian/patches/hurd-sigsetjmp.patch b/debian/patches/hurd-sigsetjmp.patch
index 3e5fe29..6d226e2 100644
--- a/debian/patches/hurd-sigsetjmp.patch
+++ b/debian/patches/hurd-sigsetjmp.patch
@@ -8,8 +8,8 @@ Index: hdf5/configure.ac
===================================================================
--- hdf5.orig/configure.ac
+++ hdf5/configure.ac
-@@ -1597,6 +1597,7 @@ AC_CHECK_FUNCS([alarm clock_gettime diff
- AC_CHECK_FUNCS([gethostname getpwuid getrusage gettimeofday])
+@@ -1750,6 +1750,7 @@ AC_CHECK_FUNCS([alarm clock_gettime diff
+ AC_CHECK_FUNCS([frexpl gethostname getpwuid getrusage gettimeofday])
AC_CHECK_FUNCS([lstat rand_r random setsysinfo])
AC_CHECK_FUNCS([signal longjmp setjmp siglongjmp sigsetjmp sigprocmask])
+AC_CHECK_FUNCS([siglongjmp],[AC_DEFINE([HAVE_SIGSETJMP])])
diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index 5e96da3..8718a4a 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -9,7 +9,7 @@ Index: hdf5/src/H5Fint.c
===================================================================
--- hdf5.orig/src/H5Fint.c
+++ hdf5/src/H5Fint.c
-@@ -1580,7 +1580,6 @@ H5F_build_actual_name(const H5F_t *f, co
+@@ -1739,7 +1739,6 @@ H5F_build_actual_name(const H5F_t *f, co
int *fd; /* POSIX I/O file descriptor */
h5_stat_t st; /* Stat info from stat() call */
h5_stat_t fst; /* Stat info from fstat() call */
@@ -17,7 +17,7 @@ Index: hdf5/src/H5Fint.c
hbool_t want_posix_fd; /* Flag for retrieving file descriptor from VFD */
/* Perform a sanity check that the file or link wasn't switched
-@@ -1617,12 +1616,8 @@ H5F_build_actual_name(const H5F_t *f, co
+@@ -1776,12 +1775,8 @@ H5F_build_actual_name(const H5F_t *f, co
HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "files' st_ino or st_dev fields changed!")
/* Get the resolved path for the file name */
diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch
index c273535..37a80c3 100644
--- a/debian/patches/relax-version-check.patch
+++ b/debian/patches/relax-version-check.patch
@@ -10,7 +10,7 @@ Index: hdf5/src/H5.c
===================================================================
--- hdf5.orig/src/H5.c
+++ hdf5/src/H5.c
-@@ -725,8 +725,7 @@ H5check_version(unsigned majnum, unsigne
+@@ -767,8 +767,7 @@ H5check_version(unsigned majnum, unsigne
disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
}
diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff
index 282d50e..c72dc2b 100644
--- a/debian/patches/ullong_force.diff
+++ b/debian/patches/ullong_force.diff
@@ -4,7 +4,7 @@ Index: hdf5/src/H5Tconv.c
===================================================================
--- hdf5.orig/src/H5Tconv.c
+++ hdf5/src/H5Tconv.c
-@@ -7981,7 +7981,6 @@ H5T__conv_ullong_double (hid_t src_id, h
+@@ -8017,7 +8017,6 @@ H5T__conv_ullong_double (hid_t src_id, h
*
*-------------------------------------------------------------------------
*/
@@ -12,7 +12,7 @@ Index: hdf5/src/H5Tconv.c
herr_t
H5T__conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride,
-@@ -7990,7 +7989,6 @@ H5T__conv_ullong_ldouble (hid_t src_id,
+@@ -8026,7 +8025,6 @@ H5T__conv_ullong_ldouble (hid_t src_id,
{
H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git
More information about the Pkg-grass-devel
mailing list