The following commit has been merged in the upstream branch: commit 151b8c54199b06d2dd5b21ce3e3c0a1f8589c864 Author: Sylvestre Ledru <sylvestre.le...@scilab.org> Date: Wed Mar 9 13:48:55 2011 +0100
split in two patches diff --git a/debian/patches/allowthreadsafe.diff b/debian/patches/allowthreadsafe.diff new file mode 100644 index 0000000..33779ee --- /dev/null +++ b/debian/patches/allowthreadsafe.diff @@ -0,0 +1,23 @@ +diff --git a/configure.in b/configure.in +index adfed1f..543a4ed 100644 +--- a/configure.in ++++ b/configure.in +@@ -1876,17 +1876,6 @@ AC_ARG_ENABLE([threadsafe], + [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/autotools.diff b/debian/patches/autotools.diff index bd11f75..f8db3c8 100644 --- a/debian/patches/autotools.diff +++ b/debian/patches/autotools.diff @@ -11668,25 +11668,3 @@ index f7c667d..eef825e 100755 esac ;; esac -diff --git a/configure.in b/configure.in -index adfed1f..543a4ed 100644 ---- a/configure.in -+++ b/configure.in -@@ -1876,17 +1876,6 @@ AC_ARG_ENABLE([threadsafe], - [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 cd8c2f3..70c1730 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ mpi.diff sscanf.diff autotools.diff +allowthreadsafe.diff -- 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