diff options
author | Alexey Neyman <stilor@att.net> | 2017-07-13 07:38:03 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-13 07:38:03 (GMT) |
commit | 45c5bb0f484cba724be2c6105801dcce9a1a82d9 (patch) | |
tree | 8fd1c8eaa2ef203009d72b6ca6348611dcc5ee1c /packages/mpfr/2.4.1 | |
parent | 8f8e131d566af1f577d8fb6e62e6f121b7955472 (diff) | |
parent | b32fcf7c1eea890a2bd3f88487f818ba241aabb1 (diff) |
Merge pull request #767 from stilor/packages
Packages
Diffstat (limited to 'packages/mpfr/2.4.1')
-rw-r--r-- | packages/mpfr/2.4.1/100-remainder-neg.patch | 123 | ||||
-rw-r--r-- | packages/mpfr/2.4.1/110-assert.patch | 45 | ||||
-rw-r--r-- | packages/mpfr/2.4.1/120-cast-to-void-ptr.patch | 25 | ||||
-rw-r--r-- | packages/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch | 45 | ||||
-rw-r--r-- | packages/mpfr/2.4.1/140-zeta_ui-shift.patch | 47 | ||||
-rw-r--r-- | packages/mpfr/2.4.1/150-test-tmul.patch | 40 | ||||
-rw-r--r-- | packages/mpfr/2.4.1/version.desc | 1 |
7 files changed, 326 insertions, 0 deletions
diff --git a/packages/mpfr/2.4.1/100-remainder-neg.patch b/packages/mpfr/2.4.1/100-remainder-neg.patch new file mode 100644 index 0000000..ae92788 --- /dev/null +++ b/packages/mpfr/2.4.1/100-remainder-neg.patch @@ -0,0 +1,123 @@ +diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES +--- mpfr-2.4.1-a/PATCHES 2009-02-20 09:43:17.000000000 +0000 ++++ mpfr-2.4.1-b/PATCHES 2009-02-27 16:56:29.000000000 +0000 +@@ -0,0 +1 @@ ++remainder-neg +diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION +--- mpfr-2.4.1-a/VERSION 2009-02-25 16:16:08.000000000 +0000 ++++ mpfr-2.4.1-b/VERSION 2009-02-27 16:55:37.000000000 +0000 +@@ -1 +1 @@ +-2.4.1 ++2.4.1-p1 +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-25 16:16:08.000000000 +0000 ++++ mpfr-2.4.1-b/mpfr.h 2009-02-27 16:55:38.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" ++#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 -Naurd mpfr-2.4.1-a/rem1.c mpfr-2.4.1-b/rem1.c +--- mpfr-2.4.1-a/rem1.c 2009-02-20 09:43:17.000000000 +0000 ++++ mpfr-2.4.1-b/rem1.c 2009-02-27 16:55:15.000000000 +0000 +@@ -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 -Naurd mpfr-2.4.1-a/tests/tremquo.c mpfr-2.4.1-b/tests/tremquo.c +--- mpfr-2.4.1-a/tests/tremquo.c 2009-02-20 09:43:15.000000000 +0000 ++++ mpfr-2.4.1-b/tests/tremquo.c 2009-02-27 16:55:15.000000000 +0000 +@@ -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 -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c +--- mpfr-2.4.1-a/version.c 2009-02-25 16:16:08.000000000 +0000 ++++ mpfr-2.4.1-b/version.c 2009-02-27 16:55:38.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "2.4.1"; ++ return "2.4.1-p1"; + } diff --git a/packages/mpfr/2.4.1/110-assert.patch b/packages/mpfr/2.4.1/110-assert.patch new file mode 100644 index 0000000..c6b6aac --- /dev/null +++ b/packages/mpfr/2.4.1/110-assert.patch @@ -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-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(); + } + +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" + + /* 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/packages/mpfr/2.4.1/120-cast-to-void-ptr.patch b/packages/mpfr/2.4.1/120-cast-to-void-ptr.patch new file mode 100644 index 0000000..e85136a --- /dev/null +++ b/packages/mpfr/2.4.1/120-cast-to-void-ptr.patch @@ -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/packages/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch b/packages/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch new file mode 100644 index 0000000..08e21f2 --- /dev/null +++ b/packages/mpfr/2.4.1/130-vasprintf-mp_limb_t.patch @@ -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/packages/mpfr/2.4.1/140-zeta_ui-shift.patch b/packages/mpfr/2.4.1/140-zeta_ui-shift.patch new file mode 100644 index 0000000..710c698 --- /dev/null +++ b/packages/mpfr/2.4.1/140-zeta_ui-shift.patch @@ -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/packages/mpfr/2.4.1/150-test-tmul.patch b/packages/mpfr/2.4.1/150-test-tmul.patch new file mode 100644 index 0000000..8b757d3 --- /dev/null +++ b/packages/mpfr/2.4.1/150-test-tmul.patch @@ -0,0 +1,40 @@ +diff -up ./tests/Makefile.am.orig ./tests/Makefile.am +--- ./tests/Makefile.am.orig 2009-07-28 16:28:55.377059021 +0300 ++++ ./tests/Makefile.am 2009-07-28 16:31:01.136810734 +0300 +@@ -20,7 +20,7 @@ check_PROGRAMS = tversion tinternals tin + + EXTRA_DIST = tgeneric.c tgeneric_ui.c mpf_compat.h inp_str.data tmul.dat + +-tmul_CPPFLAGS = -DMPFR_SRCDIR=$(srcdir) ++tmul_CPPFLAGS = -DMPFR_SRCDIR=\"$(srcdir)\" + + LDADD = libfrtests.la $(MPFR_LIBM) $(top_builddir)/libmpfr.la + INCLUDES = -I$(top_srcdir) -I$(top_builddir) +diff -up ./tests/tmul.c.orig ./tests/tmul.c +--- ./tests/tmul.c.orig 2009-07-28 16:29:03.761058919 +0300 ++++ ./tests/tmul.c 2009-07-28 16:30:46.369812215 +0300 +@@ -26,10 +26,8 @@ MA 02110-1301, USA. */ + #include "mpfr-test.h" + + #ifndef MPFR_SRCDIR +-#define MPFR_SRCDIR . ++#define MPFR_SRCDIR "." + #endif +-#define QUOTE(X) NAME(X) +-#define NAME(X) #X + + #ifdef CHECK_EXTERNAL + static int +@@ -482,10 +480,10 @@ check_regression (void) + mpfr_inits2 (6177, x, y, z, (mpfr_ptr) 0); + /* we read long strings from a file since ISO C90 does not support strings of + length > 509 */ +- fp = fopen (QUOTE (MPFR_SRCDIR)"/tmul.dat", "r"); ++ fp = fopen (MPFR_SRCDIR "/tmul.dat", "r"); + if (fp == NULL) + { +- fprintf (stderr, "Error, cannot open "QUOTE (MPFR_SRCDIR)"/tmul.dat\n"); ++ fprintf (stderr, "Error, cannot open " MPFR_SRCDIR "/tmul.dat\n"); + exit (1); + } + get_string (s, fp); diff --git a/packages/mpfr/2.4.1/version.desc b/packages/mpfr/2.4.1/version.desc new file mode 100644 index 0000000..fcfe389 --- /dev/null +++ b/packages/mpfr/2.4.1/version.desc @@ -0,0 +1 @@ +obsolete='yes' |