diff options
32 files changed, 45 insertions, 1093 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index bbc46bc..4cf4628 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -156,7 +156,8 @@ config CC_GCC_latest config CC_GCC_HAS_GRAPHITE bool -# For graphite: gcc 4.4..4.7 need ppl, while 4.8.. need isl +# For graphite: gcc needs cloog and isl +# In >= gcc-5.x, cloog is no longer needed, but isl is. # Prompt in config/cc/gcc.in.2 config CC_GCC_USE_GRAPHITE bool @@ -167,10 +168,12 @@ config CC_GCC_USE_GRAPHITE help Enable the GRAPHITE loop optimsations. - On some systems (eg. Cygwin), PPL and/or CLooG (required to enable + On some systems (eg. Cygwin), CLooG and ISL (required to enable GRAPHITE) may not build properly (yet), so you'll have to say 'N' here (or help debug the issues) + TODO: Is this still true on Cygwin? + # The way LTO works is a bit twisted. # See: http://gcc.gnu.org/wiki/LinkTimeOptimization#Requirements # Basically: diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index b947668..0ad40df 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -68,7 +68,7 @@ config CC_GCC_STATIC_LIBSTDCXX default y select WANTS_STATIC_LINK help - Newer gcc versions use the PPL library which is C++ code. Statically + Newer gcc versions require some c++ libraries. So statically linking libstdc++ increases the likeliness that the gcc binary will run on machines other than the one which it was built on, without having to worry about distributing the matching version of libstdc++ diff --git a/config/companion_libs.in b/config/companion_libs.in index 3567512..67094cb 100644 --- a/config/companion_libs.in +++ b/config/companion_libs.in @@ -28,11 +28,6 @@ config MPFR_NEEDED select MPFR select COMPLIBS_NEEDED -config PPL_NEEDED - bool - select PPL - select COMPLIBS_NEEDED - config ISL_NEEDED bool select ISL @@ -83,11 +78,6 @@ config MPFR select GMP select COMPLIBS -config PPL - bool - select GMP - select COMPLIBS - config ISL bool select GMP @@ -137,9 +127,6 @@ endif if MPFR source "config/companion_libs/mpfr.in" endif -if PPL -source "config/companion_libs/ppl.in" -endif if ISL source "config/companion_libs/isl.in" endif @@ -182,9 +169,7 @@ config COMPLIBS_CHECK If you suspect that one (or more) of your companion libraries is the cause for incorrectly generated code, you should answer 'Y' here. - Note however that this will take a really long time. For example, - building PPL on my machine takes roughly 1'40", while checking it takes - about 1h40'... + Note however that this will take a really long time. endif # COMPLIBS diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in index 6fb522a..dcac30d 100644 --- a/config/companion_libs/cloog.in +++ b/config/companion_libs/cloog.in @@ -26,15 +26,6 @@ config CLOOG_V_0_18_0 endif # ISL -if PPL - -config CLOOG_V_0_15_11 - bool - prompt "0.15.11" - select CLOOG_NEEDS_AUTORECONF - -endif # PPL - endchoice config CLOOG_VERSION @@ -44,7 +35,6 @@ config CLOOG_VERSION default "0.18.4" if CLOOG_V_0_18_4 default "0.18.1" if CLOOG_V_0_18_1 default "0.18.0" if CLOOG_V_0_18_0 - default "0.15.11" if CLOOG_V_0_15_11 config CLOOG_0_18_4_or_later bool diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in deleted file mode 100644 index 1861e7a..0000000 --- a/config/companion_libs/ppl.in +++ /dev/null @@ -1,51 +0,0 @@ -# PPL options - -choice - bool - prompt "PPL version" -# Don't remove next line -# CT_INSERT_VERSION_BELOW - -config PPL_V_0_11_2 - bool - prompt "0.11.2" - select PPL_0_11 - -config PPL_V_0_11_1 - bool - prompt "0.11.1" - select PPL_0_11 - -config PPL_V_0_11 - bool - prompt "0.11" - select PPL_0_11 - -config PPL_V_0_10_2 - bool - prompt "0.10.2" - select PPL_NEEDS_FPERMISSIVE - -endchoice - -config PPL_VERSION - string -# Don't remove next line -# CT_INSERT_VERSION_STRING_BELOW - default "0.11.2" if PPL_V_0_11_2 - default "0.11.1" if PPL_V_0_11_1 - default "0.11" if PPL_V_0_11 - default "0.10.2" if PPL_V_0_10_2 - -# For PPL 0.10, we need -fpermissive to build on gcc 4.7+ -# (even gcc-4.6+ ?) -config PPL_NEEDS_FPERMISSIVE - bool - -# For PPL 0.11, we need to pull libpwl if configured static -config PPL_0_11 - bool - select PPL_NEEDS_LIBPWL if ! COMPLIBS_SHARED - -config PPL_NEEDS_LIBPWL - bool diff --git a/docs/4 - Building the toolchain.txt b/docs/4 - Building the toolchain.txt index be96afe..3b2826e 100644 --- a/docs/4 - Building the toolchain.txt +++ b/docs/4 - Building the toolchain.txt @@ -94,7 +94,10 @@ Unfortunately, not all systems on which crosstool-NG runs have all of those libraries. And for those that do, the versions of those libraries may be older than the version required by gcc (and binutils and gdb). To date, Debian stable (aka Lenny) is lagging behind on some, and is missing the -others. +others. With >= gcc-4.8, we drop PPL and CLooG/PPL, and switch to ISL to +replace PPL, and use the upstream version of CLooG instead of CLooG/PPL +which was a fork of CLooG that provided PPL backend support, that was under- +maintained. See: https://gcc.gnu.org/wiki/Graphite-4.8 This is why crosstool-NG builds its own set of libraries as part of the toolchain. diff --git a/docs/7 - Contributing to crosstool-NG.txt b/docs/7 - Contributing to crosstool-NG.txt index a103554..5e363a1 100644 --- a/docs/7 - Contributing to crosstool-NG.txt +++ b/docs/7 - Contributing to crosstool-NG.txt @@ -35,7 +35,7 @@ Here is the (mostly-complete) list of categories and components: libc | uClibc, glibc, newlib, mingw, none kernel | linux, mingw32, bare-metal debug | dmalloc, duma, gdb, ltrace, strace - complibs | gmp, mpfr, ppl, cloog, mpc, libelf + complibs | gmp, mpfr, isl, cloog, mpc, libelf comptools | make, m4, autoconf, automake, libtool ------------+------------------------------------------------------- | The following categories have no component-part: diff --git a/docs/9 - How is a toolchain constructed.txt b/docs/9 - How is a toolchain constructed.txt index a358b9e..f8e3292 100644 --- a/docs/9 - How is a toolchain constructed.txt +++ b/docs/9 - How is a toolchain constructed.txt @@ -199,16 +199,16 @@ loop optimisation (GRAPHITE) and Link Time Optimisation (LTO). If you want to use these, you'll need three additional libraries: To enable GRAPHITE: - - the Parma Polyhedra Library, PPL - - the Chunky Loop Generator, using the PPL backend, CLooG/PPL + - the Interger Set Library, ISL + - the Chunky Loop Generator, CLooG To enable LTO: - the ELF object file access library, libelf The dependencies for those libraries are: - - PPL requires GMP - - CLooG/PPL requires GMP and PPL + - ISL requires GMP + - CLooG requires GMP and ISL - libelf has no pre-requisites The list now looks like (optional libs with a *): @@ -216,8 +216,8 @@ The list now looks like (optional libs with a *): 1 GMP 2 MPFR 3 MPC - 4 PPL * - 5 CLooG/PPL * + 4 ISL * + 5 CLooG * 6 libelf * 7 binutils 8 core pass 1 compiler diff --git a/patches/cloog-ppl/0.15.10/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.10/100-add_on_libs_position.patch deleted file mode 100644 index 2e97b5a..0000000 --- a/patches/cloog-ppl/0.15.10/100-add_on_libs_position.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurd cloog-ppl-0.15.10-a/configure cloog-ppl-0.15.10-b/configure ---- cloog-ppl-0.15.10-a/configure 2010-08-27 21:14:33.000000000 +0200 -+++ cloog-ppl-0.15.10-b/configure 2012-01-27 13:28:49.262987773 +0100 -@@ -11168,7 +11168,7 @@ - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - - $as_echo "#define CLOOG_PPL_BACKEND 1" >>confdefs.h - -diff -Naurd cloog-ppl-0.15.10-a/configure.in cloog-ppl-0.15.10-b/configure.in ---- cloog-ppl-0.15.10-a/configure.in 2010-08-27 21:13:48.000000000 +0200 -+++ cloog-ppl-0.15.10-b/configure.in 2012-01-27 13:28:49.262987773 +0100 -@@ -343,7 +343,7 @@ - #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) - - else diff --git a/patches/cloog-ppl/0.15.11/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.11/100-add_on_libs_position.patch deleted file mode 100644 index 21f7213..0000000 --- a/patches/cloog-ppl/0.15.11/100-add_on_libs_position.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurd cloog-ppl-0.15.11-a/configure cloog-ppl-0.15.11-b/configure ---- cloog-ppl-0.15.11-a/configure 2011-04-01 06:22:53.000000000 +0200 -+++ cloog-ppl-0.15.11-b/configure 2012-01-27 13:29:42.698987517 +0100 -@@ -11238,7 +11238,7 @@ - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - - $as_echo "#define CLOOG_PPL_BACKEND 1" >>confdefs.h - -diff -Naurd cloog-ppl-0.15.11-a/configure.in cloog-ppl-0.15.11-b/configure.in ---- cloog-ppl-0.15.11-a/configure.in 2010-08-27 21:13:48.000000000 +0200 -+++ cloog-ppl-0.15.11-b/configure.in 2012-01-27 13:29:42.698987517 +0100 -@@ -343,7 +343,7 @@ - #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) - - else diff --git a/patches/cloog-ppl/0.15.6/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.6/100-add_on_libs_position.patch deleted file mode 100644 index 6364292..0000000 --- a/patches/cloog-ppl/0.15.6/100-add_on_libs_position.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurd cloog-ppl-0.15.6-a/configure cloog-ppl-0.15.6-b/configure ---- cloog-ppl-0.15.6-a/configure 2009-08-10 23:18:07.000000000 +0200 -+++ cloog-ppl-0.15.6-b/configure 2012-01-27 13:25:08.858988857 +0100 -@@ -12917,7 +12917,7 @@ - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - - cat >>confdefs.h <<\_ACEOF - #define CLOOG_PPL_BACKEND 1 -diff -Naurd cloog-ppl-0.15.6-a/configure.in cloog-ppl-0.15.6-b/configure.in ---- cloog-ppl-0.15.6-a/configure.in 2009-08-10 23:18:07.000000000 +0200 -+++ cloog-ppl-0.15.6-b/configure.in 2012-01-27 13:25:08.862988846 +0100 -@@ -354,7 +354,7 @@ - #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) - - else diff --git a/patches/cloog-ppl/0.15.7/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.7/100-add_on_libs_position.patch deleted file mode 100644 index cc37b7d..0000000 --- a/patches/cloog-ppl/0.15.7/100-add_on_libs_position.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurd cloog-ppl-0.15.7-a/configure cloog-ppl-0.15.7-b/configure ---- cloog-ppl-0.15.7-a/configure 2009-08-12 03:33:31.000000000 +0200 -+++ cloog-ppl-0.15.7-b/configure 2012-01-27 13:26:13.970988501 +0100 -@@ -12902,7 +12902,7 @@ - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - - cat >>confdefs.h <<\_ACEOF - #define CLOOG_PPL_BACKEND 1 -diff -Naurd cloog-ppl-0.15.7-a/configure.in cloog-ppl-0.15.7-b/configure.in ---- cloog-ppl-0.15.7-a/configure.in 2009-08-12 03:33:31.000000000 +0200 -+++ cloog-ppl-0.15.7-b/configure.in 2012-01-27 13:26:13.970988501 +0100 -@@ -345,7 +345,7 @@ - #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) - - else diff --git a/patches/cloog-ppl/0.15.8/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.8/100-add_on_libs_position.patch deleted file mode 100644 index 4a44bae..0000000 --- a/patches/cloog-ppl/0.15.8/100-add_on_libs_position.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurd cloog-ppl-0.15.8-a/configure cloog-ppl-0.15.8-b/configure ---- cloog-ppl-0.15.8-a/configure 2010-02-11 19:05:30.000000000 +0100 -+++ cloog-ppl-0.15.8-b/configure 2012-01-27 13:27:09.710988253 +0100 -@@ -12902,7 +12902,7 @@ - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - - cat >>confdefs.h <<\_ACEOF - #define CLOOG_PPL_BACKEND 1 -diff -Naurd cloog-ppl-0.15.8-a/configure.in cloog-ppl-0.15.8-b/configure.in ---- cloog-ppl-0.15.8-a/configure.in 2010-02-11 19:05:31.000000000 +0100 -+++ cloog-ppl-0.15.8-b/configure.in 2012-01-27 13:27:09.710988253 +0100 -@@ -345,7 +345,7 @@ - #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) - - else diff --git a/patches/cloog-ppl/0.15.9/100-add_on_libs_position.patch b/patches/cloog-ppl/0.15.9/100-add_on_libs_position.patch deleted file mode 100644 index 94c4c8b..0000000 --- a/patches/cloog-ppl/0.15.9/100-add_on_libs_position.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naurd cloog-ppl-0.15.9-a/configure cloog-ppl-0.15.9-b/configure ---- cloog-ppl-0.15.9-a/configure 2010-03-23 22:29:47.000000000 +0100 -+++ cloog-ppl-0.15.9-b/configure 2012-01-27 13:28:03.866987993 +0100 -@@ -12902,7 +12902,7 @@ - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - - cat >>confdefs.h <<\_ACEOF - #define CLOOG_PPL_BACKEND 1 -diff -Naurd cloog-ppl-0.15.9-a/configure.in cloog-ppl-0.15.9-b/configure.in ---- cloog-ppl-0.15.9-a/configure.in 2010-03-23 22:29:47.000000000 +0100 -+++ cloog-ppl-0.15.9-b/configure.in 2012-01-27 13:28:03.866987993 +0100 -@@ -345,7 +345,7 @@ - #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ]) - -- LIBS="$LIBS -lppl_c -lppl -lgmpxx" -+ LIBS="-lppl_c -lppl -lgmpxx $LIBS" - AC_DEFINE([CLOOG_PPL_BACKEND], 1, [Use the PPL backend]) - - else diff --git a/patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch b/patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch deleted file mode 100644 index ab23ee9..0000000 --- a/patches/ppl/0.10.2/100-fix-configure-with-gmp-5_0_1.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ppl-0.10.2/configure.orig 2010-08-04 21:48:19.000000000 -0400 -+++ ppl-0.10.2/configure 2010-08-04 21:50:04.000000000 -0400 -@@ -16443,6 +16443,10 @@ - #GMP version 4.1.3 or higher is required - #endif - -+#ifndef BITS_PER_MP_LIMB -+#define BITS_PER_MP_LIMB GMP_LIMB_BITS -+#endif -+ - int - main() { - std::string header_version; -@@ -16469,11 +16473,11 @@ - return 1; - } - -- if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS -- || GMP_LIMB_BITS != mp_bits_per_limb) { -+ if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB -+ || BITS_PER_MP_LIMB != mp_bits_per_limb) { - std::cerr - << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n" -- << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n" -+ << "header gives " << BITS_PER_MP_LIMB << ";\n" - << "library gives " << mp_bits_per_limb << ".\n" - << "This probably means you are on a bi-arch system and\n" - << "you are compiling with the wrong header or linking with\n" diff --git a/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch b/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch deleted file mode 100644 index 7f9d625..0000000 --- a/patches/ppl/0.10.2/200-fix-build-with-local-gmp.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -aur ppl-0.10-orig/configure ppl-0.10/configure ---- ppl-0.10-orig/configure 2008-11-04 04:37:00.000000000 -0500 -+++ ppl-0.10/configure 2013-07-15 18:48:26.688013150 -0400 -@@ -15162,6 +15162,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - - -diff -aur ppl-0.10-orig/m4/ac_check_gmp.m4 ppl-0.10/m4/ac_check_gmp.m4 ---- ppl-0.10-orig/m4/ac_check_gmp.m4 2008-10-22 07:43:22.000000000 -0400 -+++ ppl-0.10/m4/ac_check_gmp.m4 2013-07-15 18:48:26.669013816 -0400 -@@ -31,6 +31,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - dnl Check how to link with libgmp. - AC_LIB_LINKFLAGS([gmp]) diff --git a/patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch b/patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch deleted file mode 100644 index 12a72e8..0000000 --- a/patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 25bb77587944768581225d1c0048facab32cf019 -Author: Roberto Bagnara <bagnara@cs.unipr.it> -Date: Wed May 18 09:35:36 2011 +0200 - - Moved misplaced conditional. - -diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am -index 64ba864..607bbc6 100644 ---- a/interfaces/Java/tests/Makefile.am -+++ b/interfaces/Java/tests/Makefile.am -@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \ - PPL_Test.java \ - ppl_java_tests_common - -+if ENABLE_SHARED -+ - check_JAVA = \ - ppl_java_generated_tests.java \ - Test_Executor.java \ -@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \ - Parma_Polyhedra_Library_test2.java \ - PPL_Test.java - --if ENABLE_SHARED -- - CLASSPATH = ../ppl_java.jar:. - JAVACFLAGS = -classpath $(CLASSPATH) - diff --git a/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch b/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch deleted file mode 100644 index a4bb9f1..0000000 --- a/patches/ppl/0.11.1/200-fix-build-with-local-gmp.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500 -+++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400 -@@ -32,6 +32,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - AC_ARG_WITH(gmp-build, - AS_HELP_STRING([--with-gmp-build=DIR], ---- a/configure~ 2011-02-27 04:07:47.000000000 -0500 -+++ b/configure 2013-07-10 19:57:35.894457259 -0400 -@@ -10217,6 +10217,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - - # Check whether --with-gmp-build was given. diff --git a/patches/ppl/0.11.1/300-fix-data-dir.patch b/patches/ppl/0.11.1/300-fix-data-dir.patch deleted file mode 100644 index fe15ba5..0000000 --- a/patches/ppl/0.11.1/300-fix-data-dir.patch +++ /dev/null @@ -1,94 +0,0 @@ -commit 10e0afa8fa25c9e0e8eaac9a0d730ab325086010 -Author: Roberto Bagnara <bagnara@cs.unipr.it> -Date: Sun Feb 12 08:48:59 2012 +0100 - - Prolog sources must go under .../share/ppl as these files are architecture independent. - Moreover, new versions of Automake no longer accept pkglib_DATA. - -diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am -index c8dd56e..8dcf17e 100644 ---- a/interfaces/Prolog/Ciao/Makefile.am -+++ b/interfaces/Prolog/Ciao/Makefile.am -@@ -170,7 +170,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_ciao.po -+pkgdata_DATA = ppl_ciao.po - - ppl_ciao.pl: $(interface_generator_dependencies) - $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ -diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am -index 5904bf1..2ba45ee 100644 ---- a/interfaces/Prolog/GNU/Makefile.am -+++ b/interfaces/Prolog/GNU/Makefile.am -@@ -169,7 +169,7 @@ ppl_gprolog.pl: $(interface_generator_dependencies) - $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ - $(srcdir)/ppl_interface_generator_gprolog_pl.m4 > $@ - --pkglib_DATA = ppl_gprolog.pl -+pkgdata_DATA = ppl_gprolog.pl - - bin_PROGRAMS = ppl_gprolog - -diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am -index 17a54c7..22f809f 100644 ---- a/interfaces/Prolog/SICStus/Makefile.am -+++ b/interfaces/Prolog/SICStus/Makefile.am -@@ -69,7 +69,7 @@ ppl_sicstus_SOURCES = - - if ENABLE_SHARED - --pkglib_DATA = ppl_sicstus.pl ppl_sicstus.s.o -+pkgdata_DATA = ppl_sicstus.pl ppl_sicstus.s.o - - ppl_sicstus.so: ppl_sicstus.pl $(top_builddir)/src/libppl.la $(WATCHDOG_LIBRARY) libppl_sicstus.la - $(LIBTOOL) --mode=link --tag=CXX \ -@@ -87,7 +87,7 @@ install-data-local: ppl_sicstus.so - - else !ENABLE_SHARED - --pkglib_DATA = ppl_sicstus.pl -+pkgdata_DATA = ppl_sicstus.pl - - endif !ENABLE_SHARED - -diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am -index f5bcbe8..5e4e0e4 100644 ---- a/interfaces/Prolog/SWI/Makefile.am -+++ b/interfaces/Prolog/SWI/Makefile.am -@@ -189,7 +189,7 @@ $(NO_UNDEFINED_FLAG) \ - bin_PROGRAMS = ppl_pl - ppl_pl_SOURCES = ppl_pl.cc - --pkglib_DATA = ppl_swiprolog.pl -+pkgdata_DATA = ppl_swiprolog.pl - - CLPQ_TESTS_NONSTRICT = \ - ack.clpq \ -diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am -index 18648eb..1bc1e67 100644 ---- a/interfaces/Prolog/XSB/Makefile.am -+++ b/interfaces/Prolog/XSB/Makefile.am -@@ -188,7 +188,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_xsb.xwam -+pkgdata_DATA = ppl_xsb.xwam - - ppl_xsb.xwam: ppl_xsb.H ppl_xsb.cc libppl_xsb.la - cp -f ppl_xsb.cc ppl_xsb.c -diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am -index fab59c2..34d89e9 100644 ---- a/interfaces/Prolog/YAP/Makefile.am -+++ b/interfaces/Prolog/YAP/Makefile.am -@@ -179,7 +179,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_yap.pl -+pkgdata_DATA = ppl_yap.pl - - CLPQ_TESTS_NONSTRICT = \ - ack.clpq \ diff --git a/patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch b/patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch deleted file mode 100644 index 12a72e8..0000000 --- a/patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 25bb77587944768581225d1c0048facab32cf019 -Author: Roberto Bagnara <bagnara@cs.unipr.it> -Date: Wed May 18 09:35:36 2011 +0200 - - Moved misplaced conditional. - -diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am -index 64ba864..607bbc6 100644 ---- a/interfaces/Java/tests/Makefile.am -+++ b/interfaces/Java/tests/Makefile.am -@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \ - PPL_Test.java \ - ppl_java_tests_common - -+if ENABLE_SHARED -+ - check_JAVA = \ - ppl_java_generated_tests.java \ - Test_Executor.java \ -@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \ - Parma_Polyhedra_Library_test2.java \ - PPL_Test.java - --if ENABLE_SHARED -- - CLASSPATH = ../ppl_java.jar:. - JAVACFLAGS = -classpath $(CLASSPATH) - diff --git a/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch b/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch deleted file mode 100644 index a4bb9f1..0000000 --- a/patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500 -+++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400 -@@ -32,6 +32,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - AC_ARG_WITH(gmp-build, - AS_HELP_STRING([--with-gmp-build=DIR], ---- a/configure~ 2011-02-27 04:07:47.000000000 -0500 -+++ b/configure 2013-07-10 19:57:35.894457259 -0400 -@@ -10217,6 +10217,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - - # Check whether --with-gmp-build was given. diff --git a/patches/ppl/0.11.2/300-fix-data-dir.patch b/patches/ppl/0.11.2/300-fix-data-dir.patch deleted file mode 100644 index fe15ba5..0000000 --- a/patches/ppl/0.11.2/300-fix-data-dir.patch +++ /dev/null @@ -1,94 +0,0 @@ -commit 10e0afa8fa25c9e0e8eaac9a0d730ab325086010 -Author: Roberto Bagnara <bagnara@cs.unipr.it> -Date: Sun Feb 12 08:48:59 2012 +0100 - - Prolog sources must go under .../share/ppl as these files are architecture independent. - Moreover, new versions of Automake no longer accept pkglib_DATA. - -diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am -index c8dd56e..8dcf17e 100644 ---- a/interfaces/Prolog/Ciao/Makefile.am -+++ b/interfaces/Prolog/Ciao/Makefile.am -@@ -170,7 +170,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_ciao.po -+pkgdata_DATA = ppl_ciao.po - - ppl_ciao.pl: $(interface_generator_dependencies) - $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ -diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am -index 5904bf1..2ba45ee 100644 ---- a/interfaces/Prolog/GNU/Makefile.am -+++ b/interfaces/Prolog/GNU/Makefile.am -@@ -169,7 +169,7 @@ ppl_gprolog.pl: $(interface_generator_dependencies) - $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ - $(srcdir)/ppl_interface_generator_gprolog_pl.m4 > $@ - --pkglib_DATA = ppl_gprolog.pl -+pkgdata_DATA = ppl_gprolog.pl - - bin_PROGRAMS = ppl_gprolog - -diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am -index 17a54c7..22f809f 100644 ---- a/interfaces/Prolog/SICStus/Makefile.am -+++ b/interfaces/Prolog/SICStus/Makefile.am -@@ -69,7 +69,7 @@ ppl_sicstus_SOURCES = - - if ENABLE_SHARED - --pkglib_DATA = ppl_sicstus.pl ppl_sicstus.s.o -+pkgdata_DATA = ppl_sicstus.pl ppl_sicstus.s.o - - ppl_sicstus.so: ppl_sicstus.pl $(top_builddir)/src/libppl.la $(WATCHDOG_LIBRARY) libppl_sicstus.la - $(LIBTOOL) --mode=link --tag=CXX \ -@@ -87,7 +87,7 @@ install-data-local: ppl_sicstus.so - - else !ENABLE_SHARED - --pkglib_DATA = ppl_sicstus.pl -+pkgdata_DATA = ppl_sicstus.pl - - endif !ENABLE_SHARED - -diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am -index f5bcbe8..5e4e0e4 100644 ---- a/interfaces/Prolog/SWI/Makefile.am -+++ b/interfaces/Prolog/SWI/Makefile.am -@@ -189,7 +189,7 @@ $(NO_UNDEFINED_FLAG) \ - bin_PROGRAMS = ppl_pl - ppl_pl_SOURCES = ppl_pl.cc - --pkglib_DATA = ppl_swiprolog.pl -+pkgdata_DATA = ppl_swiprolog.pl - - CLPQ_TESTS_NONSTRICT = \ - ack.clpq \ -diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am -index 18648eb..1bc1e67 100644 ---- a/interfaces/Prolog/XSB/Makefile.am -+++ b/interfaces/Prolog/XSB/Makefile.am -@@ -188,7 +188,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_xsb.xwam -+pkgdata_DATA = ppl_xsb.xwam - - ppl_xsb.xwam: ppl_xsb.H ppl_xsb.cc libppl_xsb.la - cp -f ppl_xsb.cc ppl_xsb.c -diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am -index fab59c2..34d89e9 100644 ---- a/interfaces/Prolog/YAP/Makefile.am -+++ b/interfaces/Prolog/YAP/Makefile.am -@@ -179,7 +179,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_yap.pl -+pkgdata_DATA = ppl_yap.pl - - CLPQ_TESTS_NONSTRICT = \ - ack.clpq \ diff --git a/patches/ppl/0.11.2/400-fix-build-with-gmp-5.1.patch b/patches/ppl/0.11.2/400-fix-build-with-gmp-5.1.patch deleted file mode 100644 index 89d7a74..0000000 --- a/patches/ppl/0.11.2/400-fix-build-with-gmp-5.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9f843aecc23981aec6ed1eaa8be06e6786a47f0d Mon Sep 17 00:00:00 2001 -From: Roberto Bagnara <bagnara@cs.unipr.it> -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(+) - ---- a/src/mp_std_bits.cc -+++ b/src/mp_std_bits.cc -@@ -26,6 +26,9 @@ site: http://www.cs.unipr.it/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; -@@ -71,3 +74,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) ---- a/src/mp_std_bits.defs.hh -+++ b/src/mp_std_bits.defs.hh -@@ -39,6 +39,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 -@@ -165,6 +168,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/patches/ppl/0.11.2/500-ptrdiff_t.patch b/patches/ppl/0.11.2/500-ptrdiff_t.patch deleted file mode 100644 index af26cf9..0000000 --- a/patches/ppl/0.11.2/500-ptrdiff_t.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Bernhard Walle <bernhard@bwalle.de> -Subject: Fix compilation with gcc 4.9 (ptrdiff_t errors) - -This is a backport of following patch in ppl git - - commit 61d4e14dfd9f1121e9b4521dead5728b2424dd7c - Author: Roberto Bagnara <bagnara@cs.unipr.it> - Date: Tue Apr 29 21:51:43 2014 +0200 - - Added missing inclusions. Use std::ptrdiff_t. - (Thanks to Paulo Cesar Pereira de Andrade.) - ---- - src/Congruence_System.defs.hh | 3 ++- - src/Constraint_System.defs.hh | 3 ++- - src/Generator_System.defs.hh | 3 ++- - src/Grid_Generator_System.defs.hh | 3 ++- - 4 files changed, 8 insertions(+), 4 deletions(-) - ---- a/src/Grid_Generator_System.defs.hh -+++ b/src/Grid_Generator_System.defs.hh -@@ -30,6 +30,7 @@ site: http://www.cs.unipr.it/ppl/ . */ - #include "Variables_Set.types.hh" - #include "Grid.types.hh" - #include <iosfwd> -+#include <cstddef> - - namespace Parma_Polyhedra_Library { - -@@ -267,7 +268,7 @@ public: - class const_iterator - : public std::iterator<std::forward_iterator_tag, - Grid_Generator, -- ptrdiff_t, -+ std::ptrdiff_t, - const Grid_Generator*, - const Grid_Generator&>, - private Generator_System::const_iterator { ---- a/src/Congruence_System.defs.hh -+++ b/src/Congruence_System.defs.hh -@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */ - #include "Grid.types.hh" - #include "Grid_Certificate.types.hh" - #include <iosfwd> -+#include <cstddef> - - namespace Parma_Polyhedra_Library { - -@@ -235,7 +236,7 @@ public: - class const_iterator - : public std::iterator<std::forward_iterator_tag, - Congruence, -- ptrdiff_t, -+ std::ptrdiff_t, - const Congruence*, - const Congruence&> { - public: ---- a/src/Constraint_System.defs.hh -+++ b/src/Constraint_System.defs.hh -@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */ - #include "Congruence_System.types.hh" - #include <iterator> - #include <iosfwd> -+#include <cstddef> - - namespace Parma_Polyhedra_Library { - -@@ -204,7 +205,7 @@ public: - class const_iterator - : public std::iterator<std::forward_iterator_tag, - Constraint, -- ptrdiff_t, -+ std::ptrdiff_t, - const Constraint*, - const Constraint&> { - public: ---- a/src/Generator_System.defs.hh -+++ b/src/Generator_System.defs.hh -@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */ - #include "Polyhedron.types.hh" - #include "Poly_Con_Relation.defs.hh" - #include <iosfwd> -+#include <cstddef> - - namespace Parma_Polyhedra_Library { - -@@ -250,7 +251,7 @@ public: - class const_iterator - : public std::iterator<std::forward_iterator_tag, - Generator, -- ptrdiff_t, -+ std::ptrdiff_t, - const Generator*, - const Generator&> { - public: diff --git a/patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch b/patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch deleted file mode 100644 index 12a72e8..0000000 --- a/patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 25bb77587944768581225d1c0048facab32cf019 -Author: Roberto Bagnara <bagnara@cs.unipr.it> -Date: Wed May 18 09:35:36 2011 +0200 - - Moved misplaced conditional. - -diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am -index 64ba864..607bbc6 100644 ---- a/interfaces/Java/tests/Makefile.am -+++ b/interfaces/Java/tests/Makefile.am -@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \ - PPL_Test.java \ - ppl_java_tests_common - -+if ENABLE_SHARED -+ - check_JAVA = \ - ppl_java_generated_tests.java \ - Test_Executor.java \ -@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \ - Parma_Polyhedra_Library_test2.java \ - PPL_Test.java - --if ENABLE_SHARED -- - CLASSPATH = ../ppl_java.jar:. - JAVACFLAGS = -classpath $(CLASSPATH) - diff --git a/patches/ppl/0.11/200-fix-build-with-local-gmp.patch b/patches/ppl/0.11/200-fix-build-with-local-gmp.patch deleted file mode 100644 index a4bb9f1..0000000 --- a/patches/ppl/0.11/200-fix-build-with-local-gmp.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/m4/ac_check_gmp.m4~ 2011-02-27 04:07:47.000000000 -0500 -+++ b/m4/ac_check_gmp.m4 2013-07-10 19:57:35.894457259 -0400 -@@ -32,6 +32,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - AC_ARG_WITH(gmp-build, - AS_HELP_STRING([--with-gmp-build=DIR], ---- a/configure~ 2011-02-27 04:07:47.000000000 -0500 -+++ b/configure 2013-07-10 19:57:35.894457259 -0400 -@@ -10217,6 +10217,9 @@ - with_libgmpxx_prefix="$with_libgmp_prefix" - fi - fi -+CPPFLAGS="$CPPFLAGS -I$with_libgmp_prefix/include" -+CXXFLAGS="$CXXFLAGS -I$with_libgmpxx_prefix/include" -+LDFLAGS="$CPPFLAGS -L$with_libgmpxx_prefix/lib -L$with_libgmp_prefix/lib" - - - # Check whether --with-gmp-build was given. diff --git a/patches/ppl/0.11/300-fix-data-dir.patch b/patches/ppl/0.11/300-fix-data-dir.patch deleted file mode 100644 index f091308..0000000 --- a/patches/ppl/0.11/300-fix-data-dir.patch +++ /dev/null @@ -1,94 +0,0 @@ -commit 10e0afa8fa25c9e0e8eaac9a0d730ab325086010 -Author: Roberto Bagnara <bagnara@cs.unipr.it> -Date: Sun Feb 12 08:48:59 2012 +0100 - - Prolog sources must go under .../share/ppl as these files are architecture independent. - Moreover, new versions of Automake no longer accept pkglib_DATA. - -diff --git a/interfaces/Prolog/Ciao/Makefile.am b/interfaces/Prolog/Ciao/Makefile.am -index c8dd56e..8dcf17e 100644 ---- a/interfaces/Prolog/Ciao/Makefile.am -+++ b/interfaces/Prolog/Ciao/Makefile.am -@@ -169,7 +169,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_ciao.po -+pkgdata_DATA = ppl_ciao.po - - ppl_ciao.pl: $(interface_generator_dependencies) - $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ -diff --git a/interfaces/Prolog/GNU/Makefile.am b/interfaces/Prolog/GNU/Makefile.am -index 5904bf1..2ba45ee 100644 ---- a/interfaces/Prolog/GNU/Makefile.am -+++ b/interfaces/Prolog/GNU/Makefile.am -@@ -168,7 +168,7 @@ ppl_gprolog.pl: $(interface_generator_dependencies) - $(M4) --prefix-builtin -I../.. -I$(srcdir)/.. -I$(srcdir)/../.. \ - $(srcdir)/ppl_interface_generator_gprolog_pl.m4 > $@ - --pkglib_DATA = ppl_gprolog.pl -+pkgdata_DATA = ppl_gprolog.pl - - bin_PROGRAMS = ppl_gprolog - -diff --git a/interfaces/Prolog/SICStus/Makefile.am b/interfaces/Prolog/SICStus/Makefile.am -index 17a54c7..22f809f 100644 ---- a/interfaces/Prolog/SICStus/Makefile.am -+++ b/interfaces/Prolog/SICStus/Makefile.am -@@ -68,7 +68,7 @@ ppl_sicstus_SOURCES = - - if ENABLE_SHARED - --pkglib_DATA = ppl_sicstus.pl ppl_sicstus.s.o -+pkgdata_DATA = ppl_sicstus.pl ppl_sicstus.s.o - - ppl_sicstus.so: ppl_sicstus.pl $(top_builddir)/src/libppl.la $(WATCHDOG_LIBRARY) libppl_sicstus.la - $(LIBTOOL) --mode=link --tag=CXX \ -@@ -86,7 +86,7 @@ install-data-local: ppl_sicstus.so - - else !ENABLE_SHARED - --pkglib_DATA = ppl_sicstus.pl -+pkgdata_DATA = ppl_sicstus.pl - - endif !ENABLE_SHARED - -diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am -index f5bcbe8..5e4e0e4 100644 ---- a/interfaces/Prolog/SWI/Makefile.am -+++ b/interfaces/Prolog/SWI/Makefile.am -@@ -188,7 +188,7 @@ $(NO_UNDEFINED_FLAG) \ - bin_PROGRAMS = ppl_pl - ppl_pl_SOURCES = ppl_pl.cc - --pkglib_DATA = ppl_swiprolog.pl -+pkgdata_DATA = ppl_swiprolog.pl - - CLPQ_TESTS_NONSTRICT = \ - ack.clpq \ -diff --git a/interfaces/Prolog/XSB/Makefile.am b/interfaces/Prolog/XSB/Makefile.am -index 18648eb..1bc1e67 100644 ---- a/interfaces/Prolog/XSB/Makefile.am -+++ b/interfaces/Prolog/XSB/Makefile.am -@@ -187,7 +187,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_xsb.xwam -+pkgdata_DATA = ppl_xsb.xwam - - ppl_xsb.xwam: ppl_xsb.H ppl_xsb.cc libppl_xsb.la - cp -f ppl_xsb.cc ppl_xsb.c -diff --git a/interfaces/Prolog/YAP/Makefile.am b/interfaces/Prolog/YAP/Makefile.am -index fab59c2..34d89e9 100644 ---- a/interfaces/Prolog/YAP/Makefile.am -+++ b/interfaces/Prolog/YAP/Makefile.am -@@ -178,7 +178,7 @@ $(NO_UNDEFINED_FLAG) \ - -module \ - -avoid-version - --pkglib_DATA = ppl_yap.pl -+pkgdata_DATA = ppl_yap.pl - - CLPQ_TESTS_NONSTRICT = \ - ack.clpq \ diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index 123bcb4..bd419f8 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -17,7 +17,7 @@ doHelp() { Usage: ${myname} <--tool> <[options] version [...]> ... 'tool' in one of: gcc, binutils, glibc, uClibc, newlib, linux, gdb, dmalloc, - duma, strace, ltrace, libelf, gmp, mpfr, ppl, cloog, mpc, + duma, strace, ltrace, libelf, gmp, mpfr, isl, cloog, mpc, mingw-w64, expat, ncurses Valid options for all tools: @@ -187,7 +187,7 @@ while [ $# -gt 0 ]; do --ltrace) EXP=; OBS=; cat=LTRACE; tool=ltrace; tool_prefix=debug; dot2suffix=;; --gmp) EXP=; OBS=; cat=GMP; tool=gmp; tool_prefix=companion_libs; dot2suffix=;; --mpfr) EXP=; OBS=; cat=MPFR; tool=mpfr; tool_prefix=companion_libs; dot2suffix=;; - --ppl) EXP=; OBS=; cat=PPL; tool=ppl; tool_prefix=companion_libs; dot2suffix=;; + --isl) EXP=; OBS=; cat=ISL; tool=isl; tool_prefix=companion_libs; dot2suffix=;; --cloog) EXP=; OBS=; cat=CLOOG; tool=cloog; tool_prefix=companion_libs; dot2suffix=;; --mpc) EXP=; OBS=; cat=MPC; tool=mpc; tool_prefix=companion_libs; dot2suffix=;; --libelf) EXP=; OBS=; cat=LIBELF; tool=libelf; tool_prefix=companion_libs; dot2suffix=;; diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/100-gcc.sh index ea7d222..fb1ce18 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/100-gcc.sh @@ -315,20 +315,11 @@ do_gcc_core_backend() { extra_config+=("--with-mpc=${complibs}") fi if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then - if [ "${CT_PPL}" = "y" ]; then - extra_config+=("--with-ppl=${complibs}") - # With PPL 0.11+, also pull libpwl if needed - if [ "${CT_PPL_NEEDS_LIBPWL}" = "y" ]; then - host_libstdcxx_flags+=("-L${complibs}/lib") - host_libstdcxx_flags+=("-lpwl") - fi - fi if [ "${CT_ISL}" = "y" ]; then extra_config+=("--with-isl=${complibs}") fi extra_config+=("--with-cloog=${complibs}") elif [ "${CT_CC_GCC_HAS_GRAPHITE}" = "y" ]; then - extra_config+=("--with-ppl=no") extra_config+=("--with-isl=no") extra_config+=("--with-cloog=no") fi @@ -799,20 +790,11 @@ do_gcc_backend() { extra_config+=("--with-mpc=${complibs}") fi if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then - if [ "${CT_PPL}" = "y" ]; then - extra_config+=("--with-ppl=${complibs}") - # With PPL 0.11+, also pull libpwl if needed - if [ "${CT_PPL_NEEDS_LIBPWL}" = "y" ]; then - host_libstdcxx_flags+=("-L${complibs}/lib") - host_libstdcxx_flags+=("-lpwl") - fi - fi if [ "${CT_ISL}" = "y" ]; then extra_config+=("--with-isl=${complibs}") fi extra_config+=("--with-cloog=${complibs}") elif [ "${CT_CC_GCC_HAS_GRAPHITE}" = "y" ]; then - extra_config+=("--with-ppl=no") extra_config+=("--with-isl=no") extra_config+=("--with-cloog=no") fi diff --git a/scripts/build/companion_libs/120-ppl.sh b/scripts/build/companion_libs/120-ppl.sh deleted file mode 100644 index dc7ce33..0000000 --- a/scripts/build/companion_libs/120-ppl.sh +++ /dev/null @@ -1,144 +0,0 @@ -# This file adds the functions to build the PPL library -# Copyright 2009 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -do_ppl_get() { :; } -do_ppl_extract() { :; } -do_ppl_for_build() { :; } -do_ppl_for_host() { :; } -do_ppl_for_target() { :; } - -# Overide functions depending on configuration -if [ "${CT_PPL}" = "y" ]; then - -# Download PPL -do_ppl_get() { - CT_GetFile "ppl-${CT_PPL_VERSION}" \ - http://bugseng.com/products/ppl/download/ftp/releases/${CT_PPL_VERSION} \ - ftp://ftp.cs.unipr.it/pub/ppl/releases/${CT_PPL_VERSION} -} - -# Extract PPL -do_ppl_extract() { - CT_Extract "ppl-${CT_PPL_VERSION}" - CT_Patch "ppl" "${CT_PPL_VERSION}" -} - -# Build PPL for running on build -# - always build statically -# - we do not have build-specific CFLAGS -# - install in build-tools prefix -do_ppl_for_build() { - local -a ppl_opts - local ppl_cflags - local ppl_cxxflags - - case "${CT_TOOLCHAIN_TYPE}" in - native|cross) return 0;; - esac - - CT_DoStep INFO "Installing PPL for build" - CT_mkdir_pushd "${CT_BUILD_DIR}/build-ppl-build-${CT_BUILD}" - - ppl_cflags="${CT_CFLAGS_FOR_BUILD}" - ppl_cxxflags="${CT_CFLAGS_FOR_BUILD}" - if [ "${CT_PPL_NEEDS_FPERMISSIVE}" = "y" ]; then - ppl_cxxflags+=" -fpermissive" - fi - - ppl_opts+=( "host=${CT_BUILD}" ) - ppl_opts+=( "prefix=${CT_BUILDTOOLS_PREFIX_DIR}" ) - ppl_opts+=( "cflags=${ppl_cflags}" ) - ppl_opts+=( "cxxflags=${ppl_cxxflags}" ) - ppl_opts+=( "ldflags=${CT_LDFLAGS_FOR_BUILD}" ) - do_ppl_backend "${ppl_opts[@]}" - - CT_Popd - CT_EndStep -} - -# Build PPL for running on host -do_ppl_for_host() { - local -a ppl_opts - local ppl_cflags - local ppl_cxxflags - - CT_DoStep INFO "Installing PPL for host" - CT_mkdir_pushd "${CT_BUILD_DIR}/build-ppl-host-${CT_HOST}" - - ppl_cflags="${CT_CFLAGS_FOR_HOST}" - ppl_cxxflags="${CT_CFLAGS_FOR_HOST}" - if [ "${CT_PPL_NEEDS_FPERMISSIVE}" = "y" ]; then - ppl_cxxflags+=" -fpermissive" - fi - - ppl_opts+=( "host=${CT_HOST}" ) - ppl_opts+=( "prefix=${CT_HOST_COMPLIBS_DIR}" ) - ppl_opts+=( "cflags=${ppl_cflags}" ) - ppl_opts+=( "cxxflags=${ppl_cxxflags}" ) - ppl_opts+=( "ldflags=${CT_LDFLAGS_FOR_HOST}" ) - do_ppl_backend "${ppl_opts[@]}" - - CT_Popd - CT_EndStep -} - -# Build PPL -# Parameter : description : type : default -# host : machine to run on : tuple : (none) -# prefix : prefix to install into : dir : (none) -# cflags : cflags to use : string : (empty) -# ldflags : ldflags to use : string : (empty) -do_ppl_backend() { - local host - local prefix - local cflags - local cxxflags - local ldflags - local arg - - for arg in "$@"; do - eval "${arg// /\\ }" - done - - CT_DoLog EXTRA "Configuring PPL" - - CT_DoExecLog CFG \ - CFLAGS="${cflags}" \ - CXXFLAGS="${cxxflags}" \ - LDFLAGS="${ldflags}" \ - "${CT_SRC_DIR}/ppl-${CT_PPL_VERSION}/configure" \ - --build=${CT_BUILD} \ - --host=${host} \ - --prefix="${prefix}" \ - --with-libgmp-prefix="${prefix}" \ - --with-libgmpxx-prefix="${prefix}" \ - --with-gmp-prefix="${prefix}" \ - --enable-watchdog \ - --disable-debugging \ - --disable-assertions \ - --disable-ppl_lcdd \ - --disable-ppl_lpsol \ - --disable-shared \ - --enable-interfaces='c c++' \ - --enable-static - - # Maybe-options: - # --enable-optimization=speed or sspeed (yes, with 2 's') - - CT_DoLog EXTRA "Building PPL" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} - - if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then - CT_DoLog EXTRA "Checking PPL" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} -s check - fi - - CT_DoLog EXTRA "Installing PPL" - CT_DoExecLog ALL ${make} install - - # Remove spuriously installed file - CT_DoExecLog ALL rm -f "${prefix}/bin/ppl-config" -} - -fi # CT_PPL diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh index 2d06d06..1b37167 100644 --- a/scripts/build/companion_libs/130-cloog.sh +++ b/scripts/build/companion_libs/130-cloog.sh @@ -11,43 +11,20 @@ do_cloog_for_target() { :; } # Overide functions depending on configuration if [ "${CT_CLOOG}" = "y" ]; then -cloog_basename() { - printf "cloog" - if [ "${CT_PPL}" = "y" ]; then - printf -- "-ppl" - fi -} -cloog_basename_version() { - cloog_basename - printf -- "-${CT_CLOOG_VERSION}" -} - # Download CLooG do_cloog_get() { - CT_GetFile "$(cloog_basename_version)" \ + CT_GetFile "cloog-${CT_CLOOG_VERSION}" \ http://www.bastoul.net/cloog/pages/download \ ftp://gcc.gnu.org/pub/gcc/infrastructure } # Extract CLooG do_cloog_extract() { - local _t - - # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!) - # while versions 0.15.4 onward do have the version in the dirname. - # But, because the infrastructure properly creates the extracted - # directories (with tar's --strip-components), we can live safely... - CT_Extract "$(cloog_basename_version)" - CT_Patch "$(cloog_basename)" "${CT_CLOOG_VERSION}" + CT_Extract "cloog-${CT_CLOOG_VERSION}" + CT_Patch "cloog" "${CT_CLOOG_VERSION}" # Help the autostuff in case it thinks there are things to regenerate... - CT_DoExecLog DEBUG mkdir -p "${CT_SRC_DIR}/$(cloog_basename_version)/m4" - - if [ "${CT_CLOOG_NEEDS_AUTORECONF}" = "y" ]; then - CT_Pushd "${CT_SRC_DIR}/$(cloog_basename_version)" - CT_DoExecLog CFG ./autogen.sh - CT_Popd - fi + CT_DoExecLog DEBUG mkdir -p "${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/m4" } # Build CLooG for running on build @@ -102,47 +79,37 @@ do_cloog_backend() { local prefix local cflags local ldflags - local cloog_src_dir="${CT_SRC_DIR}/$(cloog_basename_version)" local arg local -a cloog_opts - local -a cloog_targets - local -a cloog_install_targets for arg in "$@"; do eval "${arg// /\\ }" done if [ "${CT_CLOOG_0_18_or_later}" = y ]; then - cloog_opts+=( --with-gmp=system --with-gmp-prefix="${prefix}" ) - cloog_opts+=( --with-isl=system --with-isl-prefix="${prefix}" ) - cloog_opts+=( --without-osl ) - cloog_targets=( all ) - cloog_install_targets=( install ) - else - cloog_opts+=( --with-gmp="${prefix}" ) - cloog_opts+=( --with-ppl="${prefix}" ) - cloog_targets=( libcloog.la ) - cloog_install_targets=( install-libLTLIBRARIES install-pkgincludeHEADERS ) + cloog_opts+=( --with-gmp=system --with-gmp-prefix="${prefix}" ) + cloog_opts+=( --with-isl=system --with-isl-prefix="${prefix}" ) + cloog_opts+=( --without-osl ) fi CT_DoLog EXTRA "Configuring CLooG" - CT_DoExecLog CFG \ - CFLAGS="${cflags}" \ - LDFLAGS="${ldflags}" \ - LIBS="-lm" \ - "${cloog_src_dir}/configure" \ - --build=${CT_BUILD} \ - --host=${host} \ - --prefix="${prefix}" \ - --with-bits=gmp \ - --with-host-libstdcxx='-lstdc++' \ - --disable-shared \ - --enable-static \ + CT_DoExecLog CFG \ + CFLAGS="${cflags}" \ + LDFLAGS="${ldflags}" \ + LIBS="-lm" \ + "${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/configure" \ + --build=${CT_BUILD} \ + --host=${host} \ + --prefix="${prefix}" \ + --with-bits=gmp \ + --with-host-libstdcxx='-lstdc++' \ + --disable-shared \ + --enable-static \ "${cloog_opts[@]}" CT_DoLog EXTRA "Building CLooG" - CT_DoExecLog ALL ${make} ${JOBSFLAGS} "${cloog_targets[@]}" + CT_DoExecLog ALL ${make} ${JOBSFLAGS} if [ "${CT_COMPLIBS_CHECK}" = "y" ]; then CT_DoLog EXTRA "Checking CLooG" @@ -150,7 +117,7 @@ do_cloog_backend() { fi CT_DoLog EXTRA "Installing CLooG" - CT_DoExecLog ALL ${make} "${cloog_install_targets[@]}" + CT_DoExecLog ALL ${make} install } fi # CT_CLOOG diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 8aef5ed..b6d81c1 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -69,7 +69,7 @@ dump_single_sample() { printf " %-*s : %s\n" ${width} "OS" "${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}" if [ -n "${CT_GMP}" \ -o -n "${CT_MPFR}" \ - -o -n "${CT_PPL}" \ + -o -n "${CT_ISL}" \ -o -n "${CT_CLOOG}" \ -o -n "${CT_MPC}" \ -o -n "${CT_LIBELF}" \ @@ -77,7 +77,7 @@ dump_single_sample() { -o -n "${CT_NCURSES}" \ -o -n "${CT_GMP_TARGET}" \ -o -n "${CT_MPFR_TARGET}" \ - -o -n "${CT_PPL_TARGET}" \ + -o -n "${CT_ISL_TARGET}" \ -o -n "${CT_CLOOG_TARGET}" \ -o -n "${CT_MPC_TARGET}" \ -o -n "${CT_LIBELF_TARGET}" \ @@ -89,8 +89,8 @@ dump_single_sample() { fi [ -z "${CT_GMP}" -a -z "${CT_GMP_TARGET}" ] || printf " gmp-%s" "${CT_GMP_VERSION}" [ -z "${CT_MPFR}" -a -z "${CT_MPFR_TARGET}" ] || printf " mpfr-%s" "${CT_MPFR_VERSION}" - [ -z "${CT_PPL}" -a -z "${CT_PPL_TARGET}" ] || printf " ppl-%s" "${CT_PPL_VERSION}" - [ -z "${CT_CLOOG}" -a -z "${CT_CLOOG_TARGET}" ] || printf " cloog-ppl-%s" "${CT_CLOOG_VERSION}" + [ -z "${CT_ISL}" -a -z "${CT_ISL_TARGET}" ] || printf " isl-%s" "${CT_ISL_VERSION}" + [ -z "${CT_CLOOG}" -a -z "${CT_CLOOG_TARGET}" ] || printf " cloog-%s" "${CT_CLOOG_VERSION}" [ -z "${CT_MPC}" -a -z "${CT_MPC_TARGET}" ] || printf " mpc-%s" "${CT_MPC_VERSION}" [ -z "${CT_LIBELF}" -a -z "${CT_LIBELF_TARGET}" ] || printf " libelf-%s" "${CT_LIBELF_VERSION}" [ -z "${CT_EXPAT}" -a -z "${CT_EXPAT_TARGET}" ] || printf " expat-%s" "${CT_EXPAT_VERSION}" |