r47559 - in /packages/rheolef/trunk/debian: changelog control patches/acinclude.patch patches/cgal-4-11.patch rules
saramito-guest at users.alioth.debian.org
saramito-guest at users.alioth.debian.org
Sat Nov 11 09:28:36 UTC 2017
Author: saramito-guest
Date: Sat Nov 11 09:28:35 2017
New Revision: 47559
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47559
Log:
patch: gcal-4.11 (closes: #871811)
Added:
packages/rheolef/trunk/debian/patches/acinclude.patch
packages/rheolef/trunk/debian/patches/cgal-4-11.patch
Modified:
packages/rheolef/trunk/debian/changelog
packages/rheolef/trunk/debian/control
packages/rheolef/trunk/debian/rules
Modified: packages/rheolef/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/changelog?rev=47559&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/changelog (original)
+++ packages/rheolef/trunk/debian/changelog Sat Nov 11 09:28:35 2017
@@ -1,3 +1,13 @@
+rheolef (6.7-4) unstable; urgency=low
+
+ * patches:
+ - supports CGAL >=Â 4.11 thanks to Joachim Reichel (closes: #871811)
+ - config/acinclude.m4: fix openmpi and libscotch autodetection
+
+ * control: Standards-Version updated to 4.1.1
+
+ -- Pierre Saramito <pierre.saramito at imag.fr> Sat, 11 Nov 2017 08:16:06 +0100
+
rheolef (6.7-3) unstable; urgency=medium
* Team upload
Modified: packages/rheolef/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/control?rev=47559&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/control (original)
+++ packages/rheolef/trunk/debian/control Sat Nov 11 09:28:35 2017
@@ -14,7 +14,7 @@
# I dont known how to do something like this (Pierre.Saramito at imag.fr):
# Build-Recommands: libtrilinos-dev
# since rheolef takes advantage of libtrilinos-dev and it is available only on some versions
-Standards-Version: 3.9.6
+Standards-Version: 4.1.1
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/rheolef/trunk/
Vcs-Browser: http://anonscm.debian.org/viewsvn/debian-science/packages/rheolef/trunk/
Added: packages/rheolef/trunk/debian/patches/acinclude.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/patches/acinclude.patch?rev=47559&op=file
==============================================================================
--- packages/rheolef/trunk/debian/patches/acinclude.patch (added)
+++ packages/rheolef/trunk/debian/patches/acinclude.patch Sat Nov 11 09:28:35 2017
@@ -0,0 +1,39 @@
+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}"
Added: 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=47559&op=file
==============================================================================
--- packages/rheolef/trunk/debian/patches/cgal-4-11.patch (added)
+++ packages/rheolef/trunk/debian/patches/cgal-4-11.patch Sat Nov 11 09:28:35 2017
@@ -0,0 +1,73 @@
+*** ./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/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/rules?rev=47559&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/rules (original)
+++ packages/rheolef/trunk/debian/rules Sat Nov 11 09:28:35 2017
@@ -41,7 +41,6 @@
echo 'shlibs:Depends=libc6 (>= 2.7-1), libgcc1 (>= 1:4.3.1-9), libstdc++6 (>= 4.3.1-9)' > debian/$(LIBRHEOLEF).substvars
dh_testdir
./bootstrap
-
CXX=g++ CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-optim --enable-debian-packaging --enable-fast-install --disable-ginac
touch configure-stamp
More information about the debian-science-commits
mailing list