[ppl] Correct build with gcc 5.0.

pcpa pcpa at fedoraproject.org
Sun Feb 8 20:49:09 UTC 2015


commit 61caa950d9e1e690666c0f207bacc30b0cf286b2
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Sun Feb 8 18:48:38 2015 -0200

    Correct build with gcc 5.0.

 ppl-gcc5.patch |   38 ++++++++++++++++++++++++++++++++++++++
 ppl.spec       |    7 ++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/ppl-gcc5.patch b/ppl-gcc5.patch
new file mode 100644
index 0000000..6624642
--- /dev/null
+++ b/ppl-gcc5.patch
@@ -0,0 +1,38 @@
+diff -up ppl-1.1/src/Pointset_Powerset_defs.hh.orig ppl-1.1/src/Pointset_Powerset_defs.hh
+--- ppl-1.1/src/Pointset_Powerset_defs.hh.orig	2013-10-28 10:38:33.000000000 -0200
++++ ppl-1.1/src/Pointset_Powerset_defs.hh	2015-02-08 17:33:06.414149334 -0200
+@@ -1391,6 +1391,7 @@ template <typename PSET>
+ bool
+ check_containment(const PSET& ph, const Pointset_Powerset<PSET>& ps);
+ 
++#if __GNUC__ < 5
+ // CHECKME: according to the Intel compiler, the declaration of the
+ // following specialization (of the class template parameter) should come
+ // before the declaration of the corresponding full specialization
+@@ -1400,6 +1401,7 @@ template <typename QH>
+ Pointset_Powerset<NNC_Polyhedron>
+ ::Pointset_Powerset(const Pointset_Powerset<QH>& y,
+                     Complexity_Class);
++#endif
+ 
+ // Non-inline full specializations should be declared here
+ // so as to inhibit multiple instantiations of the generic template.
+diff -up ppl-1.1/src/ppl.hh.dist.orig ppl-1.1/src/ppl.hh.dist
+--- ppl-1.1/src/ppl.hh.dist.orig	2015-02-08 17:32:26.594146810 -0200
++++ ppl-1.1/src/ppl.hh.dist	2015-02-08 17:33:11.833149677 -0200
+@@ -100618,6 +100618,7 @@ template <typename PSET>
+ bool
+ check_containment(const PSET& ph, const Pointset_Powerset<PSET>& ps);
+ 
++#if __GNUC__ < 5
+ // CHECKME: according to the Intel compiler, the declaration of the
+ // following specialization (of the class template parameter) should come
+ // before the declaration of the corresponding full specialization
+@@ -100627,6 +100628,7 @@ template <typename QH>
+ Pointset_Powerset<NNC_Polyhedron>
+ ::Pointset_Powerset(const Pointset_Powerset<QH>& y,
+                     Complexity_Class);
++#endif
+ 
+ // Non-inline full specializations should be declared here
+ // so as to inhibit multiple instantiations of the generic template.
diff --git a/ppl.spec b/ppl.spec
index ca067bf..b4f3800 100644
--- a/ppl.spec
+++ b/ppl.spec
@@ -1,6 +1,6 @@
 Name:			ppl
 Version:		1.1
-Release:		6%{?dist}
+Release:		7%{?dist}
 Summary:		The Parma Polyhedra Library: a library of numerical abstractions
 Group:			Development/Libraries
 License:		GPLv3+
@@ -16,6 +16,7 @@ Obsoletes:		ppl-pwl <= 0.11.2-11
 BuildRequires:		gmp-devel >= 4.1.3, m4 >= 1.4.8
 Patch0:			%{name}-cstddef.patch
 Patch1:			%{name}-PlLong.patch
+Patch2:			%{name}-gcc5.patch
 
 %description
 The Parma Polyhedra Library (PPL) is a library for the manipulation of
@@ -151,6 +152,7 @@ Install this package if you want to program with the PPL.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
@@ -302,6 +304,9 @@ mv \
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Feb  8 2015 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 1.1-7
+- Correct build with gcc 5.0.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list