patches/strace/4.5.18/100-autoreconf.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@951
     1
diff -dur strace-4.5.16.orig/configure strace-4.5.16/configure
yann@951
     2
--- strace-4.5.16.orig/configure	2007-01-11 23:23:33.000000000 +0100
yann@951
     3
+++ strace-4.5.16/configure	2007-07-14 19:18:43.000000000 +0200
yann@951
     4
@@ -5808,6 +5777,73 @@
yann@951
     5
yann@951
     6
 fi
yann@951
     7
yann@951
     8
+echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
yann@951
     9
+echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
yann@951
    10
+if test "${ac_cv_type_statfs64+set}" = set; then
yann@951
    11
+  echo $ECHO_N "(cached) $ECHO_C" >&6
yann@951
    12
+else
yann@951
    13
+  cat >conftest.$ac_ext <<_ACEOF
yann@951
    14
+/* confdefs.h.  */
yann@951
    15
+_ACEOF
yann@951
    16
+cat confdefs.h >>conftest.$ac_ext
yann@951
    17
+cat >>conftest.$ac_ext <<_ACEOF
yann@951
    18
+/* end confdefs.h.  */
yann@951
    19
+#ifdef LINUX
yann@951
    20
+#include <linux/types.h>
yann@951
    21
+#include <sys/statfs.h>
yann@951
    22
+#else
yann@951
    23
+#include <sys/vfs.h>
yann@951
    24
+#endif
yann@951
    25
+int
yann@951
    26
+main ()
yann@951
    27
+{
yann@951
    28
+struct statfs64 st;
yann@951
    29
+  ;
yann@951
    30
+  return 0;
yann@951
    31
+}
yann@951
    32
+_ACEOF
yann@951
    33
+rm -f conftest.$ac_objext
yann@951
    34
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
yann@951
    35
+  (eval $ac_compile) 2>conftest.er1
yann@951
    36
+  ac_status=$?
yann@951
    37
+  grep -v '^ *+' conftest.er1 >conftest.err
yann@951
    38
+  rm -f conftest.er1
yann@951
    39
+  cat conftest.err >&5
yann@951
    40
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@951
    41
+  (exit $ac_status); } &&
yann@951
    42
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
yann@951
    43
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
yann@951
    44
+  (eval $ac_try) 2>&5
yann@951
    45
+  ac_status=$?
yann@951
    46
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@951
    47
+  (exit $ac_status); }; } &&
yann@951
    48
+	 { ac_try='test -s conftest.$ac_objext'
yann@951
    49
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
yann@951
    50
+  (eval $ac_try) 2>&5
yann@951
    51
+  ac_status=$?
yann@951
    52
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@951
    53
+  (exit $ac_status); }; }; then
yann@951
    54
+  ac_cv_type_statfs64=yes
yann@951
    55
+else
yann@951
    56
+  echo "$as_me: failed program was:" >&5
yann@951
    57
+sed 's/^/| /' conftest.$ac_ext >&5
yann@951
    58
+
yann@951
    59
+ac_cv_type_statfs64=no
yann@951
    60
+fi
yann@951
    61
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
yann@951
    62
+fi
yann@951
    63
+
yann@951
    64
+echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
yann@951
    65
+echo "${ECHO_T}$ac_cv_type_statfs64" >&6
yann@951
    66
+if test "$ac_cv_type_statfs64" = yes
yann@951
    67
+then
yann@951
    68
+
yann@951
    69
+cat >>confdefs.h <<\_ACEOF
yann@951
    70
+#define HAVE_STATFS64 1
yann@951
    71
+_ACEOF
yann@951
    72
+
yann@951
    73
+fi
yann@951
    74
+
yann@951
    75
yann@951
    76
 { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
yann@951
    77
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }