patches/gmp/4.2.4/110-mpf_set_str.patch
author Oron Peled <oron@actcom.co.il>
Mon Aug 03 00:49:25 2009 +0200 (2009-08-03)
changeset 1449 8ad2773e7ae3
permissions -rw-r--r--
[complib:mpfr] Fix building MPFR in some weird cases

The tmul test uses a compiled-in input file in $(srcdir).
The problem is that the Makefile passes it unquoted. The C code
tries to stringify it using clever macros, which may *usually* work.

In my case the source directory was named:
.../toolchain-powerpc-e500v2-linux-gnuspe-1.0-2.fc10/.../tests
And guess what? During testing I found out the program fails because
it tries to open:
.../toolchain-powerpc-e500v2-1-gnuspe-1.0-2.fc10/.../tests

Yes, CPP tokenized the macro before stringifying it and not surprisingly
the 'linux' part was converted to 1.
[on Fedora-10: cpp (GCC) 4.3.2 20081105 (Red Hat 4.3.2-7)]

So the attached patch simplify the macros and pass the path as string
from the Makefile.
yann@1250
     1
Original patch from: mpf_set_str.c.4.diff
yann@1250
     2
yann@1250
     3
-= BEGIN original header =-
yann@1250
     4
-= END original header =-
yann@1250
     5
yann@1250
     6
diff -durN gmp-4.2.4.orig/mpf/set_str.c gmp-4.2.4/mpf/set_str.c
yann@1250
     7
--- gmp-4.2.4.orig/mpf/set_str.c	2008-08-25 16:11:37.000000000 +0200
yann@1250
     8
+++ gmp-4.2.4/mpf/set_str.c	2009-03-08 18:36:16.000000000 +0100
yann@1250
     9
@@ -137,7 +137,12 @@
yann@1250
    10
       c = (unsigned char) *++str;
yann@1250
    11
     }
yann@1250
    12
 
yann@1250
    13
+  /* Default base to decimal.  */
yann@1250
    14
+  if (base == 0)
yann@1250
    15
+    base = 10;
yann@1250
    16
+
yann@1250
    17
   exp_base = base;
yann@1250
    18
+
yann@1250
    19
   if (base < 0)
yann@1250
    20
     {
yann@1250
    21
       exp_base = 10;
yann@1250
    22
@@ -165,10 +170,6 @@
yann@1250
    23
 	return -1;
yann@1250
    24
     }
yann@1250
    25
 
yann@1250
    26
-  /* Default base to decimal.  */
yann@1250
    27
-  if (base == 0)
yann@1250
    28
-    base = 10;
yann@1250
    29
-
yann@1250
    30
   /* Locate exponent part of the input.  Look from the right of the string,
yann@1250
    31
      since the exponent is usually a lot shorter than the mantissa.  */
yann@1250
    32
   expptr = NULL;