summaryrefslogtreecommitdiff
path: root/patches/ppl/0.11.2
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2015-11-23 03:13:53 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2015-11-30 01:36:58 (GMT)
commit0e0ecc8bcf27d34c6564dcf990e1c7ef8c5acb4c (patch)
tree1073f7f21a9709d88ced72bcc196c8af571c7847 /patches/ppl/0.11.2
parentc0bd1bbc4c0beadf4e874112026bf93e9828720a (diff)
PPL: Remove support for PPL and CLooG/PPL
Now that versions of gcc that required PPL are no longer supported ( >= gcc-4.5.x AND <= gcc-4.7.x ) ...we no longer require PPL or CLooG/PPL. This commit: * Removes PPL * Removes CLooG/PPL * Updates the documentation * Updates build script for CLooG and GCC * Removes PPL and CLooG/PPL from scripts/addToolVersion.sh and scripts/showSamples.sh * Adds ISL to scripts/addToolVersion.sh and scripts/showSamples.sh I know that sounds like a lot for one commit, but it was all kind of inter-tangled. Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'patches/ppl/0.11.2')
-rw-r--r--patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch28
-rw-r--r--patches/ppl/0.11.2/200-fix-build-with-local-gmp.patch24
-rw-r--r--patches/ppl/0.11.2/300-fix-data-dir.patch94
-rw-r--r--patches/ppl/0.11.2/400-fix-build-with-gmp-5.1.patch52
-rw-r--r--patches/ppl/0.11.2/500-ptrdiff_t.patch95
5 files changed, 0 insertions, 293 deletions
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: