diff --git a/common/shlibs b/common/shlibs index e6380dfc42..3bb5a2a893 100644 --- a/common/shlibs +++ b/common/shlibs @@ -58,7 +58,7 @@ libmp.so.3 gmp-5.0.1_1 libgmp.so.10 gmp-5.0.1_1 libgmpxx.so.4 gmp-5.0.1_1 libmpfr.so.4 mpfr-3.0.0_1 -libppl.so.12 ppl-1.0_1 +libppl.so.13 ppl-1.1_1 libppl_c.so.4 ppl-0.11_1 libstdc++.so.6 libstdc++-4.4.0_1 libssp.so.0 libssp-4.4.0_1 diff --git a/srcpkgs/ppl/patches/gmp-5.1-compat.patch b/srcpkgs/ppl/patches/gmp-5.1-compat.patch deleted file mode 100644 index 64e1a303f5..0000000000 --- a/srcpkgs/ppl/patches/gmp-5.1-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9f843aecc23981aec6ed1eaa8be06e6786a47f0d Mon Sep 17 00:00:00 2001 -From: Roberto Bagnara -Date: Wed, 19 Dec 2012 08:42:19 +0100 -Subject: [PATCH] GMP version 5.1.0 (and, presumably, later versions) defines std::numeric_limits. - ---- - src/mp_std_bits.cc | 6 ++++++ - src/mp_std_bits_defs.hh | 6 ++++++ - 2 files changed, 12 insertions(+), 0 deletions(-) - ---- src/mp_std_bits.cc -+++ src/mp_std_bits.cc -@@ -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::is_specialized; - const int std::numeric_limits::digits; - const int std::numeric_limits::digits10; -@@ -70,3 +73,6 @@ const bool std::numeric_limits::is_modulo; - const bool std::numeric_limits::traps; - const bool std::numeric_limits::tininess_before; - const std::float_round_style std::numeric_limits::round_style; -+ -+#endif // __GNU_MP_VERSION < 5 -+ // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) ---- src/mp_std_bits.defs.hh.orig 2013-02-16 17:19:52.254341676 +0100 -+++ src/mp_std_bits.defs.hh 2013-02-16 17:20:49.171965855 +0100 -@@ -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) diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template index 27f1058dd8..1c000f9fab 100644 --- a/srcpkgs/ppl/template +++ b/srcpkgs/ppl/template @@ -1,19 +1,17 @@ # Template file for 'ppl' pkgname=ppl -version=1.0 -revision=2 +version=1.1 +revision=1 build_style=gnu-configure configure_args="--enable-interfaces=c,cxx" hostmakedepends="libtool automake" -makedepends="gmp-devel>=5.1.1" +makedepends="gmp-devel>=6" short_desc="The Parma Polyhedra Library" homepage="http://bugseng.com/products/ppl" license="GPL-3" maintainer="Juan RP " distfiles="http://bugseng.com/products/ppl/download/ftp/releases/${version}/ppl-${version}.tar.gz" -checksum=fd346687482ad51c1e98eb260bd61dd5a35a0cff5f580404380c88b0089a71b4 - -disable_debug=yes +checksum=46f073c0626234f0b1a479356c0022fe5dc3c9cf10df1a246c9cde81f7cf284d pre_configure() { autoreconf -fi @@ -24,12 +22,13 @@ post_install() { } ppl-devel_package() { - depends="ppl>=${version}" - short_desc+=" -- development files" + depends="ppl>=${version}_${revision}" + short_desc+=" - development files" pkg_install() { for d in bin include share; do vmove usr/${d} done - vmove "usr/lib/*.a" + vmove usr/lib/*.a + vmove usr/lib/*.so } }