patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.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>
yann@1541
     1
diff -durN ltrace-0.5.2.orig/configure ltrace-0.5.2/configure
yann@1541
     2
--- ltrace-0.5.2.orig/configure	2009-09-14 18:47:45.000000000 +0200
yann@1541
     3
+++ ltrace-0.5.2/configure	2009-09-14 18:49:18.000000000 +0200
yann@1541
     4
@@ -1829,6 +1829,9 @@
yann@1541
     5
   linux-gnu*) host_os=linux-gnu
yann@1541
     6
 esac
yann@1541
     7
 HOST_OS="$host_os"
yann@1541
     8
+case "${HOST_OS}" in
yann@1541
     9
+  linux-*) HOST_OS=linux-gnu;;
yann@1541
    10
+esac
yann@1541
    11
 
yann@1541
    12
 
yann@1541
    13
 ac_ext=c
yann@1541
    14
diff -durN ltrace-0.5.2.orig/configure.ac ltrace-0.5.2/configure.ac
yann@1541
    15
--- ltrace-0.5.2.orig/configure.ac	2009-09-14 18:47:45.000000000 +0200
yann@1541
    16
+++ ltrace-0.5.2/configure.ac	2009-09-14 18:49:18.000000000 +0200
yann@1541
    17
@@ -10,6 +10,9 @@
yann@1541
    18
   linux-gnu*) host_os=linux-gnu
yann@1541
    19
 esac
yann@1541
    20
 HOST_OS="$host_os"
yann@1541
    21
+case "${HOST_OS}" in
yann@1541
    22
+  linux-*) HOST_OS=linux-gnu;;
yann@1541
    23
+esac
yann@1541
    24
 AC_SUBST(HOST_OS)
yann@1541
    25
 HOST_ARCH="$host_cpu"
yann@1541
    26
 AC_SUBST(HOST_ARCH)