[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-85-g33d5233
Sylvestre Ledru
sylvestre.ledru at scilab.org
Fri Nov 18 14:32:41 UTC 2011
The following commit has been merged in the master branch:
commit 33d5233bfde4de893bbdca2296e29f2769afb22b
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date: Fri Nov 18 15:32:00 2011 +0100
force the ullong conversion anywhere
diff --git a/debian/libhdf5-7.symbols b/debian/libhdf5-7.symbols
index 386fa26..1fee059 100644
--- a/debian/libhdf5-7.symbols
+++ b/debian/libhdf5-7.symbols
@@ -1997,7 +1997,7 @@ libhdf5.so.7 libhdf5-7 #MINVER#
H5T_conv_ldouble_short at Base 1.8.7
H5T_conv_ldouble_uchar at Base 1.8.7
H5T_conv_ldouble_uint at Base 1.8.7
- (arch=!powerpc)H5T_conv_ldouble_ullong at Base 1.8.7
+ H5T_conv_ldouble_ullong at Base 1.8.7
H5T_conv_ldouble_ulong at Base 1.8.7
H5T_conv_ldouble_ushort at Base 1.8.7
H5T_conv_llong_double at Base 1.8.7
@@ -2517,8 +2517,10 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
_ZN2H518PropListIExceptionD0Ev at Base 1.8.7
_ZN2H518PropListIExceptionD1Ev at Base 1.8.7
_ZN2H518PropListIExceptionD2Ev at Base 1.8.7
+ _ZN2H518ReferenceExceptionC1ERKS0_ at Base 1.8.8-1~exp1
_ZN2H518ReferenceExceptionC1ERKSsS2_ at Base 1.8.7
_ZN2H518ReferenceExceptionC1Ev at Base 1.8.7
+ _ZN2H518ReferenceExceptionC2ERKS0_ at Base 1.8.8-1~exp1
_ZN2H518ReferenceExceptionC2ERKSsS2_ at Base 1.8.7
_ZN2H518ReferenceExceptionC2Ev at Base 1.8.7
_ZN2H518ReferenceExceptionD0Ev at Base 1.8.7
@@ -2559,8 +2561,10 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
_ZN2H519DataSpaceIExceptionD0Ev at Base 1.8.7
_ZN2H519DataSpaceIExceptionD1Ev at Base 1.8.7
_ZN2H519DataSpaceIExceptionD2Ev at Base 1.8.7
+ _ZN2H520IdComponentExceptionC1ERKS0_ at Base 1.8.8-1~exp1
_ZN2H520IdComponentExceptionC1ERKSsS2_ at Base 1.8.7
_ZN2H520IdComponentExceptionC1Ev at Base 1.8.7
+ _ZN2H520IdComponentExceptionC2ERKS0_ at Base 1.8.8-1~exp1
_ZN2H520IdComponentExceptionC2ERKSsS2_ at Base 1.8.7
_ZN2H520IdComponentExceptionC2Ev at Base 1.8.7
_ZN2H520IdComponentExceptionD0Ev at Base 1.8.7
@@ -3385,6 +3389,7 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
(arch=!i386 !kfreebsd-i386 !hurd-i386 !armel !mips !mipsel !powerpc)_ZNK2H59FloatType9getFieldsERmS1_S1_S1_S1_ at Base 1.8.7
(arch=!amd64 !kfreebsd-amd64 !s390)_ZNK2H59FloatType9setFieldsEjjjjj at Base 1.8.7
(arch=!i386 !kfreebsd-i386 !hurd-i386 !armel !mips !mipsel !powerpc)_ZNK2H59FloatType9setFieldsEmmmmm at Base 1.8.7
+ _ZSteqIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_ at Base 1.8.8-1~exp1
_ZTIN2H510AbstractDsE at Base 1.8.7
_ZTIN2H510VarLenTypeE at Base 1.8.7
_ZTIN2H511IdComponentE at Base 1.8.7
@@ -4723,7 +4728,9 @@ libhdf5_hl_cpp.so.7 libhdf5-7 #MINVER#
_ZN11PacketTable8GetIndexERi at Base 1.8.7
_ZN11PacketTable8SetIndexEy at Base 1.8.7
_ZN11PacketTableC1EiPc at Base 1.8.7
+ _ZN11PacketTableC1Ev at Base 1.8.8-1~exp1
_ZN11PacketTableC2EiPc at Base 1.8.7
+ _ZN11PacketTableC2Ev at Base 1.8.8-1~exp1
_ZN11PacketTableD1Ev at Base 1.8.7
_ZN11PacketTableD2Ev at Base 1.8.7
_ZN14FL_PacketTable10GetPacketsEyyPv at Base 1.8.7
diff --git a/debian/libhdf5-mpich2-7.symbols b/debian/libhdf5-mpich2-7.symbols
index 675b3f9..fcf419a 100644
--- a/debian/libhdf5-mpich2-7.symbols
+++ b/debian/libhdf5-mpich2-7.symbols
@@ -2036,7 +2036,7 @@ libhdf5.so.7 libhdf5-mpich2-7 #MINVER#
H5T_conv_ldouble_short at Base 1.8.7
H5T_conv_ldouble_uchar at Base 1.8.7
H5T_conv_ldouble_uint at Base 1.8.7
- (arch=!powerpc)H5T_conv_ldouble_ullong at Base 1.8.7
+ H5T_conv_ldouble_ullong at Base 1.8.7
H5T_conv_ldouble_ulong at Base 1.8.7
H5T_conv_ldouble_ushort at Base 1.8.7
H5T_conv_llong_double at Base 1.8.7
diff --git a/debian/libhdf5-openmpi-7.symbols b/debian/libhdf5-openmpi-7.symbols
index c838432..62cc18b 100644
--- a/debian/libhdf5-openmpi-7.symbols
+++ b/debian/libhdf5-openmpi-7.symbols
@@ -2036,7 +2036,7 @@ libhdf5.so.7 libhdf5-openmpi-7 #MINVER#
H5T_conv_ldouble_short at Base 1.8.7
H5T_conv_ldouble_uchar at Base 1.8.7
H5T_conv_ldouble_uint at Base 1.8.7
- (arch=!powerpc)H5T_conv_ldouble_ullong at Base 1.8.7
+ H5T_conv_ldouble_ullong at Base 1.8.7
H5T_conv_ldouble_ulong at Base 1.8.7
H5T_conv_ldouble_ushort at Base 1.8.7
H5T_conv_llong_double at Base 1.8.7
diff --git a/debian/patches/series b/debian/patches/series
index c363e5c..6ceccb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
mpi.diff
path_max.diff
+ullong_force.diff
diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff
new file mode 100644
index 0000000..df87117
--- /dev/null
+++ b/debian/patches/ullong_force.diff
@@ -0,0 +1,60 @@
+Index: hdf5.git/src/H5Tconv.c
+===================================================================
+--- hdf5.git.orig/src/H5Tconv.c 2011-11-18 14:42:37.711729984 +0100
++++ hdf5.git/src/H5Tconv.c 2011-11-18 15:07:49.687771586 +0100
+@@ -9537,7 +9537,7 @@
+ *
+ *-------------------------------------------------------------------------
+ */
+-#if H5T_CONV_INTERNAL_FP_ULLONG
++//#if H5T_CONV_INTERNAL_FP_ULLONG
+ herr_t
+ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ size_t nelmts, size_t buf_stride,
+@@ -9553,7 +9553,7 @@
+ done:
+ FUNC_LEAVE_NOAPI(ret_value)
+ }
+-#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
++//#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
+
+
+ /*-------------------------------------------------------------------------
+@@ -9605,9 +9605,7 @@
+ *
+ *-------------------------------------------------------------------------
+ */
+-#error "ICI____________________________________________________________"
+-
+-#if H5T_CONV_INTERNAL_FP_ULLONG
++//#if H5T_CONV_INTERNAL_FP_ULLONG
+ herr_t
+ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ size_t nelmts, size_t buf_stride,
+@@ -9623,7 +9621,7 @@
+ done:
+ FUNC_LEAVE_NOAPI(ret_value)
+ }
+-#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
++//#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
+
+
+ /*-------------------------------------------------------------------------
+@@ -9675,7 +9673,7 @@
+ *
+ *-------------------------------------------------------------------------
+ */
+-#if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
++//#if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
+ herr_t
+ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
+ size_t nelmts, size_t buf_stride,
+@@ -9691,7 +9689,7 @@
+ done:
+ FUNC_LEAVE_NOAPI(ret_value)
+ }
+-#endif /*H5T_CONV_INTERNAL_LDOUBLE_ULLONG*/
++//#endif /*H5T_CONV_INTERNAL_LDOUBLE_ULLONG*/
+
+
+ /*-------------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 330f368..0ce55d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
# (c) 2001 Brian Russo, under GPL.
# (c) 2003 Josselin Mouette
# (c) 2007-2009 Francesco P. Lovergine.
+# (c) 2010-2011 Sylvestre Ledru
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
--
Hierarchical Data Format 5 (HDF5)
More information about the Pkg-grass-devel
mailing list