The following commit has been merged in the master branch: commit 6bd11de37640a11aad8886e30227e8676a3efdb4 Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com> Date: Thu Jan 19 09:29:10 2012 +0100
* Some wierd artefacts in the define were breaking ia64 build * Force g++ as the C++ compiler * In some cases, configures were executed in parallel. Disable it. diff --git a/debian/changelog b/debian/changelog index 103d2e8..ab8da0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ hdf5 (1.8.8-3) UNRELEASED; urgency=low * libhdf5-openmpi-7-dbg was build for arch:any while it should be built only on openmpi supported archs + * Some wierd artefacts in the define were breaking ia64 build + * Force g++ as the C++ compiler + * In some cases, configures were executed in parallel. Disable it. -- Sylvestre Ledru <sylves...@debian.org> Wed, 18 Jan 2012 17:50:44 +0100 diff --git a/debian/patches/comment.diff b/debian/patches/comment.diff new file mode 100644 index 0000000..f07b480 --- /dev/null +++ b/debian/patches/comment.diff @@ -0,0 +1,13 @@ +Index: hdf5.git/tools/lib/h5diff.c +=================================================================== +--- hdf5.git.orig/tools/lib/h5diff.c 2011-11-16 11:37:53.586381170 +0100 ++++ hdf5.git/tools/lib/h5diff.c 2012-01-18 22:15:34.655737853 +0100 +@@ -635,7 +635,7 @@ + char filenames[2][MAX_FILENAME]; + hsize_t nfound = 0; + int i; +- //int i1, i2; ++ + int l_ret; + const char * obj1fullname = NULL; + const char * obj2fullname = NULL; diff --git a/debian/patches/series b/debian/patches/series index 81edb28..1ca0af8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ mpi.diff path_max.diff ullong_force.diff - +comment.diff diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff index ab13c0e..baf69ce 100644 --- a/debian/patches/ullong_force.diff +++ b/debian/patches/ullong_force.diff @@ -1,58 +1,52 @@ diff --git a/src/H5Tconv.c b/src/H5Tconv.c -index 927a9dc..b9fe85d 100644 +index 927a9dc..2e2b776 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c -@@ -9537,7 +9537,7 @@ done: +@@ -9537,7 +9537,6 @@ done: * *------------------------------------------------------------------------- */ -#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 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +@@ -9553,7 +9552,6 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value) } -#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ -+//#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ /*------------------------------------------------------------------------- -@@ -9605,7 +9605,7 @@ done: +@@ -9605,7 +9603,6 @@ done: * *------------------------------------------------------------------------- */ -#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, -@@ -9621,7 +9621,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +@@ -9621,7 +9618,6 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value) } -#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ -+//#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ /*------------------------------------------------------------------------- -@@ -9673,7 +9673,7 @@ done: +@@ -9673,7 +9669,6 @@ done: * *------------------------------------------------------------------------- */ -#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, -@@ -9689,7 +9689,7 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, +@@ -9689,7 +9684,6 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, 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 cc60a12..8849899 100755 --- a/debian/rules +++ b/debian/rules @@ -114,7 +114,7 @@ configure-stamp: configure-stamp-debian dh_testdir -mkdir debian/build # configure serial version - cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" FC=gfortran \ + cd debian/build && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" FFLAGS="$(FFLAGS)" CXX=g++ FC=gfortran \ ../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) touch $@ @@ -260,3 +260,6 @@ binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure \ install-doc install-serial install-openmpi install-mpich2 prep + +.NOTPARALLEL: configure: configure-stamp-debian configure-stamp \ + $(configure_stamp_openmpi) configure-stamp-mpich2 -- Hierarchical Data Format 5 (HDF5) _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel