patches/mpfr/2.4.1/150-test-tmul.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
     1 diff -up ./tests/Makefile.am.orig ./tests/Makefile.am
     2 --- ./tests/Makefile.am.orig	2009-07-28 16:28:55.377059021 +0300
     3 +++ ./tests/Makefile.am	2009-07-28 16:31:01.136810734 +0300
     4 @@ -20,7 +20,7 @@ check_PROGRAMS = tversion tinternals tin
     5  
     6  EXTRA_DIST = tgeneric.c tgeneric_ui.c mpf_compat.h inp_str.data tmul.dat
     7  
     8 -tmul_CPPFLAGS = -DMPFR_SRCDIR=$(srcdir)
     9 +tmul_CPPFLAGS = -DMPFR_SRCDIR=\"$(srcdir)\"
    10  
    11  LDADD = libfrtests.la $(MPFR_LIBM) $(top_builddir)/libmpfr.la
    12  INCLUDES = -I$(top_srcdir) -I$(top_builddir)
    13 diff -up ./tests/tmul.c.orig ./tests/tmul.c
    14 --- ./tests/tmul.c.orig	2009-07-28 16:29:03.761058919 +0300
    15 +++ ./tests/tmul.c	2009-07-28 16:30:46.369812215 +0300
    16 @@ -26,10 +26,8 @@ MA 02110-1301, USA. */
    17  #include "mpfr-test.h"
    18  
    19  #ifndef MPFR_SRCDIR
    20 -#define MPFR_SRCDIR .
    21 +#define MPFR_SRCDIR "."
    22  #endif
    23 -#define QUOTE(X) NAME(X)
    24 -#define NAME(X) #X
    25  
    26  #ifdef CHECK_EXTERNAL
    27  static int
    28 @@ -482,10 +480,10 @@ check_regression (void)
    29    mpfr_inits2 (6177, x, y, z, (mpfr_ptr) 0);
    30    /* we read long strings from a file since ISO C90 does not support strings of
    31       length > 509 */
    32 -  fp = fopen (QUOTE (MPFR_SRCDIR)"/tmul.dat", "r");
    33 +  fp = fopen (MPFR_SRCDIR "/tmul.dat", "r");
    34    if (fp == NULL)
    35      {
    36 -      fprintf (stderr, "Error, cannot open "QUOTE (MPFR_SRCDIR)"/tmul.dat\n");
    37 +      fprintf (stderr, "Error, cannot open " MPFR_SRCDIR "/tmul.dat\n");
    38        exit (1);
    39      }
    40    get_string (s, fp);