[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

Sylvestre Ledru sylvestre.ledru at scilab.org
Wed Nov 16 10:34:19 UTC 2011


The following commit has been merged in the upstream branch:
commit ea63ba522385499a6c05921f52100fff9c7ce0e6
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Wed Mar 9 13:02:21 2011 +0100

    Frankie request => add the diff generated by the autotools into the repository

diff --git a/debian/patches/allowthreadsafe.diff b/debian/patches/allowthreadsafe.diff
deleted file mode 100644
index f583457..0000000
--- a/debian/patches/allowthreadsafe.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: hdf5-1.8.6/configure.in
-===================================================================
---- hdf5-1.8.6.orig/configure.in	2011-02-24 11:19:42.000000000 +0100
-+++ hdf5-1.8.6/configure.in	2011-02-24 11:19:51.000000000 +0100
-@@ -1876,17 +1876,6 @@
-                               [Enable thread safe capability])],
-               THREADSAFE=$enableval)
- 
--dnl The --enable-threadsafe flag is not compatible with --enable-cxx.
--dnl If the user tried to specify both flags, throw an error.
--if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  AC_MSG_ERROR([--enable-cxx and --enable-threadsafe flags are incompatible])
--fi
--
--dnl --enable-threadsafe is also incompatible with --enable-fortran.
--if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  AC_MSG_ERROR([--enable-fortran and --enable-threadsafe flags are incompatible])
--fi
--
- case "X-$THREADSAFE" in
-   X-|X-no)
-     AC_MSG_RESULT([no])
diff --git a/debian/patches/series b/debian/patches/series
index bf701a0..10b2178 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 mpi.diff
 sscanf.diff
 allowthreadsafe.diff
+autotools.diff
+

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list