[packages/ppl] - updated to 1.0 - fixed build with gmp 5.1

baggins baggins at pld-linux.org
Sun May 12 13:44:32 CEST 2013


commit 89743ecd2c7156e2a0f86a567e80800cd111491d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun May 12 13:44:19 2013 +0200

    - updated to 1.0
    - fixed build with gmp 5.1

 ppl-gmp-5.1.0.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 ppl.spec            |  8 +++++---
 2 files changed, 48 insertions(+), 3 deletions(-)
---
diff --git a/ppl.spec b/ppl.spec
index cb0958e..e3e2106 100644
--- a/ppl.spec
+++ b/ppl.spec
@@ -23,13 +23,14 @@
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Summary(pl.UTF-8):	Parma Polyhedra Library - biblioteka abstrakcji matematycznych
 Name:		ppl
-Version:	0.12
-Release:	3
+Version:	1.0
+Release:	1
 License:	GPL v3+
 Group:		Libraries
 Source0:	ftp://ftp.cs.unipr.it/pub/ppl/releases/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	7615f217b66b4ab4783c20c9fc516ff4
+# Source0-md5:	e8caeb84cd858f64b36333c368891c7b
 Patch0:		%{name}-ciao.patch
+Patch1:		%{name}-gmp-5.1.0.patch
 URL:		http://www.cs.unipr.it/ppl/
 %if %{with xsb}
 BuildRequires:	XSB
@@ -377,6 +378,7 @@ Parma Polyhedra Library.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/ppl-gmp-5.1.0.patch b/ppl-gmp-5.1.0.patch
new file mode 100644
index 0000000..b8b359d
--- /dev/null
+++ b/ppl-gmp-5.1.0.patch
@@ -0,0 +1,43 @@
+diff -up ppl-1.0/src/mp_std_bits.cc.orig ppl-1.0/src/mp_std_bits.cc
+--- ppl-1.0/src/mp_std_bits.cc.orig	2013-01-30 00:54:04.362716243 -0200
++++ ppl-1.0/src/mp_std_bits.cc	2013-01-30 00:56:18.260721371 -0200
+@@ -25,6 +25,9 @@ site: http://bugseng.com/products/ppl/ .
+ #include "ppl-config.h"
+ #include "mp_std_bits.defs.hh"
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ const bool std::numeric_limits<mpz_class>::is_specialized;
+ const int std::numeric_limits<mpz_class>::digits;
+ const int std::numeric_limits<mpz_class>::digits10;
+@@ -70,3 +73,6 @@ const bool std::numeric_limits<mpq_class
+ const bool std::numeric_limits<mpq_class>::traps;
+ const bool std::numeric_limits<mpq_class>::tininess_before;
+ const std::float_round_style std::numeric_limits<mpq_class>::round_style;
++
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
+diff -up ppl-1.0/src/mp_std_bits.defs.hh.orig ppl-1.0/src/mp_std_bits.defs.hh
+--- ppl-1.0/src/mp_std_bits.defs.hh.orig	2013-01-30 00:54:10.339716472 -0200
++++ ppl-1.0/src/mp_std_bits.defs.hh	2013-01-30 00:55:45.852720130 -0200
+@@ -38,6 +38,9 @@ void swap(mpz_class& x, mpz_class& y);
+ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
+ void swap(mpq_class& x, mpq_class& y);
+ 
++#if __GNU_MP_VERSION < 5 \
++  || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ namespace std {
+ 
+ #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
+@@ -164,6 +167,9 @@ public:
+ 
+ } // namespace std
+ 
++#endif // __GNU_MP_VERSION < 5
++       // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1)
++
+ #include "mp_std_bits.inlines.hh"
+ 
+ #endif // !defined(PPL_mp_std_bits_defs_hh)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ppl.git/commitdiff/89743ecd2c7156e2a0f86a567e80800cd111491d



More information about the pld-cvs-commit mailing list