From: Keri Harris Date: Wed, 28 Feb 2007 08:01:40 +0000 (+0000) Subject: Handle bounded arithmetic in jpl test suite. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c14c415e8c7c5c04e2bc1806fcdc4c5ada07339;p=gentoo.git Handle bounded arithmetic in jpl test suite. Package-Manager: portage-2.1.2-r11 --- diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 92e6e621f92e..6ec41dfc54af 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/swi-prolog # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.70 2007/02/27 09:07:04 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.71 2007/02/28 08:01:40 keri Exp $ + + 28 Feb 2007; keri + +files/swi-prolog-jpl-bounded-arith.patch, swi-prolog-5.6.25.ebuild, + swi-prolog-5.6.27.ebuild, swi-prolog-5.6.28.ebuild, + swi-prolog-5.6.29.ebuild: + Handle bounded arithmetic in jpl test suite. Reported by Christian + Faulhammer in #168534. *swi-prolog-5.6.29 (27 Feb 2007) diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 4efb6a98aaf1..4f67c27d624e 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -82,6 +82,10 @@ AUX swi-prolog-jpl-PLARCH.patch 311 RMD160 91a4b95a41b7986da49e8b3443617bf51e287 MD5 8d505cb837b5d78743b1be627063db3d files/swi-prolog-jpl-PLARCH.patch 311 RMD160 91a4b95a41b7986da49e8b3443617bf51e287523 files/swi-prolog-jpl-PLARCH.patch 311 SHA256 c3be68aad2be2e0bf08769cb743cece20b47fe198f3d3e87601554188bf0ec89 files/swi-prolog-jpl-PLARCH.patch 311 +AUX swi-prolog-jpl-bounded-arith.patch 1030 RMD160 11b077cc4045ee55d80c77c18e78d8f71b46479e SHA1 dcf6c61bb7be943f8eb54402f4af1dc6245165bc SHA256 0b32554f393e900333867fbc9b7e50d222b87aedde2473da8233b4aaab8204c0 +MD5 4f6919f463ba234b3d3b6837d443ae3f files/swi-prolog-jpl-bounded-arith.patch 1030 +RMD160 11b077cc4045ee55d80c77c18e78d8f71b46479e files/swi-prolog-jpl-bounded-arith.patch 1030 +SHA256 0b32554f393e900333867fbc9b7e50d222b87aedde2473da8233b4aaab8204c0 files/swi-prolog-jpl-bounded-arith.patch 1030 AUX swi-prolog-jpl-check_java-r1.patch 1898 RMD160 82f382273945b3516253c88f7dd825c2efe9bf0a SHA1 10f91fec428bf53072682dff260ab42b22aeb875 SHA256 fb188220963c758746f2f95b3849466ad52b1aea2b4f1d414fd3c553ee15940c MD5 f9b976888861710f6d43158d7b44f5a9 files/swi-prolog-jpl-check_java-r1.patch 1898 RMD160 82f382273945b3516253c88f7dd825c2efe9bf0a files/swi-prolog-jpl-check_java-r1.patch 1898 @@ -230,26 +234,26 @@ EBUILD swi-prolog-5.6.24.ebuild 3442 RMD160 e57b33a2d5e3f911cd5abc5e815191544342 MD5 526d97ded7389423ff88faed8c9aeb91 swi-prolog-5.6.24.ebuild 3442 RMD160 e57b33a2d5e3f911cd5abc5e8151915443426a9f swi-prolog-5.6.24.ebuild 3442 SHA256 05a0ba0adb0321b21ac543124a86fd67719577f03d7308fd47b8ce6254512517 swi-prolog-5.6.24.ebuild 3442 -EBUILD swi-prolog-5.6.25.ebuild 3876 RMD160 d3b32a680732a82b574f208228ead341b8c508da SHA1 1b9cf8047672ce29d2452bfb73964f3d132417db SHA256 d3fe47525bccbe08967e18261dc12883d8bf670c9f47881602c0380b2d74e0f3 -MD5 bbbc38e95c1ad8d707a13979f37cf4cd swi-prolog-5.6.25.ebuild 3876 -RMD160 d3b32a680732a82b574f208228ead341b8c508da swi-prolog-5.6.25.ebuild 3876 -SHA256 d3fe47525bccbe08967e18261dc12883d8bf670c9f47881602c0380b2d74e0f3 swi-prolog-5.6.25.ebuild 3876 -EBUILD swi-prolog-5.6.27.ebuild 3727 RMD160 45b860c518f00036651fdf8e21ac2eb58022ddeb SHA1 5eb74c0b23df4ab839f9c92cfdc49a285ada028a SHA256 c326e316725bcbdf380884db010e17792f5362ca906c3f3aad747371fda32604 -MD5 714a90eeb508c8457f05ad7cd4e24a46 swi-prolog-5.6.27.ebuild 3727 -RMD160 45b860c518f00036651fdf8e21ac2eb58022ddeb swi-prolog-5.6.27.ebuild 3727 -SHA256 c326e316725bcbdf380884db010e17792f5362ca906c3f3aad747371fda32604 swi-prolog-5.6.27.ebuild 3727 -EBUILD swi-prolog-5.6.28.ebuild 3818 RMD160 d1d739c1a94f367aec47467c1d663eb0f2c2f9c8 SHA1 daa8086c60964d172a904cf4120a07df67dd2168 SHA256 fdae73b4d87f6d6775de9aa713eb8dc337af9168d36b34185a6a060af02b3896 -MD5 debdd339e21779fa4414292585f7815d swi-prolog-5.6.28.ebuild 3818 -RMD160 d1d739c1a94f367aec47467c1d663eb0f2c2f9c8 swi-prolog-5.6.28.ebuild 3818 -SHA256 fdae73b4d87f6d6775de9aa713eb8dc337af9168d36b34185a6a060af02b3896 swi-prolog-5.6.28.ebuild 3818 -EBUILD swi-prolog-5.6.29.ebuild 3726 RMD160 8d45b3c8e8375a4f58266082bf50f8d018d417e4 SHA1 53462ec36707448b90b62002201d8bdba5ce32e0 SHA256 1b58b94eeadaa5cc16be28080261010c239db67331ca545effb2c88dbbbbfd5d -MD5 e7318166732881a71bd688fde1b57fd8 swi-prolog-5.6.29.ebuild 3726 -RMD160 8d45b3c8e8375a4f58266082bf50f8d018d417e4 swi-prolog-5.6.29.ebuild 3726 -SHA256 1b58b94eeadaa5cc16be28080261010c239db67331ca545effb2c88dbbbbfd5d swi-prolog-5.6.29.ebuild 3726 -MISC ChangeLog 13801 RMD160 a10187f8b844a6de86aeb0f5cc718efd378364fe SHA1 abaa16e749ba04364614ee7042a806cf2224b967 SHA256 35a2199901e57a7a7dc0dec2ac6a9c9a80bc3b0e031b08d7bb45dd287991fb34 -MD5 bd1110f0a5f171757525d76be03e73bd ChangeLog 13801 -RMD160 a10187f8b844a6de86aeb0f5cc718efd378364fe ChangeLog 13801 -SHA256 35a2199901e57a7a7dc0dec2ac6a9c9a80bc3b0e031b08d7bb45dd287991fb34 ChangeLog 13801 +EBUILD swi-prolog-5.6.25.ebuild 3928 RMD160 9f90a67d8c1475995ebd184bb477b1b463aa2716 SHA1 41e07b3b7710731492300fa53809ade9e05da47b SHA256 3bffc306736a74df0b8620fa6aee6eab1e57c8467d3a2e5900d78730c08e496e +MD5 db1f38b7e94e68bdf1f54dc1d53459a1 swi-prolog-5.6.25.ebuild 3928 +RMD160 9f90a67d8c1475995ebd184bb477b1b463aa2716 swi-prolog-5.6.25.ebuild 3928 +SHA256 3bffc306736a74df0b8620fa6aee6eab1e57c8467d3a2e5900d78730c08e496e swi-prolog-5.6.25.ebuild 3928 +EBUILD swi-prolog-5.6.27.ebuild 3779 RMD160 dc24ab6d20c1696bd2ad167f6a6ed717a6dce59f SHA1 9d98c7ca3adbf45761d6e391f742a3f8f15e1963 SHA256 0062ffb8bff15bbbc447997a75ef9423461e2cc35b4b65e4196401e4194616b5 +MD5 bc41c8ce2e6ce090c52a76356e2c7407 swi-prolog-5.6.27.ebuild 3779 +RMD160 dc24ab6d20c1696bd2ad167f6a6ed717a6dce59f swi-prolog-5.6.27.ebuild 3779 +SHA256 0062ffb8bff15bbbc447997a75ef9423461e2cc35b4b65e4196401e4194616b5 swi-prolog-5.6.27.ebuild 3779 +EBUILD swi-prolog-5.6.28.ebuild 3870 RMD160 e5f92c99106a5162951d6115158c7c293a87c567 SHA1 a95d5505220b9e50ad60d8fdce54639767f418cc SHA256 c759c9cbac239cb575ef982f771d5b0d98535f041d108646cab4a36d1fbda907 +MD5 5eb18896a11a593bc55b1c75ff7b49a1 swi-prolog-5.6.28.ebuild 3870 +RMD160 e5f92c99106a5162951d6115158c7c293a87c567 swi-prolog-5.6.28.ebuild 3870 +SHA256 c759c9cbac239cb575ef982f771d5b0d98535f041d108646cab4a36d1fbda907 swi-prolog-5.6.28.ebuild 3870 +EBUILD swi-prolog-5.6.29.ebuild 3778 RMD160 92cd410b0ba2447e275d792825ad66f0c2d7b7b6 SHA1 996d2c5d7f81ec973efcc65cc82aec1915305cbf SHA256 ce84f78def1a451dea0c16a342c1cfaee899789a7a2296827c7405ba461a6d28 +MD5 c0ba1b4d589344d5541ba7bab37f5ef3 swi-prolog-5.6.29.ebuild 3778 +RMD160 92cd410b0ba2447e275d792825ad66f0c2d7b7b6 swi-prolog-5.6.29.ebuild 3778 +SHA256 ce84f78def1a451dea0c16a342c1cfaee899789a7a2296827c7405ba461a6d28 swi-prolog-5.6.29.ebuild 3778 +MISC ChangeLog 14087 RMD160 fbc2a4843de10c6baef26d9a5cf2f3bfe700c64a SHA1 8aa2bd816ad13244324564183a233ad21bb6a7a2 SHA256 80220071c583fc12ebc62ab1679ed69457665e44fe6a839214b5542d9e774eee +MD5 697e43e41edcfb25f9d5d0470cebc8aa ChangeLog 14087 +RMD160 fbc2a4843de10c6baef26d9a5cf2f3bfe700c64a ChangeLog 14087 +SHA256 80220071c583fc12ebc62ab1679ed69457665e44fe6a839214b5542d9e774eee ChangeLog 14087 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch new file mode 100644 index 000000000000..ef42960da2a9 --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch @@ -0,0 +1,30 @@ +--- pl-5.6.25.orig/packages/jpl/jpl.pl 2006-12-20 21:55:19.000000000 +1300 ++++ pl-5.6.25/packages/jpl/jpl.pl 2007-02-28 20:42:38.000000000 +1300 +@@ -4123,13 +4123,13 @@ + ; I < 2**15 -> T = char_short + ; I < 2**16 -> T = char_int + ; I < 2**31 -> T = int +- ; I < 2**63 -> T = long ++ ; I =< 9223372036854775807 -> T = long + ; T = overlong + ) + ; I >= -(2**7) -> T = byte + ; I >= -(2**15) -> T = short + ; I >= -(2**31) -> T = int +- ; I >= -(2**63) -> T = long ++ ; I >= -9223372036854775808 -> T = long + ; T = overlong + ). + +--- pl-5.6.25.orig/packages/jpl/test_jpl.pl 2006-11-22 21:38:20.000000000 +1300 ++++ pl-5.6.25/packages/jpl/test_jpl.pl 2007-02-28 20:34:39.000000000 +1300 +@@ -1038,7 +1038,8 @@ + [ setup(( + jpl_new( array(long), 3, A), + ( current_prolog_flag( bounded, true) +- -> current_prolog_flag( max_integer, V) ++ -> current_prolog_flag( max_integer, MI), ++ V is 10.0*MI + ; V is 2**63 + ) + )), diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild index ec37e2ca64a7..8a76afd6eb24 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.8 2007/02/27 07:57:23 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.9 2007/02/28 08:01:40 keri Exp $ inherit eutils java-pkg-opt-2 @@ -46,6 +46,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch + epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch epatch "${FILESDIR}"/${PN}-jpl-junit.patch epatch "${FILESDIR}"/${PN}-jpl-check_java.patch epatch "${FILESDIR}"/${PN}-ltx2htm.patch diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild index 3bb2f64f5390..ae06ee60144d 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.6 2007/02/27 07:57:23 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.7 2007/02/28 08:01:40 keri Exp $ inherit eutils java-pkg-opt-2 @@ -46,6 +46,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch + epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch epatch "${FILESDIR}"/${PN}-jpl-junit.patch epatch "${FILESDIR}"/${PN}-jpl-check_java.patch epatch "${FILESDIR}"/${PN}-ltx2htm.patch diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild index f7e8025def4a..b2a9b809528b 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.8 2007/02/27 07:57:23 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.9 2007/02/28 08:01:40 keri Exp $ inherit eutils java-pkg-opt-2 @@ -47,6 +47,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-errno.patch epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch + epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch epatch "${FILESDIR}"/${PN}-jpl-junit.patch epatch "${FILESDIR}"/${PN}-jpl-check_java-r1.patch epatch "${FILESDIR}"/${PN}-ltx2htm.patch diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild index 4bbc1aa93cd5..49d9a2567c91 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild,v 1.1 2007/02/27 09:07:04 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild,v 1.2 2007/02/28 08:01:40 keri Exp $ inherit eutils java-pkg-opt-2 @@ -46,6 +46,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch + epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch epatch "${FILESDIR}"/${PN}-jpl-junit.patch epatch "${FILESDIR}"/${PN}-jpl-check_java-r1.patch epatch "${FILESDIR}"/${PN}-ltx2htm.patch