+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="git://repo.or.cz/cloog.git"
- inherit autotools git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
- SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
- >=dev-libs/isl-0.14:0=[${MULTILIB_USEDEP}]
- !dev-libs/cloog-ppl"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-DOCS=( README )
-
-src_prepare() {
- if [[ ${PV} == "9999" ]] ; then
- ./get_submodules.sh
- eautoreconf -i
- else
- # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
- # sed to avoid eautoreconf
- sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
- fi
-
- epatch "${FILESDIR}"/${P}-isl-0.15.patch
-
- # Make sure we always use the system isl.
- rm -rf isl
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-gmp=system \
- --with-isl=system \
- --with-osl=no \
- $(use_enable static-libs static)
-}
-
-# The default src_test() fails, so we'll just run these directly
-multilib_src_test () {
- echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
- emake -j1 check
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
+++ /dev/null
-add support for isl-0.15+
-
---- a/source/isl/domain.c
-+++ b/source/isl/domain.c
-@@ -68,25 +68,39 @@
- void cloog_domain_print_constraints(FILE *foo, CloogDomain *domain,
- int print_number)
- {
-+ isl_printer *printer;
- isl_basic_set *bset;
- isl_set *set = isl_set_from_cloog_domain(domain);
-
-- if (print_number)
-- isl_set_print(set, foo, 0, ISL_FORMAT_EXT_POLYLIB);
-- else {
-+ printer = isl_printer_to_file(isl_set_get_ctx(set), foo);
-+ printer = isl_printer_set_indent(printer, 0);
-+ printer = isl_printer_set_prefix(printer, NULL);
-+ printer = isl_printer_set_suffix(printer, NULL);
-+
-+ if (print_number) {
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_print_set(printer, set);
-+ } else {
- assert(isl_set_n_basic_set(set) == 1);
- bset = isl_set_copy_basic_set(set);
-- isl_basic_set_print(bset, foo,
-- 0, NULL, NULL, ISL_FORMAT_POLYLIB);
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_POLYLIB);
-+ isl_printer_print_basic_set(printer, bset);
- isl_basic_set_free(bset);
- }
-+
-+ isl_printer_free(printer);
- }
-
-
- void cloog_scattering_print_constraints(FILE *foo, CloogScattering *scattering)
- {
-+ isl_printer *printer;
- isl_map *map = isl_map_from_cloog_scattering(scattering);
-- isl_map_print(map, foo, 0, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_to_file(isl_map_get_ctx(map), foo);
-+ printer = isl_printer_set_indent(printer, 0);
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_print_map(printer, map);
-+ isl_printer_free(printer);
- }
-
-
-@@ -343,6 +357,7 @@
- void cloog_domain_print_structure(FILE *file, CloogDomain *domain, int level,
- const char *name)
- {
-+ isl_printer *printer;
- int i ;
- isl_set *set = isl_set_from_cloog_domain(domain);
-
-@@ -358,7 +373,11 @@
- for (i = 0; i < level+1; ++i)
- fprintf(file, "|\t");
-
-- isl_set_print(set, file, 0, ISL_FORMAT_ISL);
-+ printer = isl_printer_to_file(isl_set_get_ctx(set), file);
-+ printer = isl_printer_set_indent(printer, 0);
-+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+ printer = isl_printer_print_set(printer, set);
-+ isl_printer_free(printer);
-
- fprintf(file, "\n");
- }
---- a/source/isl/constraints.c
-+++ b/source/isl/constraints.c
-@@ -450,7 +450,7 @@ CloogConstraintSet *cloog_constraint_set_copy(CloogConstraintSet *constraints)
- {
- isl_basic_set *bset;
- bset = cloog_constraints_set_to_isl(constraints);
-- return cloog_constraint_set_from_isl_basic_set(isl_basic_set_dup(bset));
-+ return cloog_constraint_set_from_isl_basic_set(isl_basic_set_copy(bset));
- }
-
-