r47561 - in /packages/rheolef/trunk/debian/patches: acinclude.patch cgal-4-11.patch
saramito-guest at users.alioth.debian.org
saramito-guest at users.alioth.debian.org
Sat Nov 11 09:36:59 UTC 2017
Author: saramito-guest
Date: Sat Nov 11 09:36:59 2017
New Revision: 47561
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47561
Log:
patch: gcal-4.11 (closes: #871811)
Modified:
packages/rheolef/trunk/debian/patches/acinclude.patch
packages/rheolef/trunk/debian/patches/cgal-4-11.patch
Modified: packages/rheolef/trunk/debian/patches/acinclude.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/patches/acinclude.patch?rev=47561&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/acinclude.patch (original)
+++ packages/rheolef/trunk/debian/patches/acinclude.patch Sat Nov 11 09:36:59 2017
@@ -1,39 +1,107 @@
-1710c1710,1711
-< 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
-1734c1735
-< rheo_incdir_mpi="/usr/lib/openmpi/include"
----
-> rheo_incdir_mpi="/usr/include/openmpi"
-1913a1915
-> version_suffix=""
-1916a1919,1925
-> 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
-1919,1925c1928,1933
-< 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
----
-> # 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
-1939c1947,1948
-< LDADD_SCOTCH="-lscotch -lscotcherrexit"
----
-> # LDADD_SCOTCH="-lscotch -lscotcherrexit"
-> LDADD_SCOTCH="-lscotch${version_suffix} -lscotcherrexit${version_suffix}"
+Description: autodetect openmpi and libscotch
+Forwarded: not-yet
+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=47561&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:36:59 2017
@@ -1,3 +1,10 @@
+Description: port to CGAL >= 4.11
+ This avoids a FTBFS
+Forwarded: not-yet
+Bug-Debian: https://bugs.debian.org/871811
+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
***************
More information about the debian-science-commits
mailing list