Author: satta
Date: 2016-09-17 13:12:39 +0000 (Sat, 17 Sep 2016)
New Revision: 22810
Added:
trunk/packages/arb/trunk/debian/patches/90_gcc6.patch
Modified:
trunk/packages/arb/trunk/debian/changelog
trunk/packages/arb/trunk/debian/patches/series
trunk/packages/arb/trunk/debian/rules
Log:
fix building with GCC 6
Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog 2016-09-16 20:20:41 UTC (rev
22809)
+++ trunk/packages/arb/trunk/debian/changelog 2016-09-17 13:12:39 UTC (rev
22810)
@@ -1,3 +1,13 @@
+arb (6.0.3-2) unstable; urgency=medium
+
+ * Team upload.
+ * Fix buiding with GCC 6.
+ - Use correct return type in method definition.
+ - Allow for newer __cplusplus versions.
+ Closes: #834170
+
+ -- Sascha Steinbiss <sa...@debian.org> Sat, 17 Sep 2016 10:34:18 +0000
+
arb (6.0.3-1) unstable; urgency=medium
* New upstream version
Added: trunk/packages/arb/trunk/debian/patches/90_gcc6.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/90_gcc6.patch
(rev 0)
+++ trunk/packages/arb/trunk/debian/patches/90_gcc6.patch 2016-09-17
13:12:39 UTC (rev 22810)
@@ -0,0 +1,43 @@
+--- a/HEADERLIBS/Makefile
++++ b/HEADERLIBS/Makefile
+@@ -7,5 +7,6 @@
+ eigen: eigen.tgz
+ tar -zxvf $<
+ touch eigen/
++ patch -p0 < return_value.patch
+
+
+--- /dev/null
++++ b/HEADERLIBS/return_value.patch
+@@ -0,0 +1,20 @@
++--- eigen/Eigen/src/Sparse/AmbiVector.h.1 2016-09-17 11:46:17.000000000
+0000
+++++ eigen/Eigen/src/Sparse/AmbiVector.h 2016-09-17 11:47:13.000000000
+0000
++@@ -44,7 +44,7 @@
++ void init(RealScalar estimatedDensity);
++ void init(int mode);
++
++- void nonZeros() const;
+++ int nonZeros() const;
++
++ /** Specifies a sub-vector to work on */
++ void setBounds(int start, int end) { m_start = start; m_end = end; }
++@@ -133,7 +133,7 @@
++
++ /** \returns the number of non zeros in the current sub vector */
++ template<typename Scalar>
++-void AmbiVector<Scalar>::nonZeros() const
+++int AmbiVector<Scalar>::nonZeros() const
++ {
++ if (m_mode==IsSparse)
++ return m_llSize;
+--- a/TEMPLATES/cxxforward.h
++++ b/TEMPLATES/cxxforward.h
+@@ -21,7 +21,7 @@
+ # if (GCC_VERSION_CODE >= 407)
+ # if (__cplusplus == 199711L)
+ # else
+-# if (__cplusplus == 201103L)
++# if (__cplusplus >= 201103L)
+ # define ARB_ENABLE_Cxx11_FEATURES
+ # else
+ # error Unknown C++ standard defined in __cplusplus
Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series 2016-09-16 20:20:41 UTC
(rev 22809)
+++ trunk/packages/arb/trunk/debian/patches/series 2016-09-17 13:12:39 UTC
(rev 22810)
@@ -6,3 +6,4 @@
60_use_packaged_phyml
70_skip_compler_version_check.patch
80_enable_new_dtags.patch
+90_gcc6.patch
Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules 2016-09-16 20:20:41 UTC (rev
22809)
+++ trunk/packages/arb/trunk/debian/rules 2016-09-17 13:12:39 UTC (rev
22810)
@@ -23,6 +23,7 @@
LC_ALL := C
export ARBHOME LD_LIBRARY_PATH PATH LC_ALL
+export DEB_CXXFLAGS_MAINT_APPEND=-std=c++98
%:
dh $@ --parallel
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
