summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-07-15 03:32:40 +0000
committerMike Frysinger <vapier@gentoo.org>2015-07-15 03:32:40 +0000
commitd7174ac3d43abe20a2517feeedcc9bb89f34b7a5 (patch)
treef7e45ac375f050d01f1dd0e9562b455286eb200e /dev-libs/cloog
parentadding an option to conf.d for bug 554132 (diff)
downloadhistorical-d7174ac3d43abe20a2517feeedcc9bb89f34b7a5.tar.gz
historical-d7174ac3d43abe20a2517feeedcc9bb89f34b7a5.tar.bz2
historical-d7174ac3d43abe20a2517feeedcc9bb89f34b7a5.zip
Fix building w/isl-0.15.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-libs/cloog')
-rw-r--r--dev-libs/cloog/ChangeLog6
-rw-r--r--dev-libs/cloog/Manifest31
-rw-r--r--dev-libs/cloog/cloog-0.18.3.ebuild9
-rw-r--r--dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch85
4 files changed, 113 insertions, 18 deletions
diff --git a/dev-libs/cloog/ChangeLog b/dev-libs/cloog/ChangeLog
index 90b697ad56b4..e0365cb1b84f 100644
--- a/dev-libs/cloog/ChangeLog
+++ b/dev-libs/cloog/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/cloog
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/ChangeLog,v 1.31 2015/04/13 08:58:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/ChangeLog,v 1.32 2015/07/15 03:32:39 vapier Exp $
+
+ 15 Jul 2015; Mike Frysinger <vapier@gentoo.org>
+ +files/cloog-0.18.3-isl-0.15.patch, cloog-0.18.3.ebuild:
+ Fix building w/isl-0.15.
13 Apr 2015; Agostino Sarubbo <ago@gentoo.org> cloog-0.18.1.ebuild:
Stable for alpha, wrt bug #545124
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 24e666ea552a..5b62bc1f04b5 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,29 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX cloog-0.18.3-isl-0.15.patch 2602 SHA256 621345404fc2cba1137da5c328d8496a5245f8e5cae936de539cf61efdbf33f9 SHA512 9e2d2a8d118783643ad6bc8c85079e127332a290901dc285ca54f36a58c5f82b32840f5f40c99f0e9f8075f4acfb8b62ccd8d2eeac5b027504a49ab571e1fd21 WHIRLPOOL ec140480a5ce2e5cd818c0e822b18ae8fd1915a61897d67af6b78570459e59ca5733d4f42e34893f39bc0a48700e428feb54101c1d7912200624514099e9d3fb
DIST cloog-0.18.0.tar.gz 3776262 SHA256 1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228 SHA512 34404984c4269dfc19673712271b08f220b6b49e451e7479cefbc5d2f27ab8e780f5d51fbbc7cecb974dab655673d8348f2a1ece3a60feaeeb9413fccf16eb1d WHIRLPOOL e079de53e876448f1e9b783c864b820ebae39fca4f51d59e2528b1b68530910c48b23719e3fd760bf105e03838651e15f367709a2c8dde022627fe3f158134ea
DIST cloog-0.18.1.tar.gz 3857324 SHA256 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196 SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9 WHIRLPOOL 7e5497cdc6d3df14305f848f0222ab41890c9a1a4668e1ccb8afc2b9f14b8c8b65f80a2fec6d6a94d1b91cf83b741d0108815707eb29aa59a439ed2c07f27378
DIST cloog-0.18.3.tar.gz 4577597 SHA256 460c6c740acb8cdfbfbb387156b627cf731b3837605f2ec0001d079d89c69734 SHA512 14fc2af0da62cd17b1a9f5a7a1704da6bfe5dc78639928637588203e61847795a652ff788c313c34b6e7dd85fb329678eb4f72e0e1c9c149be6619ebf046cff8 WHIRLPOOL b35a16151c209500af836cb8ad32ec6479a01d2994860a379599e7a2183eab452dcffa757bad8c2af867cb71716c588415924b8c91db895372de88131b650490
EBUILD cloog-0.18.0.ebuild 972 SHA256 39026dfe0fb33662bd0b8276ab4184b1fc22c514a37791da6c83d0f6eaaeeacc SHA512 781256d90396c41f720922e316d8e3eecc438955ab9598cd5b221e36799a9053f4de4090b21f51295fd9fce99f3d43e24399f4e027a9012c7760a7d344ccc470 WHIRLPOOL 78b6e92d9ae1f8e2b90ed7be7349c6324be9641104133ae03f80a627ddaee9c3f21d8873fbe32f00296aba6744da6af8cfcd363c4cc28d065d2621ba1fce6687
EBUILD cloog-0.18.1.ebuild 1109 SHA256 eaeb3f6dab2f1d31cb00cbd5014d29059ff74c5b1655e4dda0f0a4672e8dabc6 SHA512 a12239545aded198a993adc6fd4122282c89dc6fff0dab10a06c55e75d72c1b72d3562e3e4424cc434d4672d37eba0c6f95489c58c8963f3e93d4c21f67174f0 WHIRLPOOL b34b0578585058d94e36c55aae770f93a02e7d7b14ff5aaf45f65c4906933733489369c50e70e2faf220f71142a76e2d6987e6a6a9c18682d7a40e7b41c15fdd
-EBUILD cloog-0.18.3.ebuild 1493 SHA256 65bf7c164e5cad9cf05172231b7367e04621258a51908ef9397d8a2ab523cac0 SHA512 616218fa1893c58fa728f9872e0e955e674ad95213c6fe31edc497bc30a368c0899fda9ec4fd12a776ccbfa75b61dc154b3543694498fa7eaabf11805411a54d WHIRLPOOL 31a77cb1d3720794f1554f650235b56d4c4314b2ed408c9b3cc9db0a5c1068ae0e4ef0c943daf6b344a3cf3edd1043c6d6cff92ceb5b5047cc302a8d9537367a
+EBUILD cloog-0.18.3.ebuild 1590 SHA256 55d01a8d12ca64fa7eb99294c0fa8579e10336fa36fd1e7a17f62ca1926f47df SHA512 28fee6078bb18c9a9394b2a9e057ab8b4c677b8af83f68b908c3122512cc09f1068db524186b1c2e39149e08d2fd49d5a04338080fade3a8c7b111ef35436ab4 WHIRLPOOL 28da95cb7bcd536f38cd325783df545f2c54740d3090930e38a998736345921d25b45360fddb66a11dbecd497a389098a97563ba1a310daeffa7649a350fd193
EBUILD cloog-9999.ebuild 1333 SHA256 6d96f3f8e72c4da922d857ad49ffc5752eb9d5103af5bb2bc9657e609a867bd5 SHA512 2f581f77112a240d2a43fc0078934ff1db03ae544fba6e84cb71fb9230a6a8fa55991ac49c97388d312e520463ea19528e1cd1d4c447e9e59324db528c69f906 WHIRLPOOL 3411b3aefcb404a3b202070b3bf9b11938487468753ee0139c3c8f47493412b3eb11d7285273f80f659209bd2b976604c2be5e1c410b6c62d9513b3c1d45ee0f
-MISC ChangeLog 4334 SHA256 3ff165771539cfac2e2a67513025cf0764106935e156b0e84aa29b5fa43b938f SHA512 bf490affefad213a55d6059dc61e7a4f3bb6a167894e78553b08dc75807028a2cee8662e0276149e35a963ad9dbef275c5cda1d2b9a33c1500549f294472aff0 WHIRLPOOL 8445be493820d0d27d093c0b9169ad06a005f339e105003702b4a4f9d4bf102b2c9ca446400a8bda1e4619503026c47d2ee81c3abf0721e08a29cd0e1527c4e2
+MISC ChangeLog 4474 SHA256 f617ef2cac534064c8a8b033a70373ffbf51550eea021521acb9e37da8a0d4b4 SHA512 d7184b334ab9df0458b80ed2e333ef66a43332126e0428d9c0f7750bda882c4a4489a3773f7da6ed688bfec1e29512b5d96635f90da3a1c7ac7cb6e2f2dda775 WHIRLPOOL cfaa2cada8833396d385d6146277f7eab8f52f0231843249cd65255d2954b66f395eb7f134a9cc39011cae8c5e3cf5a3363c38b8d905e2200036ccc3e82f36b1
MISC metadata.xml 230 SHA256 15b25471afdabcaf32e2d45f2bee7575d349e323f0aa1e6bac9435c35dcd9a60 SHA512 2fc852dd6ff117d199eca85ee24e5d20e16fb2072ea00bd7a217f3a0841120393e5bcb994902dd8c9a4d1488ccac59774cddda844f4d51e16a8d7581fdd7d3c0 WHIRLPOOL 5f8a73e1b50c38fd9f761c766b70d662abbf6c1738d2a7bb71b6be79bd5136fc7f8bc61e5d98d8c9b8afe6625061de49ac00488007edb7591fa99915ee0868c7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJVK4U/AAoJELp701BxlEWfjbcQAIpRbBdSgFKyrU92DjULMPR3
-Jh3G4nWqEGrORJbcV0mW5cMoY02drHoKMsc3SNEo5rcGCJkRP9GeBnr1h0+z4EMB
-vyrDagYaxooWgOywU9+x/63W41I/+T7nIclA1NYEGN3R0zTvnDDty1hUHb3E3b6b
-C4t6UtZkjLcrH1gyZ/fP1WmEG1tUPVl5eNoPZF6CJXCKCMd/V5CdUuL83PgO5dAG
-ZShzrn5fp8MkGliJP2kIuWELUvFejbQPLZ8UmKg3Ut7S3aP2wfk3uaEsbUeF8s8Z
-7I9P/eKySLANn1A8/NALFUfslQTAJT57Jj8B35BfhPBHjG8LaPSLHjwdt9Z+ahg+
-4xmBjwS7zWZ3YEPlXnuaGf4OaL8SGZqH+Jq7C48ILQybJ4PPoxbVXAcRLlrrDp3l
-FhUlKruLfjqZArRxoYECmx2FQY9XzANlUyKAxkYSlDnk7bN4e1+ZImyGRQ/pST+3
-IetfOH+0bnUDWOUI2ofwh3uYO1mdXIkY9y3d9fEEjGn3NhPzdMpiYKDJOvPn9ofO
-tZ358qTg8JnQNCC48qkQpnTRdhR5hU42a7usT/3CY/Aa3J12R1dMdt0aRwOPH4wn
-AIssiH4vOrUX7Kcgk4RYwmNJWouOnQDrYwwvrtyP6zY76LWKUClgH/GnXjjeF1Cx
-yIj39hqizgYkpO3+Nd0r
-=QaKp
+iQIcBAEBCAAGBQJVpdRXAAoJEPGu1DbS6WIABgMP/1vtOIitQDw3H49N0nWHO5Wa
+wLsN/uJJCN8ZrPjdYYPX0DqT8JOfytA3Dxfj+2QaXfkZ8Ih4Jw/8PQDWfLGXozex
+96xfq5JFiOz7ZeZeer6dcaFLIHt1qDWXlyLL/mJg8gj1bGsDMWZvYqdwOtIFv6mC
+mO7H16bzci88/6l1VjFJASNag01vfIx2BgN244OIGoN1A7adxcmfYskSuhyYHTad
+BSa2EnEhbYLjm9hSwX6+JMo+9fJnjuE3vvF0cghJxKAtOrq8wOXF8KHi1YKKVmTD
+a5MfChp7tN4hRW7nE749DI+7+tsJvvbiVQwyamg0qiS3LrqQj7ckxUX9VrUAYlYp
+rU/ARUwZ72dDdkTJahbTEUGtfriQOYXsR7YvBayibttG2wjERywrtiowhGlG24Rg
+2TZr/G69btnh0wdC76XxZCYQD4PvsjKe7L4CDW6TDgfK/V/3AR/U4mPQJF21tS43
+ZRvpZriknWAHQTz7Ng8JTFzziYNcZC+8tBLYT66I2/cwLMf3Tr7HEgc9OdvbbHns
+ZzvxZ2AF/+Yrmd/MVmc4edmfTHxEw5RBK8r01Mlw0YrCvXqbaQ4ZfxdFbmG/fxIt
+rnXKPR68AyFaI77Q++WGVXoTF4ZJ3XuPM1MAyYpL9cimvmvaH9LyF1nvf4iRhDqn
+7z2Cx/EKltNFKbZWx+aU
+=3Z9v
-----END PGP SIGNATURE-----
diff --git a/dev-libs/cloog/cloog-0.18.3.ebuild b/dev-libs/cloog/cloog-0.18.3.ebuild
index 40eecd46073e..9388ae991bc6 100644
--- a/dev-libs/cloog/cloog-0.18.3.ebuild
+++ b/dev-libs/cloog/cloog-0.18.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/cloog-0.18.3.ebuild,v 1.3 2015/03/17 05:29:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/cloog-0.18.3.ebuild,v 1.4 2015/07/15 03:32:39 vapier Exp $
EAPI="5"
@@ -22,7 +22,7 @@ SLOT="0/4"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
- >=dev-libs/isl-0.14:0/14[${MULTILIB_USEDEP}]
+ >=dev-libs/isl-0.14:0=[${MULTILIB_USEDEP}]
!dev-libs/cloog-ppl"
DEPEND="${DEPEND}
virtual/pkgconfig"
@@ -38,6 +38,11 @@ src_prepare() {
# 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() {
diff --git a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch b/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch
new file mode 100644
index 000000000000..e28afddd48d7
--- /dev/null
+++ b/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch
@@ -0,0 +1,85 @@
+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: