summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Le <r0bertz@gentoo.org>2009-03-20 01:48:53 +0800
committerZhang Le <r0bertz@gentoo.org>2009-03-20 01:48:53 +0800
commite9496e92e6425f089cd577b83daacf97cc3c06ac (patch)
tree3bc078a81accf052e4ed578d32fcd64a8ac3f816 /dev-libs
parentremoved glibc-getdents.patch (diff)
downloadloongson-e9496e92e6425f089cd577b83daacf97cc3c06ac.tar.gz
loongson-e9496e92e6425f089cd577b83daacf97cc3c06ac.tar.bz2
loongson-e9496e92e6425f089cd577b83daacf97cc3c06ac.zip
bump mpfr-2.4.1_p2 to mpfr-2.4.1_p6
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/mpfr/Manifest8
-rw-r--r--dev-libs/mpfr/files/2.4.1/patch0296
-rw-r--r--dev-libs/mpfr/files/2.4.1/patch0325
-rw-r--r--dev-libs/mpfr/files/2.4.1/patch0445
-rw-r--r--dev-libs/mpfr/files/2.4.1/patch0547
-rw-r--r--dev-libs/mpfr/files/2.4.1/patch0655
-rw-r--r--dev-libs/mpfr/mpfr-2.4.1_p6.ebuild (renamed from dev-libs/mpfr/mpfr-2.4.1_p2.ebuild)5
7 files changed, 224 insertions, 57 deletions
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 4a8f612..8d70397 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,12 +1,16 @@
AUX 2.3.2/patch01 1969 RMD160 bc69e028d61407a56c762cad4e5cd2f645ca457e SHA1 a5310b699f80bcf2768434531776bbfb2af4e640 SHA256 e9fdf4dbdb32c10894d1d0bb8c6d8731397074ae212e927d3b6e1e32b90b1c26
AUX 2.4.0/patch01 1969 RMD160 bc69e028d61407a56c762cad4e5cd2f645ca457e SHA1 a5310b699f80bcf2768434531776bbfb2af4e640 SHA256 e9fdf4dbdb32c10894d1d0bb8c6d8731397074ae212e927d3b6e1e32b90b1c26
AUX 2.4.1/patch01 3512 RMD160 a68a65e3ba90fabb8d634d69b172a32162488661 SHA1 82eb4c34685b6d655d33e0dfcea003248a8967d9 SHA256 6abd8c5abac124041fc0508fbcfdb04f564d0f78118235d70edd81daa3b6169d
-AUX 2.4.1/patch02 1969 RMD160 bc69e028d61407a56c762cad4e5cd2f645ca457e SHA1 a5310b699f80bcf2768434531776bbfb2af4e640 SHA256 e9fdf4dbdb32c10894d1d0bb8c6d8731397074ae212e927d3b6e1e32b90b1c26
+AUX 2.4.1/patch02 1585 RMD160 d1ff268cae4d0659d805d7e22bc5c8e245c86587 SHA1 49ae9b7d23d5ba1013687a99d28ac2c1d674af55 SHA256 9fc939052f9e501c051586fb18f7801262748a46c17476881307ec6100e64edd
+AUX 2.4.1/patch03 1271 RMD160 97b3cc3b761addf812420433d658ba400e0f8d4b SHA1 282066b0104ec41931126acb57e6ef6140dcacbd SHA256 b4a9276f295361c4b6d3ef896548e9d39cb0304146f40c29ed97cc95359ec2b5
+AUX 2.4.1/patch04 1804 RMD160 209acd4081774b4e63d58700dc8355e66238ac8d SHA1 a32e20029351eb34cee941d22566044693a91b93 SHA256 c7152d214006fa1da9dc987ab07468c493c1cf3afc14c22f0a293f14e745c0ee
+AUX 2.4.1/patch05 1872 RMD160 1493e46033944dc15e23b55a495659d07d5077a5 SHA1 aec518a69b75d11699daf6b984a2c6887638b6eb SHA256 2ef1030e3d40636f29ec25feeac87d0813ca73ab944c87837da8d656fcbe9070
+AUX 2.4.1/patch06 1969 RMD160 bc69e028d61407a56c762cad4e5cd2f645ca457e SHA1 a5310b699f80bcf2768434531776bbfb2af4e640 SHA256 e9fdf4dbdb32c10894d1d0bb8c6d8731397074ae212e927d3b6e1e32b90b1c26
DIST mpfr-2.3.2.tar.lzma 816537 RMD160 eff9b819dee971cd907dde461cd525c473516e29 SHA1 1c48c7a545b571e54ea2418bd1eae8b5e3bfe753 SHA256 d8285d3f7fc824eb1fe86ebeb5b8e5064265be8e7439d5aec49bafcb53d710be
DIST mpfr-2.4.0.tar.lzma 903115 RMD160 a9db0f2b2dcd9b6a855f2e5f7a794a152dc48f43 SHA1 345ac4edfb324e7c4ea944540007996a78788c1e SHA256 98a690bc941cfc7a741ae69e659438f8af171cb0d4dcb1e0c54d13e32ada62df
DIST mpfr-2.4.1.tar.lzma 903875 RMD160 e848db799fc3b6a4681de3b38df8809c2369f266 SHA1 6145947361fac880b87976e21e28fab12ccf4881 SHA256 95e507b26bac3b64215bc3cf1463525781582d40358b09becdb24d058b31def8
EBUILD mpfr-2.3.2_p1.ebuild 1414 RMD160 093e6f72a3174b59566deb19ceb047f9e6090601 SHA1 5174c86341e24b147205afe523c8beeba9abe07a SHA256 5aad2ce00fd4a81a48e257e7c856b3bb10ec2fdb1986def6c23ade6628c93b5f
EBUILD mpfr-2.4.0_p1.ebuild 1416 RMD160 917ecd3e064ec200947d742eb7a99c69e11ba0d9 SHA1 85e3eb5033625f57a477937669e6e69ce8decf37 SHA256 209f558be6ed026d85fcbf3b5689445c4f9a2c674d7a61bdbdac5b41789674f0
-EBUILD mpfr-2.4.1_p2.ebuild 1476 RMD160 17763aa8e3971fffed004c3de94db1c62acae29a SHA1 af34bbb3c339646392d353a755a1bfe061a55384 SHA256 317d8f0f21eeaaa81fac338b5f943c79d46889f139391fa2975a1767f2b28101
+EBUILD mpfr-2.4.1_p6.ebuild 1530 RMD160 d4f1eeb2829261d053890305f178d0cc07b0cbc5 SHA1 4643bc5e81539346bf1d528b907e6ac343825928 SHA256 758fbabd7d49cc665cdd00fc7559ae56d6bf0c262942e7986f6a8e572e26b3ff
MISC ChangeLog 9991 RMD160 bcaeb88e150b4aa878f49742cc78fa950d106166 SHA1 914fa38a621aa37aeca97d62733d7c67e011ca09 SHA256 a88a71799640fa947a75a3549d228b884d068399d1468b3bf0185efd62d1ded6
MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
diff --git a/dev-libs/mpfr/files/2.4.1/patch02 b/dev-libs/mpfr/files/2.4.1/patch02
index f14df45..c6b6aac 100644
--- a/dev-libs/mpfr/files/2.4.1/patch02
+++ b/dev-libs/mpfr/files/2.4.1/patch02
@@ -1,55 +1,45 @@
---- a/mpfr-gmp.h 2008-11-28 03:03:22.000000000 +0800
-+++ b/mpfr-gmp.h 2008-11-28 03:04:29.000000000 +0800
-@@ -179,6 +179,10 @@
- typedef unsigned int USItype __attribute__ ((mode (SI)));
- typedef int DItype __attribute__ ((mode (DI)));
- typedef unsigned int UDItype __attribute__ ((mode (DI)));
-+#if BITS_PER_MP_LIMB == 64
-+typedef int TItype __attribute__ ((mode (TI)));
-+typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+#endif
- #else
- typedef unsigned char UQItype;
- typedef long SItype;
-diff --git a/mpfr-longlong.h b/mpfr-longlong.h
-index 111b36c..57eba49 100644
---- a/mpfr-longlong.h
-+++ b/mpfr-longlong.h
-@@ -1011,27 +1011,23 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ((UWtype *, UWtype, UWtype, UWtype));
- #endif /* __m88000__ */
+diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
+--- mpfr-2.4.1-a/PATCHES 2009-03-04 13:15:05.000000000 +0000
++++ mpfr-2.4.1-b/PATCHES 2009-03-04 13:17:04.000000000 +0000
+@@ -0,0 +1 @@
++assert
+diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
+--- mpfr-2.4.1-a/VERSION 2009-02-27 16:55:37.000000000 +0000
++++ mpfr-2.4.1-b/VERSION 2009-03-04 13:16:46.000000000 +0000
+@@ -1 +1 @@
+-2.4.1-p1
++2.4.1-p2
+diff -Naurd mpfr-2.4.1-a/mpfr-gmp.c mpfr-2.4.1-b/mpfr-gmp.c
+--- mpfr-2.4.1-a/mpfr-gmp.c 2009-02-20 09:43:17.000000000 +0000
++++ mpfr-2.4.1-b/mpfr-gmp.c 2009-03-04 13:16:39.000000000 +0000
+@@ -301,7 +301,7 @@
+ if (linenum != -1)
+ fprintf (stderr, "%d: ", linenum);
+ }
+- fprintf (stderr, " assertion failed: %s\n", expr);
++ fprintf (stderr, "MPFR assertion failed: %s\n", expr);
+ abort();
+ }
- #if defined (__mips) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-- __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
--#else
--#define umul_ppmm(w1, w0, u, v) \
-- __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \
-- : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
--#endif
-+ do { \
-+ UDItype __x = (UDItype) (USItype) (u) * (USItype) (v); \
-+ (w1) = (USItype) (__x >> 32); \
-+ (w0) = (USItype) (__x); \
-+ } while (0)
- #define UMUL_TIME 10
- #define UDIV_TIME 100
- #endif /* __mips */
+diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
+--- mpfr-2.4.1-a/mpfr.h 2009-02-27 16:55:38.000000000 +0000
++++ mpfr-2.4.1-b/mpfr.h 2009-03-04 13:16:46.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "2.4.1-p1"
++#define MPFR_VERSION_STRING "2.4.1-p2"
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-- __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
--#else
--#define umul_ppmm(w1, w0, u, v) \
-- __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \
-- : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
--#endif
-+ do { \
-+ UTItype __x = (UTItype) (UDItype) (u) * (UDItype) (v); \
-+ (w1) = (UDItype) (__x >> 64); \
-+ (w0) = (UDItype) (__x); \
-+ } while (0)
- #define UMUL_TIME 20
- #define UDIV_TIME 140
- #endif /* __mips */
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
+--- mpfr-2.4.1-a/version.c 2009-02-27 16:55:38.000000000 +0000
++++ mpfr-2.4.1-b/version.c 2009-03-04 13:16:46.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "2.4.1-p1";
++ return "2.4.1-p2";
+ }
diff --git a/dev-libs/mpfr/files/2.4.1/patch03 b/dev-libs/mpfr/files/2.4.1/patch03
new file mode 100644
index 0000000..e85136a
--- /dev/null
+++ b/dev-libs/mpfr/files/2.4.1/patch03
@@ -0,0 +1,25 @@
+diff -Naurd mpfr-2.4.1-a/tests/tfprintf.c mpfr-2.4.1-b/tests/tfprintf.c
+--- mpfr-2.4.1-a/tests/tfprintf.c 2009-02-20 09:43:15.000000000 +0000
++++ mpfr-2.4.1-b/tests/tfprintf.c 2009-03-10 01:12:45.000000000 +0000
+@@ -195,7 +195,7 @@
+ check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz);
+ check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi);
+ check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr,
+- &i);
++ (void *) &i);
+ check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
+
+ #ifndef NPRINTF_T
+diff -Naurd mpfr-2.4.1-a/tests/tprintf.c mpfr-2.4.1-b/tests/tprintf.c
+--- mpfr-2.4.1-a/tests/tprintf.c 2009-02-20 09:43:15.000000000 +0000
++++ mpfr-2.4.1-b/tests/tprintf.c 2009-03-10 01:12:45.000000000 +0000
+@@ -191,7 +191,8 @@
+ check_length (5, sz, 34, zu);
+ check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz);
+ check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi);
+- check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", mpfr, mpq, &mpfr, &i);
++ check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p",
++ mpfr, mpq, &mpfr, (void *) &i);
+ check_length_with_cmp (7, mpfr, 16, mpfr_cmp_ui (mpfr, 16), Rg);
+
+ #ifndef NPRINTF_T
diff --git a/dev-libs/mpfr/files/2.4.1/patch04 b/dev-libs/mpfr/files/2.4.1/patch04
new file mode 100644
index 0000000..08e21f2
--- /dev/null
+++ b/dev-libs/mpfr/files/2.4.1/patch04
@@ -0,0 +1,45 @@
+diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
+--- mpfr-2.4.1-a/PATCHES 2009-03-10 01:44:39.000000000 +0000
++++ mpfr-2.4.1-b/PATCHES 2009-03-10 01:44:40.000000000 +0000
+@@ -0,0 +1 @@
++vasprintf-mp_limb_t
+diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
+--- mpfr-2.4.1-a/VERSION 2009-03-04 13:16:46.000000000 +0000
++++ mpfr-2.4.1-b/VERSION 2009-03-10 01:44:40.000000000 +0000
+@@ -1 +1 @@
+-2.4.1-p2
++2.4.1-p4
+diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
+--- mpfr-2.4.1-a/mpfr.h 2009-03-04 13:16:46.000000000 +0000
++++ mpfr-2.4.1-b/mpfr.h 2009-03-10 01:44:40.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "2.4.1-p2"
++#define MPFR_VERSION_STRING "2.4.1-p4"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.1-a/vasprintf.c mpfr-2.4.1-b/vasprintf.c
+--- mpfr-2.4.1-a/vasprintf.c 2009-02-20 09:43:17.000000000 +0000
++++ mpfr-2.4.1-b/vasprintf.c 2009-03-10 01:44:40.000000000 +0000
+@@ -398,7 +398,7 @@
+ (void) va_arg ((ap), mpq_srcptr); \
+ break; \
+ case MP_LIMB_ARG: \
+- (void) va_arg ((ap), mp_ptr); \
++ (void) va_arg ((ap), mp_limb_t); \
+ break; \
+ case MP_LIMB_ARRAY_ARG: \
+ (void) va_arg ((ap), mp_ptr); \
+diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
+--- mpfr-2.4.1-a/version.c 2009-03-04 13:16:46.000000000 +0000
++++ mpfr-2.4.1-b/version.c 2009-03-10 01:44:40.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "2.4.1-p2";
++ return "2.4.1-p4";
+ }
diff --git a/dev-libs/mpfr/files/2.4.1/patch05 b/dev-libs/mpfr/files/2.4.1/patch05
new file mode 100644
index 0000000..710c698
--- /dev/null
+++ b/dev-libs/mpfr/files/2.4.1/patch05
@@ -0,0 +1,47 @@
+diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
+--- mpfr-2.4.1-a/PATCHES 2009-03-13 02:50:47.000000000 +0000
++++ mpfr-2.4.1-b/PATCHES 2009-03-13 02:50:48.000000000 +0000
+@@ -0,0 +1 @@
++zeta_ui-shift
+diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
+--- mpfr-2.4.1-a/VERSION 2009-03-10 01:44:40.000000000 +0000
++++ mpfr-2.4.1-b/VERSION 2009-03-13 02:50:48.000000000 +0000
+@@ -1 +1 @@
+-2.4.1-p4
++2.4.1-p5
+diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
+--- mpfr-2.4.1-a/mpfr.h 2009-03-10 01:44:40.000000000 +0000
++++ mpfr-2.4.1-b/mpfr.h 2009-03-13 02:50:48.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "2.4.1-p4"
++#define MPFR_VERSION_STRING "2.4.1-p5"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
+--- mpfr-2.4.1-a/version.c 2009-03-10 01:44:40.000000000 +0000
++++ mpfr-2.4.1-b/version.c 2009-03-13 02:50:48.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "2.4.1-p4";
++ return "2.4.1-p5";
+ }
+diff -Naurd mpfr-2.4.1-a/zeta_ui.c mpfr-2.4.1-b/zeta_ui.c
+--- mpfr-2.4.1-a/zeta_ui.c 2009-02-20 09:43:17.000000000 +0000
++++ mpfr-2.4.1-b/zeta_ui.c 2009-03-13 02:50:48.000000000 +0000
+@@ -177,7 +177,9 @@
+ mpz_mul_ui (t, t, 2 * k - 1);
+ }
+ mpz_div_2exp (t, t, 1);
+- if (n < 1UL << (BITS_PER_MP_LIMB / 2))
++ /* Warning: the test below assumes that an unsigned long
++ has no padding bits. */
++ if (n < 1UL << ((sizeof(unsigned long) * CHAR_BIT) / 2))
+ /* (n - k + 1) * (n + k - 1) < n^2 */
+ mpz_divexact_ui (t, t, (n - k + 1) * (n + k - 1));
+ else
diff --git a/dev-libs/mpfr/files/2.4.1/patch06 b/dev-libs/mpfr/files/2.4.1/patch06
new file mode 100644
index 0000000..f14df45
--- /dev/null
+++ b/dev-libs/mpfr/files/2.4.1/patch06
@@ -0,0 +1,55 @@
+--- a/mpfr-gmp.h 2008-11-28 03:03:22.000000000 +0800
++++ b/mpfr-gmp.h 2008-11-28 03:04:29.000000000 +0800
+@@ -179,6 +179,10 @@
+ typedef unsigned int USItype __attribute__ ((mode (SI)));
+ typedef int DItype __attribute__ ((mode (DI)));
+ typedef unsigned int UDItype __attribute__ ((mode (DI)));
++#if BITS_PER_MP_LIMB == 64
++typedef int TItype __attribute__ ((mode (TI)));
++typedef unsigned int UTItype __attribute__ ((mode (TI)));
++#endif
+ #else
+ typedef unsigned char UQItype;
+ typedef long SItype;
+diff --git a/mpfr-longlong.h b/mpfr-longlong.h
+index 111b36c..57eba49 100644
+--- a/mpfr-longlong.h
++++ b/mpfr-longlong.h
+@@ -1011,27 +1011,23 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ((UWtype *, UWtype, UWtype, UWtype));
+ #endif /* __m88000__ */
+
+ #if defined (__mips) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+- __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+-#else
+-#define umul_ppmm(w1, w0, u, v) \
+- __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \
+- : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
+-#endif
++ do { \
++ UDItype __x = (UDItype) (USItype) (u) * (USItype) (v); \
++ (w1) = (USItype) (__x >> 32); \
++ (w0) = (USItype) (__x); \
++ } while (0)
+ #define UMUL_TIME 10
+ #define UDIV_TIME 100
+ #endif /* __mips */
+
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+ #define umul_ppmm(w1, w0, u, v) \
+- __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+-#else
+-#define umul_ppmm(w1, w0, u, v) \
+- __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \
+- : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
+-#endif
++ do { \
++ UTItype __x = (UTItype) (UDItype) (u) * (UDItype) (v); \
++ (w1) = (UDItype) (__x >> 64); \
++ (w0) = (UDItype) (__x); \
++ } while (0)
+ #define UMUL_TIME 20
+ #define UDIV_TIME 140
+ #endif /* __mips */
diff --git a/dev-libs/mpfr/mpfr-2.4.1_p2.ebuild b/dev-libs/mpfr/mpfr-2.4.1_p6.ebuild
index 911d083..d98ef0d 100644
--- a/dev-libs/mpfr/mpfr-2.4.1_p2.ebuild
+++ b/dev-libs/mpfr/mpfr-2.4.1_p6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.4.1_p1.ebuild,v 1.6 2009/03/07 14:23:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.4.1_p5.ebuild,v 1.1 2009/03/18 22:46:09 vapier Exp $
# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
inherit eutils
@@ -14,7 +14,7 @@ SRC_URI="http://www.mpfr.org/mpfr-current/${MY_P}.tar.lzma"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-libs/gmp-4.1.4-r2"
@@ -39,6 +39,7 @@ src_unpack() {
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
}