From 6890ab467c34bc0ae1fccf18a521c3cedfa442a2 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 30 Nov 2014 16:33:57 -0500 Subject: [PATCH] Remove ppl --- config/packages-list | 1 - stage0/hv-install-2 | 7 --- stage0/packages-update | 2 - ...2.1-resolve-conflicts-with-gmp-5.1.0.patch | 61 ------------------- stage0/pkg/gcc | 1 - stage1/hv-install-2 | 6 -- stage1/packages-update | 1 - ...2.1-resolve-conflicts-with-gmp-5.1.0.patch | 1 - stage1/pkg/gcc | 2 +- stage1/pkg/ppl | 9 --- stage2/hv-install-1 | 2 - stage2/packages-update | 1 - ...lve-conflicts-with-gmp-5.1.0-no-perl.patch | 48 --------------- ...2.1-resolve-conflicts-with-gmp-5.1.0.patch | 1 - 14 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch delete mode 120000 stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch delete mode 100644 stage1/pkg/ppl delete mode 100644 stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0-no-perl.patch delete mode 120000 stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch diff --git a/config/packages-list b/config/packages-list index 5abc7c9..11753f2 100644 --- a/config/packages-list +++ b/config/packages-list @@ -328,7 +328,6 @@ PKG_CONFIG="pkg-config-0.26" POPT="popt-1.16" PORTAUDIO="pa_stable_v19_20111121" PORTMAP="portmap-6.0" -PPL="ppl-0.12.1" PROCMAIL="procmail-3.22" PROCPS="procps-3.2.8" PSMISC="psmisc-22.17" diff --git a/stage0/hv-install-2 b/stage0/hv-install-2 index 0be337f..33a9447 100755 --- a/stage0/hv-install-2 +++ b/stage0/hv-install-2 @@ -32,13 +32,6 @@ ipkg ${MPC} "\ --with-gmp=/cross-tools \ --with-mpfr=/cross-tools" -CPPFLAGS="-I/cross-tools/include" \ - ipkg ${PPL} "\ - --enable-shared \ - --disable-static \ - --enable-interfaces=c,cxx \ - --disable-optimization \ - --with-gmp=/cross-tools" ipkg ${CLOOG} "\ --enable-shared \ --disable-static \ diff --git a/stage0/packages-update b/stage0/packages-update index 8298410..3fe8587 100755 --- a/stage0/packages-update +++ b/stage0/packages-update @@ -20,8 +20,6 @@ fpkg -m gnu ${NCURSES} fpkg -m gnu ${GMP} fpkg -m gnu ${MPFR} fpkg -e "tar.gz" ${MPC} "http://www.multiprecision.org/mpc/download" -fpkg -s "$(get_pkg_ver ${PPL})" ${PPL} \ - "http://bugseng.com/products/ppl/download/ftp/releases" fpkg -e "tar.gz" ${CLOOG} "http://www.bastoul.net/cloog/pages/download" fpkg -e "tar.bz2" -m gnu ${BINUTILS} fpkg -m gnu -s "gcc/${GCC}" ${GCC} diff --git a/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch b/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch deleted file mode 100644 index 47edc8b..0000000 --- a/stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch +++ /dev/null @@ -1,61 +0,0 @@ -Module: ppl/ppl -Branch: master -Commit: 9f843aecc23981aec6ed1eaa8be06e6786a47f0d -URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f843aecc23981aec6ed1eaa8be06e6786a47f0d - -Author: Roberto Bagnara -Date: Wed Dec 19 08:42:19 2012 +0100 - -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(-) - -diff --git a/src/mp_std_bits.cc b/src/mp_std_bits.cc -index c8da535..918b9af 100644 ---- a/src/mp_std_bits.cc -+++ b/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) -diff --git a/src/mp_std_bits.defs.hh b/src/mp_std_bits.defs.hh -index f71595a..0d078ec 100644 (file) ---- a/src/mp_std_bits.defs.hh -+++ b/src/mp_std_bits.defs.hh -@@ -38,6 +38,9 @@ - #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 @@ - - } // 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/stage0/pkg/gcc b/stage0/pkg/gcc index 52bea6e..0fd6795 100644 --- a/stage0/pkg/gcc +++ b/stage0/pkg/gcc @@ -15,7 +15,6 @@ hvconfig_pre() --disable-nls \ --with-mpfr=/cross-tools \ --with-gmp=/cross-tools \ - --with-ppl=/cross-tools \ --with-cloog=/cross-tools \ --enable-cloog-backend=isl \ --disable-multilib" diff --git a/stage1/hv-install-2 b/stage1/hv-install-2 index 79be861..cc51073 100755 --- a/stage1/hv-install-2 +++ b/stage1/hv-install-2 @@ -12,12 +12,6 @@ HOST_CC=gcc CPPFLAGS=-fexceptions \ ipkg ${GMP} "--enable-cxx" ipkg ${MPFR} "--enable-shared" ipkg ${MPC} -ipkg ${PPL} "\ - --enable-shared \ - --enable-interfaces=c,cxx \ - --disable-optimization \ - --with-libgmp-prefix=/tools \ - --with-libgmpxx-prefix=/tools" ipkg ${CLOOG} "\ --enable-shared \ --with-gmp=/tools" diff --git a/stage1/packages-update b/stage1/packages-update index 1bfab48..1fec25d 100755 --- a/stage1/packages-update +++ b/stage1/packages-update @@ -12,7 +12,6 @@ update_packages_init ${*} lpkg 0 ${GMP} lpkg 0 ${MPFR} lpkg 0 ${MPC} -lpkg 0 ${PPL} lpkg 0 ${CLOOG} lpkg 0 ${BINUTILS} lpkg 0 ${GCC} diff --git a/stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch b/stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch deleted file mode 120000 index 8715724..0000000 --- a/stage1/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch +++ /dev/null @@ -1 +0,0 @@ -../../../stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch \ No newline at end of file diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc index 57af140..06f70f5 100644 --- a/stage1/pkg/gcc +++ b/stage1/pkg/gcc @@ -34,7 +34,7 @@ hvconfig_post() { # Prevent GCC from looking in the wrong directories for headers and # libraries: - sed -e "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \ + sed -e "/^HOST_\(GMP\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" \ -i Makefile } diff --git a/stage1/pkg/ppl b/stage1/pkg/ppl deleted file mode 100644 index 06699f1..0000000 --- a/stage1/pkg/ppl +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -hvconfig_post() -{ - # When PPL is cross-compiled, it does not check whether GMP was compiled - # with support for exceptions, and simply assumes it was not. This - # assumption is incorrect, so we will fix that: - echo '#define PPL_GMP_SUPPORTS_EXCEPTIONS 1' >> confdefs.h -} diff --git a/stage2/hv-install-1 b/stage2/hv-install-1 index ef23798..bfcc153 100755 --- a/stage2/hv-install-1 +++ b/stage2/hv-install-1 @@ -23,8 +23,6 @@ CPPFLAGS=-fexceptions \ ipkg ${GMP} "--enable-cxx --enable-mpbsd" ipkg ${MPFR} "--enable-shared --with-gmp=/usr" ipkg ${MPC} -CPPFLAGS=-fexceptions \ - ipkg ${PPL} "--enable-shared --disable-optimization" ipkg ${CLOOG} "--enable-shared" unset CC diff --git a/stage2/packages-update b/stage2/packages-update index bb0ec21..5499233 100755 --- a/stage2/packages-update +++ b/stage2/packages-update @@ -14,7 +14,6 @@ lpkg 0 ${EGLIBC} lpkg 0 ${GMP} lpkg 0 ${MPFR} lpkg 0 ${MPC} -lpkg 0 ${PPL} lpkg 0 ${CLOOG} lpkg 0 ${BINUTILS} lpkg 0 ${GCC} diff --git a/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0-no-perl.patch b/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0-no-perl.patch deleted file mode 100644 index 9cb514e..0000000 --- a/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0-no-perl.patch +++ /dev/null @@ -1,48 +0,0 @@ -Submitted By: Hugo Villeneuve -Date: 2014-12-01 -Initial Package Version: 0.12.1 -Upstream Status: Not sent -Description: Fix compilation errors when PERL is not installed. - -The file src/ppl.hh is created from src/ppl.hh.dist. But gmp-5.1 and later -already define the class numeric_limits. Therefore, do not redefine it -if we are using gmp >= 5.1 - -diff -Naur ppl-0.12.1.orig/src/ppl.hh.dist ppl-0.12.1.new/src/ppl.hh.dist ---- ppl-0.12.1.orig/src/ppl.hh.dist 2012-04-16 08:15:08.000000000 -0400 -+++ ppl-0.12.1.new/src/ppl.hh.dist 2014-12-01 01:48:08.482395667 -0500 -@@ -779,6 +779,8 @@ - #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS - //! Specialization of std::numeric_limits. - #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -+#if __GNU_MP_VERSION < 5 \ -+ || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) - template <> - class numeric_limits { - private: -@@ -836,10 +838,16 @@ - return static_cast(1); - } - }; -+#endif // __GNU_MP_VERSION < 5 -+ // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) - - #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS - //! Specialization of std::numeric_limits. - #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -+ -+#if __GNU_MP_VERSION < 5 \ -+ || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) -+ - template <> - class numeric_limits { - private: -@@ -897,6 +905,8 @@ - return static_cast(0); - } - }; -+#endif // __GNU_MP_VERSION < 5 -+ // || (__GNU_MP_VERSION == 5 && __GNU_MP_VERSION_MINOR < 1) - - } // namespace std - diff --git a/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch b/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch deleted file mode 120000 index 8715724..0000000 --- a/stage2/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch +++ /dev/null @@ -1 +0,0 @@ -../../../stage0/patches/common/ppl-0.12.1-resolve-conflicts-with-gmp-5.1.0.patch \ No newline at end of file -- 2.20.1