diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-12-20 01:31:21 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-12-20 01:31:21 +0000 |
commit | f8440d50b6a63fb4c7bce7b9124a69a653e49081 (patch) | |
tree | 566f78b9380c0cd6be25aeddeff30edc0e266ec5 /dev-libs | |
parent | Beta channel bump. (diff) | |
download | historical-f8440d50b6a63fb4c7bce7b9124a69a653e49081.tar.gz historical-f8440d50b6a63fb4c7bce7b9124a69a653e49081.tar.bz2 historical-f8440d50b6a63fb4c7bce7b9124a69a653e49081.zip |
Version bump.
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/mpfr/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/mpfr/Manifest | 25 | ||||
-rw-r--r-- | dev-libs/mpfr/files/3.1.1/patch01 | 235 | ||||
-rw-r--r-- | dev-libs/mpfr/files/3.1.1/patch02 | 170 | ||||
-rw-r--r-- | dev-libs/mpfr/mpfr-3.1.1_p2.ebuild | 69 |
5 files changed, 505 insertions, 2 deletions
diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog index 375fae86c963..bafd1a8ff61f 100644 --- a/dev-libs/mpfr/ChangeLog +++ b/dev-libs/mpfr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/mpfr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.152 2012/07/05 02:05:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.153 2012/12/20 01:31:15 vapier Exp $ + +*mpfr-3.1.1_p2 (20 Dec 2012) + + 20 Dec 2012; Mike Frysinger <vapier@gentoo.org> +files/3.1.1/patch01, + +files/3.1.1/patch02, +mpfr-3.1.1_p2.ebuild: + Version bump. *mpfr-3.1.1 (05 Jul 2012) diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest index 21ec90930516..3528503debbf 100644 --- a/dev-libs/mpfr/Manifest +++ b/dev-libs/mpfr/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 2.4.2/patch01 7136 SHA256 ff84b6a8626c79f869d5625d70900e1f99a37f623cb124fdd949dcbcf9f9757e SHA512 6abe563d839379e35c9cac37888d1996fa176453b5852b3bd725b952fbf5c72df898aa6a3be40632e5743264907e208b3b7a9f44a9d9a221b183eefd2c4fb134 WHIRLPOOL bd06a68155ab4ba69a5c6e8da933ad3538f8c7a69a0a266299b8d9d7ffe31f9466430655d0ac93bdab636a7bb8128b4c77761b815440e814a2e0c1a5f9a34a71 AUX 2.4.2/patch02 2538 SHA256 b61b3ff4abaf93e031d446be201c659275d1b49d1a02ac0a2de45e5fafd47f0b SHA512 481316ce216fd2d84c88d57e24dac66abdfa3e32737752b70211c80523c909fb6742398971ef75e63039803da4dcfd564316df7722b6756d3da2d5e8ad3b1e21 WHIRLPOOL 95f4134d6972a582d66c1a95cc1362fba357a36ebf79c96422cb415838882be7a6c11c11eb2f9d73d68c31a65a3279c9f73eb72cb042b5523a7bedc1a9474cb2 AUX 2.4.2/patch03 2544 SHA256 999bc180dbeb666cd0301e506f79c7394032bcfb81ca8ded85234d1e5f5563ce SHA512 78ed52e534e11348a49f0eaeef3381484d310c927f1c45fb315ecb0e18eab8cc53a8008a8b76bd14a6c241142ae4291aa3a9d49875e168bfc5c8b3dbf0eda972 WHIRLPOOL 8dda8a6d74eb4bdcd0596d4676ab856331187c6a93c23f8ccce79a74b892f8ed4ce21f90f0cd583a7a333a2292c8ecbc3ff549408fd7c5c43e64f7018ca0bcc7 @@ -15,6 +18,8 @@ AUX 3.1.0/patch04 6280 SHA256 265127d7bd2ab93a1ec689c49fdb35737075e3df22e6f91015 AUX 3.1.0/patch05 2690 SHA256 823ae84a55249f76b53ecdc4a17c4b834ca8e33f7710729f5cbb66982ff8a03b SHA512 475b07a0e45944e907f53e59ba37867dd055bb90ec05fd7b7ef5caabaa6eb1c14367b9b8bb276605a8c867bc775d74dd7dfc6496ee0c6fd4f66ea4ff26c720c8 WHIRLPOOL 6876dfa87ff77407ba91c5b9bd407ad2bdcd5663199f05c1dbbae8844e39b2d76c7c43fe053b6ec581579c1017da3bbdab62a480a205be16bcbc513ef41ed161 AUX 3.1.0/patch06 1906 SHA256 78448079c133e9a7da4832c7ce1065060fbeb3f43ebabd6f6e9a9cbccb402599 SHA512 878ad8757479535518dd8b251476ce76fc4d9bf0bdc7953565bd117c8c866e63bfc7656f59be65c4b59c268cabb0bab9cb3c294e27597385099ad995c5fc4e18 WHIRLPOOL a8b64819cff8fbb5ae86869dd1cd0fd37f85c05d024e6f12a046c89bddb14a6069acf611c8e5769aee4e5d2777fdbd788e870d11b13c852eb46639774db0ef21 AUX 3.1.0/patch07 25023 SHA256 adfda8ed246c75897523c0365dbe8f854500682eff5a88d1d4c16fbf0bbfe388 SHA512 403b9f88072fe64179b8c530f7651c4721ce721ee9dc22c20775266a8d6e3ba361b8112c2c8162fa143b4dec04b952aa6be997b56f1165d075f2be8fe90d7d6e WHIRLPOOL 7ffafcf8f85da52a1dc5a5cc965809b9905c74daa2cb1bce317b492786a05b668086a1f4d45f1885dee9371cb3f8c08e87bd347c9b713306d2ed651a337ba4af +AUX 3.1.1/patch01 7535 SHA256 81ba90e0ad8f13f5392626b3b06f9145071dbbfc2b21099f562bf7f51a5228a3 SHA512 34529426fda74a61eacff5a2eaf73ef7ca0d914a2aab4c730ffe656d304c8f6be0805f904e321957bfe81f5366b1ea38597b8041cf2f8f29ea47056fe58e9a5d WHIRLPOOL 5d740d9632ae038f07a8f6c479094a9b5d54a95c08995721a4966bc4ea97b3e5b7e62333e79857154ba1b1f33ce644e78a9253f40da3a5670c5883784c797871 +AUX 3.1.1/patch02 5460 SHA256 40d152b1e94ee2accb17a8d6b870378f7774739f6348c6205c4d6c5dccdb12cf SHA512 ccfc22d714fcdb5a747450ec1997fcbdd27c27f9c48e4c3d7bf613174bcd5ca0546eec0becbdaf1d1adb41cb2504f45b0b5dfc2024e384b81c80f1ed3bb3e110 WHIRLPOOL 8aecb34b8df10ee127727b473f4003e7e515d4247218a8134135c14c592e61f4b91c9fd202f0ab06f07af048464e6cac802bc0c0f7a83642cab14eb9dfd55273 DIST mpfr-2.4.2.tar.bz2 1077886 SHA256 c7e75a08a8d49d2082e4caee1591a05d11b9d5627514e678f02d66a124bcf2ba SHA512 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e WHIRLPOOL d08935d1c5cda48753ddbf98b3b0e87d911279d7fea24e6b210da7e2378f769f3b20babe96859601195d6a9811cf8297d239df53ad2cfa6d0a1bb7bb02ac6a29 DIST mpfr-3.0.0.tar.bz2 1138685 SHA256 8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f SHA512 f404a5ebc48624406ff62ddc7c75c75ae06c207b0cdb60d330e95f2782fca9cf4875f8b8389b666bc96d4f157afbdf270d39d95ae890fc7f81027f744632d016 WHIRLPOOL 195eaafca24f4c11472eebc400899244966ed2f087604c8827314ca64ce4bb282af5ff683a1ffaeba5034d0ef82dbb627a88e77af7c1832b78b2ecb5a82d1b77 DIST mpfr-3.0.1.tar.bz2 1154306 SHA256 e1977099bb494319c0f0c1f85759050c418a56884e9c6cef1c540b9b13e38e7f SHA512 bbac7d0d63fd3b4cd895e247c448adce7f4c2b6b66ecfe26af138018e0f96991fa8cbd8cbe94f924761aa1ac676e259af1228600dfc0854314e875e7739fd279 WHIRLPOOL 9d8e9fb6fd4c4526ae853e2bbf85c85dabe01000b0df6f79dcfdbb15f0df95f5a084f304e6e0bc78fbd768eecfb7749c5dfa03a772cc6444432dcaccb1c6adc9 @@ -29,5 +34,23 @@ EBUILD mpfr-3.0.1_p4.ebuild 1691 SHA256 273a3f471cae74920b783494379951de90989109 EBUILD mpfr-3.1.0.ebuild 1950 SHA256 42fc55acc6041b9f79979203afe52f4b19ff153d1f1c5a13ab9e968958dbd9df SHA512 0d9adc8d9cd835073ef5ea0536816c37198da6c65bd6daee128006acc7655d289fcfbf97ef94cd60ec24385298534d163b561069639ed8c42415a6966c54b3a8 WHIRLPOOL 0342f255bda325cfb311a58106043eaaf3d6e7b81254e8c8bfe711fdabd20bd1124529f3483c608c183b81d455c5aa01b5ccee6662284fc336ec8005c59e4d1f EBUILD mpfr-3.1.0_p7.ebuild 1967 SHA256 4c7e7da8207970d54881151022f8df714e31489cd7898e187f7f29396af611c0 SHA512 d6ed440cbd68e497588de1ad8dc652486b426b43ef37bd148c2c7ee34be5f1b20bc97b31eef634e4aefbcc9341edc84ebcf7cb31231b59b7e1fdce2c0069e734 WHIRLPOOL 99f47197a66b964da5fdc29d470fc26edd633ab4015147a3068598d3d35ff4ca617823fe5e695b545d38e6644f75799c919bfc525dbbdb145df5074675b63f1b EBUILD mpfr-3.1.1.ebuild 1961 SHA256 caae978ee0b24db4b043539bed710e6a9b7a90cefcf41d35aa577766c86db35f SHA512 be7780af56039ac037499beb7eb79ea520b83f17890f23444c4994abab42c62e3c660b8bd306b3e1cd626b2331d679dd546aafcda4b6a9e6a5d645206ffc53c8 WHIRLPOOL 63506ceeeb07255d3d3ee51c2ee25c70f311ad57bf473ff8461d0f1a0a2f1092ca7749be752ab619e461bcf9287d6945a47224f0831ef1f5cde93c6ab325c638 -MISC ChangeLog 19081 SHA256 0c3ecb92c7859af5fbabf930201c8d38a0837dcd1c700e1d5f551c9522ff1c07 SHA512 80242f930c8f4c7fd27ccdc014709a1628156308a8d206360357efd29ddae5d071f6ba526c72cf9c0014f89a1f412f549640933d464157fcc6bea9a65efaf9f3 WHIRLPOOL 6bb675e7830167905c73bf66f18e42f26595bd61c83cdc6c6c72149f4dd135be3f890ccac3dbd6199e85d4fef4ce1cfb20ada6ea5b3a0732d3ee25a84cb542c2 +EBUILD mpfr-3.1.1_p2.ebuild 1964 SHA256 a49fa3cc9fadb2da598692ede6fc49a8c36e122b32a6b61e69957a54db6f1491 SHA512 b57864305981adafba73fb3e24e27cc478722589a5de362c83e54c455a3ba989cc0a66e80fda9fe82e95ceef3ecc51e05e07aa0de05a2bfdc51e487ef819e0c9 WHIRLPOOL 4cc8b9ec124fdef570b57d36580c8838fb0e372b708f4a1fc0779af67bb14d4632f1769adb25f9d15b79ba8e208ba6f8322891b04052c62175b024aac052465f +MISC ChangeLog 19247 SHA256 6968fc1bb97380e8abcb9fa02a917314376520e891713083a09fb3187c2b69a7 SHA512 2330f420e532e4cd524db53cb5b921b923864fd3d88b9f8886bf7651884bf5a9b1d5249adae0510adb266ddbf255e01eae086e0091c3511904491d5657a6ebed WHIRLPOOL 51933d4d34bb8fb705a150d2cdc222f68ad062a95fbfc82695846334f7b4cca532826a4bc0701a359d9a4fbd339addbf56b3563f8910dc4c73743493248a6e75 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCAAGBQJQ0mpmAAoJELEHsLL7fEFW6HUP+QE8gEdGJ/050JdrGtXHuWMt +XSyJGpIiz+qgKf+eMWUrDE5SBVVCQcvmMCjDB2iqDSp7zlhYluX69NXgdx3kChsa +wvRRjHvsDc2gozKBWW7le+OFx0UBZ9GSct1OXTIkngoRY3q+dG71VcL7i0QAWPMC +h26ryPuB5x4dZeXzu7kU95l4nluqpPJnMx2J8FJ/MxFplZtum8hNts0bXoIUMIxo +GnR4pd9Z3vAYkJcyTjvX3N7fUOyH4CtoV4lZvF0TjndKLFkAW8Qp8vsFbT4tv1SJ +5r0Bt+4b0mzHP9L07QCAhQVJm9GkZBJY0+o31HoZyANNIdh4oGYwLT6zZndSBA2z +37HpdRXVtqcIF7uVR/sXx39LJjuOObOy9ca3zDI2nm2CipI9QbXDWOI0Is/MFjO6 +pifJdGh8WhjjOwlva5G+hS9LLGs6MraBK0eHr/J66YGhf0awaaw9uvlop3LCMtwm +w3McsAmxETaabU0HHg585cEaad/aG1mQsFRp9yzAe/8trHaojngKzLwNtJ9TvH1X +nKjEq6WTWG+mn8rBUcj/7omzwfXlDASP0McmXwqzLKuw3xnxoh/yhQMUlygOzKfY +NfYOs0PRcGVxSOG+26XHWOHkEbfrm8erL4tt34VlY3FOZK3HILny4gTzpZK6bE0M +4dZE0duRRvlgzZ/VVkNn +=arbT +-----END PGP SIGNATURE----- diff --git a/dev-libs/mpfr/files/3.1.1/patch01 b/dev-libs/mpfr/files/3.1.1/patch01 new file mode 100644 index 000000000000..d73a3d7b4fd8 --- /dev/null +++ b/dev-libs/mpfr/files/3.1.1/patch01 @@ -0,0 +1,235 @@ +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:28:51.000000000 +0000 +@@ -0,0 +1 @@ ++get_decimal64 +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-07-03 15:01:13.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:28:51.000000000 +0000 +@@ -1 +1 @@ +-3.1.1 ++3.1.1-p1 +diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c +--- mpfr-3.1.1-a/src/get_d64.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/get_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -32,6 +32,10 @@ + + #ifdef MPFR_WANT_DECIMAL_FLOATS + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + #ifdef DPD_FORMAT + static int T[1000] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, +@@ -142,26 +146,14 @@ + static _Decimal64 + get_decimal64_min (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 0; +- x.s.manh = 0; +- x.s.manl = 1; +- return x.d; ++ return negative ? - 1E-398dd : 1E-398dd; + } + + /* construct the decimal64 largest finite number with given sign */ + static _Decimal64 + get_decimal64_max (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 1919; +- x.s.manh = 1048575; /* 2^20-1 */ +- x.s.manl = ~0; +- return x.d; ++ return negative ? - DEC64_MAX : DEC64_MAX; + } + + /* one-to-one conversion: +@@ -334,7 +326,8 @@ + /* the largest decimal64 number is just below 10^(385) < 2^1279 */ + else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */ + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +@@ -354,6 +347,15 @@ + which corresponds to s=[0.]1000...000 and e=-397 */ + if (e < -397) + { ++ if (rnd_mode == MPFR_RNDN && e == -398) ++ { ++ /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal), ++ src should round to +/- 1E-398 in MPFR_RNDN. */ ++ mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA); ++ return e == -398 && s[negative] <= '5' ? ++ get_decimal64_zero (negative) : ++ get_decimal64_min (negative); ++ } + if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN + || (rnd_mode == MPFR_RNDD && negative == 0) + || (rnd_mode == MPFR_RNDU && negative != 0)) +@@ -379,7 +381,8 @@ + which corresponds to s=[0.]9999...999 and e=385 */ + else if (e > 385) + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-07-03 15:01:19.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1" ++#define MPFR_VERSION_STRING "3.1.1-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1"; ++ return "3.1.1-p1"; + } +diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c +--- mpfr-3.1.1-a/tests/tget_set_d64.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tget_set_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,6 +25,10 @@ + #include <stdlib.h> /* for exit */ + #include "mpfr-test.h" + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + /* #define DEBUG */ + + static void +@@ -149,6 +153,15 @@ + mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ); + mpfr_set (y, x, MPFR_RNDZ); + d = mpfr_get_decimal64 (x, MPFR_RNDU); ++ ASSERT_ALWAYS (d == DEC64_MAX); ++ mpfr_set_ui (x, 0, MPFR_RNDZ); ++ mpfr_set_decimal64 (x, d, MPFR_RNDZ); ++ ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); ++ ++ mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ); ++ mpfr_set (y, x, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDA); ++ ASSERT_ALWAYS (d == -DEC64_MAX); + mpfr_set_ui (x, 0, MPFR_RNDZ); + mpfr_set_decimal64 (x, d, MPFR_RNDZ); + ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); +@@ -225,6 +238,83 @@ + mpfr_clear (x); + } + ++static void ++check_overflow (void) ++{ ++ mpfr_t x; ++ int err = 0, neg, rnd; ++ ++ mpfr_init2 (x, 96); ++ for (neg = 0; neg < 2; neg++) ++ RND_LOOP (rnd) ++ { ++ _Decimal64 d, e; ++ mpfr_rnd_t r = (mpfr_rnd_t) rnd; ++ int sign = neg ? -1 : 1; ++ ++ e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX; ++ /* This tests the binary exponent e > 1279 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 1 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the decimal exponent e > 385 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 2 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the last else (-382 <= e <= 385) of get_d64.c */ ++ mpfr_set_decimal64 (x, e, MPFR_RNDA); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 3 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ } ++ mpfr_clear (x); ++ if (err) ++ exit (1); ++} ++ ++static void ++check_tiny (void) ++{ ++ mpfr_t x; ++ _Decimal64 d; ++ ++ /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round ++ to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between ++ 0 and 1E-398 is not a representable binary number, so that there ++ are no tests for it. */ ++ mpfr_init2 (x, 128); ++ mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_clear (x); ++} ++ + int + main (void) + { +@@ -241,6 +331,8 @@ + check_inf_nan (); + check_random (); + check_native (); ++ check_overflow (); ++ check_tiny (); + + tests_end_mpfr (); + return 0; diff --git a/dev-libs/mpfr/files/3.1.1/patch02 b/dev-libs/mpfr/files/3.1.1/patch02 new file mode 100644 index 000000000000..76dbc4534d25 --- /dev/null +++ b/dev-libs/mpfr/files/3.1.1/patch02 @@ -0,0 +1,170 @@ +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:35:12.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:35:12.000000000 +0000 +@@ -0,0 +1 @@ ++strtofr-ternary-value +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:35:12.000000000 +0000 +@@ -1 +1 @@ +-3.1.1-p1 ++3.1.1-p2 +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:35:12.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1-p1" ++#define MPFR_VERSION_STRING "3.1.1-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c +--- mpfr-3.1.1-a/src/strtofr.c 2012-07-03 15:01:16.000000000 +0000 ++++ mpfr-3.1.1-b/src/strtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -667,6 +667,20 @@ + /* (z, exp_z) = base^(exp_base-pstr_size) */ + z = result + 2*ysize + 1; + err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize); ++ /* Since we want y/z rounded toward zero, we must get an upper ++ bound of z. If err >= 0, the error on z is bounded by 2^err. */ ++ if (err >= 0) ++ { ++ mp_limb_t cy; ++ unsigned long h = err / GMP_NUMB_BITS; ++ unsigned long l = err - h * GMP_NUMB_BITS; ++ ++ if (h >= ysize) /* not enough precision in z */ ++ goto next_loop; ++ cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l); ++ if (cy != 0) /* the code below requires z on ysize limbs */ ++ goto next_loop; ++ } + exact = exact && (err == -1); + if (err == -2) + goto underflow; /* FIXME: Sure? */ +@@ -730,6 +744,7 @@ + MPFR_RNDN, rnd, MPFR_PREC(x))) + break; + ++ next_loop: + /* update the prec for next loop */ + MPFR_ZIV_NEXT (loop, prec); + } /* loop */ +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:35:12.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1-p1"; ++ return "3.1.1-p2"; + } +diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c +--- mpfr-3.1.1-a/tests/tstrtofr.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tstrtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -1105,6 +1105,92 @@ + mpfr_clear (y); + } + ++/* From a bug reported by Joseph S. Myers ++ https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */ ++static void ++bug20120814 (void) ++{ ++ mpfr_exp_t emin = -30, e; ++ mpfr_t x, y; ++ int r; ++ char s[64], *p; ++ ++ mpfr_init2 (x, 2); ++ mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN); ++ mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD); ++ s[0] = s[1]; ++ s[1] = '.'; ++ for (p = s; *p != 0; p++) ; ++ *p = 'e'; ++ sprintf (p + 1, "%d", (int) e - 1); ++ ++ mpfr_init2 (y, 4); ++ r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN); ++ if (r <= 0 || ! mpfr_equal_p (x, y)) ++ { ++ printf ("Error in bug20120814\n"); ++ printf ("mpfr_strtofr failed on string \"%s\"\n", s); ++ printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin); ++ printf ("Got inex = %-6d and y = ", r); ++ mpfr_dump (y); ++ exit (1); ++ } ++ ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ ++static void ++bug20120829 (void) ++{ ++ mpfr_t x1, x2, e; ++ int inex1, inex2, i, r; ++ char s[48] = "1e-1"; ++ ++ mpfr_init2 (e, 128); ++ mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0); ++ ++ inex1 = mpfr_set_si (e, -1, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ ++ for (i = 1; i <= sizeof(s) - 5; i++) ++ { ++ s[3+i] = '0'; ++ s[4+i] = 0; ++ inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ RND_LOOP(r) ++ { ++ mpfr_rnd_t rnd = (mpfr_rnd_t) r; ++ ++ inex1 = mpfr_exp10 (x1, e, rnd); ++ inex1 = SIGN (inex1); ++ inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd); ++ inex2 = SIGN (inex2); ++ /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do: ++ strtofr.c:...: MPFR assertion failed: cy == 0 ++ r8396 is OK. ++ On 64-bit machines, for i = 15, ++ r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0) ++ r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize ++ r8394 and r8396 are OK. ++ */ ++ if (! mpfr_equal_p (x1, x2) || inex1 != inex2) ++ { ++ printf ("Error in bug20120829 for i = %d, rnd = %s\n", ++ i, mpfr_print_rnd_mode (rnd)); ++ printf ("Expected inex = %d, x = ", inex1); ++ mpfr_dump (x1); ++ printf ("Got inex = %d, x = ", inex2); ++ mpfr_dump (x2); ++ exit (1); ++ } ++ } ++ } ++ ++ mpfr_clears (e, x1, x2, (mpfr_ptr) 0); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -1117,6 +1203,8 @@ + check_retval (); + bug20081028 (); + test20100310 (); ++ bug20120814 (); ++ bug20120829 (); + + tests_end_mpfr (); + return 0; diff --git a/dev-libs/mpfr/mpfr-3.1.1_p2.ebuild b/dev-libs/mpfr/mpfr-3.1.1_p2.ebuild new file mode 100644 index 000000000000..1dae8b6c54df --- /dev/null +++ b/dev-libs/mpfr/mpfr-3.1.1_p2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.1_p2.ebuild,v 1.1 2012/12/20 01:31:15 vapier Exp $ + +EAPI="3" + +# NOTE: we cannot depend on autotools here starting with gcc-4.3.x +inherit eutils multilib + +MY_PV=${PV/_p*} +MY_P=${PN}-${MY_PV} +PLEVEL=${PV/*p} +DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" +HOMEPAGE="http://www.mpfr.org/" +SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="static-libs" + +RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + [[ ${PLEVEL} == ${PV} ]] && return 0 + for ((i=1; i<=PLEVEL; ++i)) ; do + patch=patch$(printf '%02d' ${i}) + if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then + epatch "${FILESDIR}"/${MY_PV}/${patch} + elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then + epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i} + else + ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}" + die "patch ${i} missing - please report to bugs.gentoo.org" + fi + done + sed -i '/if test/s:==:=:' configure #261016 + find . -type f -print0 | xargs -0 touch -r configure +} + +src_configure() { + econf \ + --docdir=/usr/share/doc/${PF} \ + $(use_enable static-libs static) +} + +src_install() { + emake install DESTDIR="${D}" || die + use static-libs || rm -f "${D}"/usr/$(get_libdir)/libmpfr.la + + # clean up html/license install + pushd "${D}"/usr/share/doc/${PF} >/dev/null + dohtml *.html && rm COPYING* *.html || die + popd >/dev/null + # some, but not all, are already installed + dodoc AUTHORS BUGS ChangeLog NEWS README TODO + prepalldocs +} + +pkg_preinst() { + preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1 +} + +pkg_postinst() { + preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1 +} |