patches/ltrace/0.5.2/130-fix-build-with-exotic-linux-host-OS.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd)
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)