r47564 - in /packages/rheolef/trunk/debian: changelog compat control patches/acinclude.patch patches/cgal-4-11.patch patches/mpi-autodetect.patch patches/series rules
saramito-guest at users.alioth.debian.org
saramito-guest at users.alioth.debian.org
Mon Nov 13 10:08:19 UTC 2017
Author: saramito-guest
Date: Mon Nov 13 10:08:19 2017
New Revision: 47564
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47564
Log:
CGAL 4.11 patch fixes FTBFS (closes: #871811)
Added:
packages/rheolef/trunk/debian/patches/mpi-autodetect.patch
Removed:
packages/rheolef/trunk/debian/patches/acinclude.patch
Modified:
packages/rheolef/trunk/debian/changelog
packages/rheolef/trunk/debian/compat
packages/rheolef/trunk/debian/control
packages/rheolef/trunk/debian/patches/cgal-4-11.patch
packages/rheolef/trunk/debian/patches/series
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=47564&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/changelog (original)
+++ packages/rheolef/trunk/debian/changelog Mon Nov 13 10:08:19 2017
@@ -1,10 +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
-
+ - cgal-4-11.pach: supports experimental libcgal version >=Â 4.11
+ thanks to Joachim Reichel patch (closes: #871811)
+ - mpi-autodetect.patch: fixes openmpi and libscotch autodetection in
+ autoconf files
+ * rules: add -g compilation flag for debug symbols
* control: Standards-Version updated to 4.1.1
+ * compat: debhelper version updated to 9
-- Pierre Saramito <pierre.saramito at imag.fr> Sat, 11 Nov 2017 08:16:06 +0100
Modified: packages/rheolef/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/compat?rev=47564&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/compat (original)
+++ packages/rheolef/trunk/debian/compat Mon Nov 13 10:08:19 2017
@@ -1 +1 @@
-7
+9
Modified: packages/rheolef/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/control?rev=47564&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/control (original)
+++ packages/rheolef/trunk/debian/control Mon Nov 13 10:08:19 2017
@@ -4,7 +4,8 @@
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Pierre Saramito <pierre.saramito at imag.fr>
Homepage: http://ljk.imag.fr/membres/Pierre.Saramito/rheolef
-Build-Depends: debhelper (>=7), autoconf, automake, libtool, flex, bison, chrpath, bsdmainutils,
+Build-Depends: debhelper (>=7), autoconf, automake, libtool, flex, bison,
+ openssh-client, chrpath, bsdmainutils,
libboost-dev, libboost-iostreams-dev, libboost-mpi-dev,
libcgal-dev, liblapack-dev, libscotch-dev, libptscotch-dev,
libsuitesparse-dev, libmumps-ptscotch-dev, libmumps-scotch-dev,
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=47564&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/cgal-4-11.patch (original)
+++ packages/rheolef/trunk/debian/patches/cgal-4-11.patch Mon Nov 13 10:08:19 2017
@@ -4,4 +4,50 @@
Bug-Debian: https://bugs.debian.org/871811
Author: Pierre Saramito <pierre.saramito at imag.fr>
Last-Update: 2017-11-10
-
+--- a/nfem/geo_element/cgal_kernel.h
++++ b/nfem/geo_element/cgal_kernel.h
+@@ -31,7 +31,8 @@
+ // 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,7 +248,11 @@ template < class R >
+ std::ostream &
+ operator<<(std::ostream &os, const MySegmentC2<R> &s)
+ {
+- switch(os.iword(CGAL::IO::mode)) {
++#if CGAL_VERSION_NR >= 1041101000
++ switch(CGAL::get_mode(os)) {
++#else
++ switch(os.iword(CGAL::IO::get_static_mode())) {
++#endif
+ case CGAL::IO::ASCII :
+ return os << s.source() << ' ' << s.target();
+ case CGAL::IO::BINARY :
+@@ -323,7 +328,7 @@ public:
+ #endif // TO_CLEAN
+
+ Point_2
+- operator()(CGAL::Origin o) const
++ operator()(const CGAL::Origin& o) const
+ { return point_basic<RT>(0, 0); }
+
+ Point_2
+@@ -332,6 +337,12 @@ public:
+ 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
+ {
Added: 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=47564&op=file
==============================================================================
--- packages/rheolef/trunk/debian/patches/mpi-autodetect.patch (added)
+++ packages/rheolef/trunk/debian/patches/mpi-autodetect.patch Mon Nov 13 10:08:19 2017
@@ -0,0 +1,62 @@
+Description: fix mpi autodetected by configure script
+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
+@@ -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
+ rheo_recognized_mpi=openmpi
+ elif test `$MPIRUN --help 2>&1 | grep 'MPICH1 compat' | wc -l` -ge 1; then
+ rheo_recognized_mpi=mpich2
+@@ -1731,7 +1732,7 @@ AC_DEFUN([RHEO_CHECK_MPI],
+ rheo_libdir_mpi="/usr/lib/openmpi/lib"
+ fi
+ if test x"${rheo_incdir_mpi}" = x""; then
+- rheo_incdir_mpi="/usr/lib/openmpi/include"
++ rheo_incdir_mpi="/usr/include/openmpi"
+ fi
+ # add -lmpi_f77 for mumps scalapck and blacs libs (obsolete)
+ INCLUDES_MPI="-I${rheo_incdir_mpi}"
+@@ -1912,17 +1913,19 @@ AC_DEFUN([RHEO_CHECK_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
++ for suffix in so a; do
++ if test `find $d -name libscotch.$suffix | wc -l` -ge 1 -a `find $d -name libscotcherrexit.$suffix | wc -l` -ge 1; then
+ founded=true
++ break
+ fi
+- fi
++ done
++ # 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,6 +1939,7 @@ AC_DEFUN([RHEO_CHECK_SCOTCH],
+ INCLUDES_SCOTCH=""
+ LDADD_SCOTCH="${rheo_libs_scotch}"
+ if test x"${rheo_have_mpi}" != x"yes"; then
++ # LDADD_SCOTCH="-lscotch -lscotcherrexit"
+ LDADD_SCOTCH="-lscotch -lscotcherrexit"
+ fi
+ if test x"${rheo_libdir_scotch}" != x"" -a x"${rheo_libdir_scotch}" != x"/usr/lib"; then
Modified: packages/rheolef/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/patches/series?rev=47564&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/patches/series (original)
+++ packages/rheolef/trunk/debian/patches/series Mon Nov 13 10:08:19 2017
@@ -1 +1,3 @@
do-not-treat-warnings-as-errors.patch
+cgal-4-11.patch
+mpi-autodetect.patch
Modified: packages/rheolef/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/rheolef/trunk/debian/rules?rev=47564&op=diff
==============================================================================
--- packages/rheolef/trunk/debian/rules (original)
+++ packages/rheolef/trunk/debian/rules Mon Nov 13 10:08:19 2017
@@ -24,9 +24,9 @@
TMPDIR=debian/tmp-rheolef
# compilation flags
-CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
-CXXFLAGS = -O3 `dpkg-buildflags --get CXXFLAGS | sed -e 's/-O2/-O3/' -e 's/-g//'`
-LDFLAGS = `dpkg-buildflags --get LDFLAGS` ${CXXFLAGS}
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+CXXFLAGS = -O3 -g `dpkg-buildflags --get CXXFLAGS | sed -e 's/-O2/-O3/' -e 's/-g//'`
+LDFLAGS = `dpkg-buildflags --get LDFLAGS` ${CXXFLAGS}
CFLAGS = ${CXXFLAGS}
configure: configure-stamp
@@ -41,7 +41,7 @@
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
+ 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 --without-trilinos-libdir
touch configure-stamp
build: build-arch build-indep
More information about the debian-science-commits
mailing list