From b1b926ea82379f729e50339e9881893fbd3032a2 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Tue, 15 Dec 2009 19:59:39 +0100 Subject: [PATCH] libmpfr: updated to 2.4.2 --- libmpfr/.footprint | 6 +- libmpfr/.md5sum | 3 +- libmpfr/Pkgfile | 14 +-- libmpfr/mpfr-2.4.1-branch_update-1.patch | 130 ----------------------- 4 files changed, 11 insertions(+), 142 deletions(-) delete mode 100644 libmpfr/mpfr-2.4.1-branch_update-1.patch diff --git a/libmpfr/.footprint b/libmpfr/.footprint index e160683..454b0a9 100644 --- a/libmpfr/.footprint +++ b/libmpfr/.footprint @@ -5,6 +5,6 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libmpfr.a -rwxr-xr-x root/root usr/lib/libmpfr.la -lrwxrwxrwx root/root usr/lib/libmpfr.so -> libmpfr.so.1.2.0 -lrwxrwxrwx root/root usr/lib/libmpfr.so.1 -> libmpfr.so.1.2.0 --rwxr-xr-x root/root usr/lib/libmpfr.so.1.2.0 +lrwxrwxrwx root/root usr/lib/libmpfr.so -> libmpfr.so.1.2.2 +lrwxrwxrwx root/root usr/lib/libmpfr.so.1 -> libmpfr.so.1.2.2 +-rwxr-xr-x root/root usr/lib/libmpfr.so.1.2.2 diff --git a/libmpfr/.md5sum b/libmpfr/.md5sum index b60dc53..9ff04c8 100644 --- a/libmpfr/.md5sum +++ b/libmpfr/.md5sum @@ -1,2 +1 @@ -45b649ee8fe4ad885bbef5386df84bcf mpfr-2.4.1-branch_update-1.patch -c5ee0a8ce82ad55fe29ac57edd35d09e mpfr-2.4.1.tar.bz2 +89e59fe665e2b3ad44a6789f40b059a0 mpfr-2.4.2.tar.bz2 diff --git a/libmpfr/Pkgfile b/libmpfr/Pkgfile index 732c6d0..a10ee41 100644 --- a/libmpfr/Pkgfile +++ b/libmpfr/Pkgfile @@ -1,23 +1,23 @@ # Description: C library for multiple-precision floating-point computations with correct rounding # URL: http://www.mpfr.org/ # Maintainer: CRUX System Team, core-ports at crux dot nu -# Ach Maintainer: CRUX ARM System Team +# Ach Maintainer: CRUX ARM System Team, crux-arm at mikeux dot dyndns dot org # Depends on: libgmp name=libmpfr -version=2.4.1 +version=2.4.2 release=1 -source=(http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2 \ - mpfr-$version-branch_update-1.patch) +source=(http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2) build() { cd mpfr-$version - patch -p1 -i $SRC/mpfr-$version-branch_update-1.patch + ./configure --build=$CHOST \ --host=$CTARGET \ - --prefix=/usr + --prefix=/usr \ + --with-gmp=$CLFS make make DESTDIR=$PKG install - rm -r $PKG/usr/share + rm -rf $PKG/usr/share } diff --git a/libmpfr/mpfr-2.4.1-branch_update-1.patch b/libmpfr/mpfr-2.4.1-branch_update-1.patch deleted file mode 100644 index a37e5cd..0000000 --- a/libmpfr/mpfr-2.4.1-branch_update-1.patch +++ /dev/null @@ -1,130 +0,0 @@ -Submitted By: Jim Gifford (jim at cross-lfs dot org) -Date: 2009-02-28 -Initial Package Version: 2.4.1 -Origin: MPFR Website -Upstream Status: Fixed -Description: See http://www.mpfr.org Website Under Bugs - -diff -Naur mpfr-2.4.1.orig/mpfr.h mpfr-2.4.1/mpfr.h ---- mpfr-2.4.1.orig/mpfr.h 2009-02-25 08:16:08.000000000 -0800 -+++ mpfr-2.4.1/mpfr.h 2009-02-28 15:22:16.554489175 -0800 -@@ -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" -+#define MPFR_VERSION_STRING "2.4.1-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naur mpfr-2.4.1.orig/PATCHES mpfr-2.4.1/PATCHES ---- mpfr-2.4.1.orig/PATCHES 2009-02-20 01:43:17.000000000 -0800 -+++ mpfr-2.4.1/PATCHES 2009-02-28 15:22:16.554489175 -0800 -@@ -0,0 +1 @@ -+remainder-neg -diff -Naur mpfr-2.4.1.orig/rem1.c mpfr-2.4.1/rem1.c ---- mpfr-2.4.1.orig/rem1.c 2009-02-20 01:43:17.000000000 -0800 -+++ mpfr-2.4.1/rem1.c 2009-02-28 15:22:16.554489175 -0800 -@@ -170,7 +170,12 @@ - } - - if (mpz_cmp_ui (r, 0) == 0) -- inex = mpfr_set_ui (rem, 0, GMP_RNDN); -+ { -+ inex = mpfr_set_ui (rem, 0, GMP_RNDN); -+ /* take into account sign of x */ -+ if (signx < 0) -+ mpfr_neg (rem, rem, GMP_RNDN); -+ } - else - { - if (rnd_q == GMP_RNDN) -@@ -190,6 +195,9 @@ - *quo += 1; - } - } -+ /* take into account sign of x */ -+ if (signx < 0) -+ mpz_neg (r, r); - inex = mpfr_set_z (rem, r, rnd); - /* if ex > ey, rem should be multiplied by 2^ey, else by 2^ex */ - MPFR_EXP (rem) += (ex > ey) ? ey : ex; -@@ -198,13 +206,6 @@ - if (quo) - *quo *= sign; - -- /* take into account sign of x */ -- if (signx < 0) -- { -- mpfr_neg (rem, rem, GMP_RNDN); -- inex = -inex; -- } -- - mpz_clear (mx); - mpz_clear (my); - mpz_clear (r); -diff -Naur mpfr-2.4.1.orig/tests/tremquo.c mpfr-2.4.1/tests/tremquo.c ---- mpfr-2.4.1.orig/tests/tremquo.c 2009-02-20 01:43:15.000000000 -0800 -+++ mpfr-2.4.1/tests/tremquo.c 2009-02-28 15:22:16.554489175 -0800 -@@ -25,6 +25,36 @@ - - #include "mpfr-test.h" - -+static void -+bug20090227 (void) -+{ -+ mpfr_t x, y, r1, r2; -+ int inex1, inex2; -+ -+ mpfr_init2 (x, 118); -+ mpfr_init2 (y, 181); -+ mpfr_init2 (r1, 140); -+ mpfr_init2 (r2, 140); -+ mpfr_set_si (x, -1, GMP_RNDN); -+ mpfr_set_str_binary (y, "1.100100100001111110110101010001000100001011010001100001000110100110001001100011001100010100010111000000011011100000111001101000100101001000000100100111000001000100010100110011111010"); -+ inex1 = mpfr_remainder (r1, x, y, GMP_RNDU); -+ /* since the quotient is -1, r1 is the rounding of x+y */ -+ inex2 = mpfr_add (r2, x, y, GMP_RNDU); -+ if (mpfr_cmp (r1, r2)) -+ { -+ printf ("Error in mpfr_remainder (bug20090227)\n"); -+ printf ("Expected "); -+ mpfr_dump (r2); -+ printf ("Got "); -+ mpfr_dump (r1); -+ exit (1); -+ } -+ mpfr_clear (x); -+ mpfr_clear (y); -+ mpfr_clear (r1); -+ mpfr_clear (r2); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -50,6 +80,8 @@ - - tests_start_mpfr (); - -+ bug20090227 (); -+ - mpfr_init (x); - mpfr_init (y); - mpfr_init (r); -diff -Naur mpfr-2.4.1.orig/VERSION mpfr-2.4.1/VERSION ---- mpfr-2.4.1.orig/VERSION 2009-02-25 08:16:08.000000000 -0800 -+++ mpfr-2.4.1/VERSION 2009-02-28 15:22:16.554489175 -0800 -@@ -1 +1 @@ --2.4.1 -+2.4.1-p1 -diff -Naur mpfr-2.4.1.orig/version.c mpfr-2.4.1/version.c ---- mpfr-2.4.1.orig/version.c 2009-02-25 08:16:08.000000000 -0800 -+++ mpfr-2.4.1/version.c 2009-02-28 15:22:16.554489175 -0800 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "2.4.1"; -+ return "2.4.1-p1"; - } -- 2.26.2