r47565 - in /packages/rheolef/trunk/debian: changelog patches/cgal-4-11.patch patches/mpi-autodetect.patch
saramito-guest at users.alioth.debian.org
saramito-guest at users.alioth.debian.org
Tue Nov 14 12:04:22 UTC 2017
Author: saramito-guest
Date: Tue Nov 14 12:04:22 2017
New Revision: 47565
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47565
Log:
patch: gcal-4.11 (closes: #871811)
Modified:
packages/rheolef/trunk/debian/changelog
packages/rheolef/trunk/debian/patches/cgal-4-11.patch
packages/rheolef/trunk/debian/patches/mpi-autodetect.patch
Modified: packages/rheolef/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/changelog?rev=47565&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/changelog (original)
+++ packages/rheolef/trunk/debian/changelog Tue Nov 14 12:04:22 2017
@@ -1,8 +1,8 @@
rheolef (6.7-4) unstable; urgency=low
* patches:
- - cgal-4-11.pach: supports experimental libcgal version >=Â 4.11
- thanks to Joachim Reichel patch (closes: #871811)
+ - cgal-4-11.pach: supports experimental libcgal >=Â 4.11 (closes: #871811)
+ thanks to Joachim Reichel <reichel at debian.org>
- mpi-autodetect.patch: fixes openmpi and libscotch autodetection in
autoconf files
* rules: add -g compilation flag for debug symbols
Modified: packages/rheolef/trunk/debian/patches/cgal-4-11.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/patches/cgal-4-11.patch?rev=47565&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/cgal-4-11.patch (original)
+++ packages/rheolef/trunk/debian/patches/cgal-4-11.patch Tue Nov 14 12:04:22 2017
@@ -16,20 +16,21 @@
// cicumvents debian bug #683975 in boost-1.49 (fixed in boost-1.50 or 1.53)
#ifndef CGAL_HAS_NO_THREADS
-@@ -247,7 +248,11 @@ template < class R >
+@@ -247,7 +248,13 @@ template < class R >
std::ostream &
operator<<(std::ostream &os, const MySegmentC2<R> &s)
{
-- switch(os.iword(CGAL::IO::mode)) {
-+#if CGAL_VERSION_NR >= 1041101000
++#if CGAL_VERSION_NR >= 1041101000
+ switch(CGAL::get_mode(os)) {
++#elif CGAL_VERSION_NR >= 1040801000
++ switch(os.iword(CGAL::IO::get_static_mode())) {
+#else
-+ switch(os.iword(CGAL::IO::get_static_mode())) {
+ switch(os.iword(CGAL::IO::mode)) {
+#endif
case CGAL::IO::ASCII :
return os << s.source() << ' ' << s.target();
case CGAL::IO::BINARY :
-@@ -323,7 +328,7 @@ public:
+@@ -323,7 +330,7 @@ public:
#endif // TO_CLEAN
Point_2
@@ -38,7 +39,7 @@
{ return point_basic<RT>(0, 0); }
Point_2
-@@ -332,6 +337,12 @@ public:
+@@ -332,6 +339,12 @@ public:
return point_basic<RT>(x, y);
}
Modified: packages/rheolef/trunk/debian/patches/mpi-autodetect.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/patches/mpi-autodetect.patch?rev=47565&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/mpi-autodetect.patch (original)
+++ packages/rheolef/trunk/debian/patches/mpi-autodetect.patch Tue Nov 14 12:04:22 2017
@@ -2,15 +2,15 @@
Forwarded: not-yet
Author: Pierre Saramito <pierre.saramito at imag.fr>
Last-Update: 2017-11-10
---- rheolef-6.7-mpi.orig/config/acinclude.m4
-+++ rheolef-6.7-mpi/config/acinclude.m4
+--- a/config/acinclude.m4
++++ b/config/acinclude.m4
@@ -1707,7 +1707,8 @@ AC_DEFUN([RHEO_CHECK_MPI],
if test x"${rheo_have_mpi}" = x"yes"; then
[AC_MSG_CHECKING(for mpi style)]
rheo_recognized_mpi=no
- if test `$MPIRUN --help 2>&1 | grep OpenRTE | wc -l` -ge 1; then
-+ if test `$MPIRUN --allow-run-as-root --help 2>&1 | grep OpenRTE | wc -l` -ge 1 \
-+ || test `$MPIRUN --allow-run-as-root --help 2>&1 | grep -i "open.*mpi" | wc -l` -ge 1; then
++ if test `$MPIRUN --help --allow-run-as-root 2>&1 | grep OpenRTE | wc -l` -ge 1 \
++ || test `$MPIRUN --help --allow-run-as-root 2>&1 | grep -i "open.*mpi" | wc -l` -ge 1; then
rheo_recognized_mpi=openmpi
elif test `$MPIRUN --help 2>&1 | grep 'MPICH1 compat' | wc -l` -ge 1; then
rheo_recognized_mpi=mpich2
@@ -60,3 +60,103 @@
LDADD_SCOTCH="-lscotch -lscotcherrexit"
fi
if test x"${rheo_libdir_scotch}" != x"" -a x"${rheo_libdir_scotch}" != x"/usr/lib"; then
+@@ -2256,9 +2260,9 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_PTSCOTCH
+ [AC_MSG_CHECKING(for mumps compiled with ptscotch support)]
+ [AH_TEMPLATE([HAVE_MUMPS_WITH_PTSCOTCH], Defines if you have mumps with ptscotch support)]
+ PREV_CXXFLAGS=$CXXFLAGS
+- PREV_LDFLAGS=$LDFLAGS
++ PREV_LIBS=$LIBS
+ CXXFLAGS="$CXXFLAGS ${INCLUDES_MUMPS} ${INCLUDES_MPI}"
+- LDFLAGS="$LDFLAGS ${LDADD_MUMPS} ${LDADD_MPI}"
++ LIBS="$LIBS ${LDADD_MUMPS} ${LDADD_MPI}"
+ [AC_TRY_RUN(
+ changequote(%%, %%)dnl
+ %%
+@@ -2314,7 +2318,7 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_PTSCOTCH
+ false
+ )]
+ CXXFLAGS=$PREV_CXXFLAGS
+- LDFLAGS=$PREV_LDFLAGS
++ LIBS=$PREV_LIBS
+ [AC_MSG_RESULT(${rheo_have_mumps_with_ptscotch})]
+ )
+ dnl -----------------------------------------------------------------------------
+@@ -2329,12 +2333,11 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_SCOTCH],
+ [AC_MSG_CHECKING(for mumps compiled with scotch support)]
+ [AH_TEMPLATE([HAVE_MUMPS_WITH_SCOTCH], Defines if you have mumps with scotch support)]
+ PREV_CXXFLAGS=$CXXFLAGS
+- PREV_LDFLAGS=$LDFLAGS
++ PREV_LIBS=$LIBS
+ CXXFLAGS="$CXXFLAGS ${INCLUDES_MUMPS} ${INCLUDES_MPI}"
+- LDFLAGS="$LDFLAGS ${LDADD_MUMPS} ${LDADD_MPI}"
+- [AC_TRY_RUN(
+- changequote(%%, %%)dnl
+- %%
++ LIBS="$LIBS ${LDADD_MUMPS} ${LDADD_MPI}"
++ [AC_RUN_IFELSE(
++ [AC_LANG_SOURCE([[
+ #include <iostream>
+ #include <cmath>
+ #ifdef HAVE_MPI_H
+@@ -2387,16 +2390,12 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_SCOTCH],
+ //cout << "symbolic: ordering effectively used = " << used_ordering<< endl;
+ return (id.infog[7-1] == 3) ? 0 : 1;
+ }
+- %%,
+- changequote([, ])dnl
+- [AC_DEFINE(HAVE_MUMPS_WITH_SCOTCH)]
++ ]])],
+ rheo_have_mumps_with_scotch=yes,
+- rheo_have_mumps_with_scotch=no,
+- rheo_have_mumps_with_scotch=undef
+- false
++ rheo_have_mumps_with_scotch=no
+ )]
+ CXXFLAGS=$PREV_CXXFLAGS
+- LDFLAGS=$PREV_LDFLAGS
++ LIBS=$PREV_LIBS
+ [AC_MSG_RESULT(${rheo_have_mumps_with_scotch})]
+ )
+ dnl -----------------------------------------------------------------------------
+@@ -2411,9 +2410,9 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_PARMETIS
+ [AC_MSG_CHECKING(for mumps compiled with parmetis support)]
+ [AH_TEMPLATE([HAVE_MUMPS_WITH_PARMETIS], Defines if you have mumps with parmetis support)]
+ PREV_CXXFLAGS=$CXXFLAGS
+- PREV_LDFLAGS=$LDFLAGS
++ PREV_LIBS=$LIBS
+ CXXFLAGS="$CXXFLAGS ${INCLUDES_MUMPS} ${INCLUDES_MPI}"
+- LDFLAGS="$LDFLAGS ${LDADD_MUMPS} ${LDADD_MPI}"
++ LIBS="$LIBS ${LDADD_MUMPS} ${LDADD_MPI}"
+ [AC_TRY_RUN(
+ changequote(%%, %%)dnl
+ %%
+@@ -2478,7 +2477,7 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_PARMETIS
+ false
+ )]
+ CXXFLAGS=$PREV_CXXFLAGS
+- LDFLAGS=$PREV_LDFLAGS
++ LIBS=$PREV_LIBS
+ [AC_MSG_RESULT(${rheo_have_mumps_with_parmetis})]
+ )
+ dnl -----------------------------------------------------------------------------
+@@ -2493,9 +2492,9 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_METIS],
+ [AC_MSG_CHECKING(for mumps compiled with metis support)]
+ [AH_TEMPLATE([HAVE_MUMPS_WITH_METIS], Defines if you have mumps with metis support)]
+ PREV_CXXFLAGS=$CXXFLAGS
+- PREV_LDFLAGS=$LDFLAGS
++ PREV_LIBS=$LIBS
+ CXXFLAGS="$CXXFLAGS ${INCLUDES_MUMPS} ${INCLUDES_MPI}"
+- LDFLAGS="$LDFLAGS ${LDADD_MUMPS} ${LDADD_MPI}"
++ LIBS="$LIBS ${LDADD_MUMPS} ${LDADD_MPI}"
+ [AC_TRY_RUN(
+ changequote(%%, %%)dnl
+ %%
+@@ -2560,7 +2559,7 @@ AC_DEFUN([RHEO_CHECK_MUMPS_WITH_METIS],
+ false
+ )]
+ CXXFLAGS=$PREV_CXXFLAGS
+- LDFLAGS=$PREV_LDFLAGS
++ LIBS=$PREV_LIBS
+ [AC_MSG_RESULT(${rheo_have_mumps_with_metis})]
+ )
+ dnl -----------------------------------------------------------------------------
More information about the debian-science-commits
mailing list