patches/mpfr/2.4.1/150-test-tmul.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

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