[gentoo-commits] gentoo-x86 commit in dev-libs/cloog/files: cloog-0.18.3-isl-0.15.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/cloog/files: cloog-0.18.3-isl-0.15.patch

[Mike Frysinger (vapier)]

vapier      15/07/15 03:32:39

  Added:                cloog-0.18.3-isl-0.15.patch
  Log:
  Fix building w/isl-0.15.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.1                  dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch?rev=1.1&content-type=text/plain

Index: cloog-0.18.3-isl-0.15.patch
===================================================================
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");
 }

https://groups.google.com/d/msg/isl-development/362AYAibze4/STY799KhdHMJ

--- a/source/isl/constraints.c
+++ a/source/isl/constraints.c
@@ -438,6 +438,8 @@
 }
 
 
+/* Newer isl doesn't declare this in the headers, but it still exports the symbol ... */
+extern struct isl_basic_set *isl_basic_set_dup(struct isl_basic_set *bset);
 
 /**
  * cloog_constraint_set_copy function:

[gentoo-commits] gentoo-x86 commit in dev-libs/cloog/files: cloog-0.18.3-isl-0.15.patch

[Mike Frysinger (vapier)]

vapier      15/07/15 08:39:03

  Modified:             cloog-0.18.3-isl-0.15.patch
  Log:
  Update isl API based on upstream feedback.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.2                  dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch?r1=1.1&r2=1.2

Index: cloog-0.18.3-isl-0.15.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cloog-0.18.3-isl-0.15.patch	15 Jul 2015 03:32:39 -0000	1.1
+++ cloog-0.18.3-isl-0.15.patch	15 Jul 2015 08:39:03 -0000	1.2
@@ -69,17 +69,14 @@
  
  	fprintf(file, "\n");
  }
-
-https://groups.google.com/d/msg/isl-development/362AYAibze4/STY799KhdHMJ
-
 --- a/source/isl/constraints.c
-+++ a/source/isl/constraints.c
-@@ -438,6 +438,8 @@
++++ 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));
  }
  
  
-+/* Newer isl doesn't declare this in the headers, but it still exports the symbol ... */
-+extern struct isl_basic_set *isl_basic_set_dup(struct isl_basic_set *bset);
- 
- /**
-  * cloog_constraint_set_copy function: