r47562 - in /packages/rheolef/trunk/debian/patches: acinclude.patch cgal-4-11.patch series
saramito-guest at users.alioth.debian.org
saramito-guest at users.alioth.debian.org
Sat Nov 11 09:44:55 UTC 2017
Author: saramito-guest
Date: Sat Nov 11 09:44:55 2017
New Revision: 47562
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47562
Log:
patch: gcal-4.11 (closes: #871811)
Modified:
packages/rheolef/trunk/debian/patches/acinclude.patch
packages/rheolef/trunk/debian/patches/cgal-4-11.patch
packages/rheolef/trunk/debian/patches/series
Modified: packages/rheolef/trunk/debian/patches/acinclude.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/patches/acinclude.patch?rev=47562&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/acinclude.patch (original)
+++ packages/rheolef/trunk/debian/patches/acinclude.patch Sat Nov 11 09:44:55 2017
@@ -3,105 +3,3 @@
Author: Pierre Saramito <pierre.saramito at imag.fr>
Last-Update: 2017-11-10
-
-*** config/acinclude.m4.orig Sat Nov 11 08:08:19 2017
---- config/acinclude.m4 Sat Nov 11 09:07:34 2017
-***************
-*** 1707,1713 ****
- 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
- rheo_recognized_mpi=openmpi
- elif test `$MPIRUN --help 2>&1 | grep 'MPICH1 compat' | wc -l` -ge 1; then
- rheo_recognized_mpi=mpich2
---- 1707,1714 ----
- if test x"${rheo_have_mpi}" = x"yes"; then
- [AC_MSG_CHECKING(for mpi style)]
- rheo_recognized_mpi=no
-! 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
- rheo_recognized_mpi=openmpi
- elif test `$MPIRUN --help 2>&1 | grep 'MPICH1 compat' | wc -l` -ge 1; then
- rheo_recognized_mpi=mpich2
-***************
-*** 1731,1737 ****
- rheo_libdir_mpi="/usr/lib/openmpi/lib"
- fi
- if test x"${rheo_incdir_mpi}" = x""; then
-! rheo_incdir_mpi="/usr/lib/openmpi/include"
- fi
- # add -lmpi_f77 for mumps scalapck and blacs libs (obsolete)
- INCLUDES_MPI="-I${rheo_incdir_mpi}"
---- 1732,1738 ----
- rheo_libdir_mpi="/usr/lib/openmpi/lib"
- fi
- if test x"${rheo_incdir_mpi}" = x""; then
-! rheo_incdir_mpi="/usr/include/openmpi"
- fi
- # add -lmpi_f77 for mumps scalapck and blacs libs (obsolete)
- INCLUDES_MPI="-I${rheo_incdir_mpi}"
-***************
-*** 1911,1928 ****
- rheo_libdir_scotch=""
- for d in ${libpath}; do
- founded=false
- # sequential libs:
- if test -f $d/libscotch.so -a -f $d/libscotcherrexit.so || test -f $d/libscotch.a -a -f $d/libscotcherrexit.a ; then
- founded=true
- fi
- # distributed libs:
-! if $founded && test x"${rheo_have_mpi}" = x"yes"; then
-! if test -f $d/libptscotchparmetis.so -a -f $d/libptscotch.so -a -f $d/libptscotcherrexit.so || test -f $d/libptscotchparmetis.a -a -f $d/libptscotch.a -a -f $d/libptscotcherrexit.a ; then
-! true
-! else
-! founded=true
-! fi
-! fi
- if $founded; then
- rheo_libdir_scotch=$d
- break
---- 1912,1936 ----
- rheo_libdir_scotch=""
- for d in ${libpath}; do
- founded=false
-+ version_suffix=""
- # sequential libs:
- if test -f $d/libscotch.so -a -f $d/libscotcherrexit.so || test -f $d/libscotch.a -a -f $d/libscotcherrexit.a ; then
- founded=true
-+ else
-+ version_suffix="-5.1"; # buggy version with no symlinks in debian/sid (10/11/2017)
-+ if test -f $d/libscotch${version_suffix}.so -a -f $d/libscotcherrexit${version_suffix}.so; then
-+ founded=true
-+ else
-+ version_suffix=""
-+ fi
- fi
- # distributed libs:
-! # note: use only scotch, no more ptscotch in distributed mode (more efficient partitions)
-! ## if $founded && test x"${rheo_have_mpi}" = x"yes"; then
-! ## if test -f $d/libptscotchparmetis.so -a -f $d/libptscotch.so -a -f $d/libptscotcherrexit.so || test -f $d/libptscotchparmetis.a -a -f $d/libptscotch.a -a -f $d/libptscotcherrexit.a ; then
-! ## true
-! ## fi
-! ## fi
- if $founded; then
- rheo_libdir_scotch=$d
- break
-***************
-*** 1936,1942 ****
- INCLUDES_SCOTCH=""
- LDADD_SCOTCH="${rheo_libs_scotch}"
- if test x"${rheo_have_mpi}" != x"yes"; then
-! LDADD_SCOTCH="-lscotch -lscotcherrexit"
- fi
- if test x"${rheo_libdir_scotch}" != x"" -a x"${rheo_libdir_scotch}" != x"/usr/lib"; then
- LDADD_SCOTCH="-L${rheo_libdir_scotch} ${LDADD_SCOTCH}"
---- 1944,1951 ----
- INCLUDES_SCOTCH=""
- LDADD_SCOTCH="${rheo_libs_scotch}"
- if test x"${rheo_have_mpi}" != x"yes"; then
-! # LDADD_SCOTCH="-lscotch -lscotcherrexit"
-! LDADD_SCOTCH="-lscotch${version_suffix} -lscotcherrexit${version_suffix}"
- fi
- if test x"${rheo_libdir_scotch}" != x"" -a x"${rheo_libdir_scotch}" != x"/usr/lib"; then
- LDADD_SCOTCH="-L${rheo_libdir_scotch} ${LDADD_SCOTCH}"
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=47562&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/cgal-4-11.patch (original)
+++ packages/rheolef/trunk/debian/patches/cgal-4-11.patch Sat Nov 11 09:44:55 2017
@@ -5,76 +5,3 @@
Author: Pierre Saramito <pierre.saramito at imag.fr>
Last-Update: 2017-11-10
-*** ./nfem/geo_element/cgal_kernel.h.orig Wed Oct 1 05:04:36 2014
---- ./nfem/geo_element/cgal_kernel.h Sat Nov 11 06:58:29 2017
-***************
-*** 31,37 ****
- // References:
- // https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2010-08/msg00205.html
- // examples/Kernel_23/MyKernel.h
-! //
-
- // cicumvents debian bug #683975 in boost-1.49 (fixed in boost-1.50 or 1.53)
- #ifndef CGAL_HAS_NO_THREADS
---- 31,38 ----
- // References:
- // https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2010-08/msg00205.html
- // examples/Kernel_23/MyKernel.h
-! //
-! // https://doc.cgal.org/latest/Kernel_23/index.html#Section_11.5
-
- // cicumvents debian bug #683975 in boost-1.49 (fixed in boost-1.50 or 1.53)
- #ifndef CGAL_HAS_NO_THREADS
-***************
-*** 247,253 ****
- std::ostream &
- operator<<(std::ostream &os, const MySegmentC2<R> &s)
- {
-! switch(os.iword(CGAL::IO::mode)) {
- case CGAL::IO::ASCII :
- return os << s.source() << ' ' << s.target();
- case CGAL::IO::BINARY :
---- 248,258 ----
- std::ostream &
- operator<<(std::ostream &os, const MySegmentC2<R> &s)
- {
-! #if CGAL_VERSION_NR >= 1041101000
-! switch(CGAL::get_mode(os)) {
-! #else
-! switch(os.iword(CGAL::IO::mode)) {
-! #endif
- case CGAL::IO::ASCII :
- return os << s.source() << ' ' << s.target();
- case CGAL::IO::BINARY :
-***************
-*** 323,329 ****
- #endif // TO_CLEAN
-
- Point_2
-! operator()(CGAL::Origin o) const
- { return point_basic<RT>(0, 0); }
-
- Point_2
---- 328,334 ----
- #endif // TO_CLEAN
-
- Point_2
-! operator()(const CGAL::Origin& o) const
- { return point_basic<RT>(0, 0); }
-
- Point_2
-***************
-*** 332,337 ****
---- 337,348 ----
- return point_basic<RT>(x, y);
- }
-
-+ const Point_2&
-+ operator()(const Point_2 & p) const
-+ {
-+ return p;
-+ }
-+
- Point_2
- operator()(const Line_2& l) const
- {
Modified: packages/rheolef/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/patches/series?rev=47562&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/series (original)
+++ packages/rheolef/trunk/debian/patches/series Sat Nov 11 09:44:55 2017
@@ -1,3 +1,3 @@
+do-not-treat-warnings-as-errors.patch
+cgal-4-11.patch
acinclude.patch
-cgal-4-11.patch
-do-not-treat-warnings-as-errors.patch
More information about the debian-science-commits
mailing list