1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/strace/4.5.19/170-update-configure.patch Fri Jan 01 12:17:39 2010 +0100
1.3 @@ -0,0 +1,159 @@
1.4 +diff -ruN strace-4.5.19.orig/config.h.in strace-4.5.19/config.h.in
1.5 +--- strace-4.5.19.orig/config.h.in 2009-10-21 19:41:12.000000000 +0200
1.6 ++++ strace-4.5.19/config.h.in 2010-01-01 10:39:36.000000000 +0100
1.7 +@@ -161,6 +161,9 @@
1.8 + /* Define if stat64 is available in asm/stat.h. */
1.9 + #undef HAVE_STAT64
1.10 +
1.11 ++/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */
1.12 ++#undef HAVE_STATFS64
1.13 ++
1.14 + /* Define to 1 if stdbool.h conforms to C99. */
1.15 + #undef HAVE_STDBOOL_H
1.16 +
1.17 +diff -ruN strace-4.5.19.orig/configure strace-4.5.19/configure
1.18 +--- strace-4.5.19.orig/configure 2010-01-01 10:38:49.000000000 +0100
1.19 ++++ strace-4.5.19/configure 2010-01-01 10:39:36.000000000 +0100
1.20 +@@ -5374,6 +5374,44 @@
1.21 +
1.22 + fi
1.23 +
1.24 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs64 in sys/(statfs|vfs).h" >&5
1.25 ++$as_echo_n "checking for statfs64 in sys/(statfs|vfs).h... " >&6; }
1.26 ++if test "${ac_cv_type_statfs64+set}" = set; then :
1.27 ++ $as_echo_n "(cached) " >&6
1.28 ++else
1.29 ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.30 ++/* end confdefs.h. */
1.31 ++#ifdef LINUX
1.32 ++#include <linux/types.h>
1.33 ++#include <sys/statfs.h>
1.34 ++#else
1.35 ++#include <sys/vfs.h>
1.36 ++#endif
1.37 ++int
1.38 ++main ()
1.39 ++{
1.40 ++struct statfs64 st;
1.41 ++ ;
1.42 ++ return 0;
1.43 ++}
1.44 ++_ACEOF
1.45 ++if ac_fn_c_try_compile "$LINENO"; then :
1.46 ++ ac_cv_type_statfs64=yes
1.47 ++else
1.48 ++ ac_cv_type_statfs64=no
1.49 ++fi
1.50 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.51 ++fi
1.52 ++
1.53 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_statfs64" >&5
1.54 ++$as_echo "$ac_cv_type_statfs64" >&6; }
1.55 ++if test "$ac_cv_type_statfs64" = yes
1.56 ++then
1.57 ++
1.58 ++$as_echo "#define HAVE_STATFS64 1" >>confdefs.h
1.59 ++
1.60 ++fi
1.61 ++
1.62 +
1.63 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
1.64 + $as_echo_n "checking return type of signal handlers... " >&6; }
1.65 +@@ -5773,73 +5811,6 @@
1.66 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.67 + /* end confdefs.h. */
1.68 +
1.69 +-echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
1.70 +-echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
1.71 +-if test "${ac_cv_type_statfs64+set}" = set; then
1.72 +- echo $ECHO_N "(cached) $ECHO_C" >&6
1.73 +-else
1.74 +- cat >conftest.$ac_ext <<_ACEOF
1.75 +-/* confdefs.h. */
1.76 +-_ACEOF
1.77 +-cat confdefs.h >>conftest.$ac_ext
1.78 +-cat >>conftest.$ac_ext <<_ACEOF
1.79 +-/* end confdefs.h. */
1.80 +-#ifdef LINUX
1.81 +-#include <linux/types.h>
1.82 +-#include <sys/statfs.h>
1.83 +-#else
1.84 +-#include <sys/vfs.h>
1.85 +-#endif
1.86 +-int
1.87 +-main ()
1.88 +-{
1.89 +-struct statfs64 st;
1.90 +- ;
1.91 +- return 0;
1.92 +-}
1.93 +-_ACEOF
1.94 +-rm -f conftest.$ac_objext
1.95 +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1.96 +- (eval $ac_compile) 2>conftest.er1
1.97 +- ac_status=$?
1.98 +- grep -v '^ *+' conftest.er1 >conftest.err
1.99 +- rm -f conftest.er1
1.100 +- cat conftest.err >&5
1.101 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.102 +- (exit $ac_status); } &&
1.103 +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
1.104 +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.105 +- (eval $ac_try) 2>&5
1.106 +- ac_status=$?
1.107 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.108 +- (exit $ac_status); }; } &&
1.109 +- { ac_try='test -s conftest.$ac_objext'
1.110 +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
1.111 +- (eval $ac_try) 2>&5
1.112 +- ac_status=$?
1.113 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.114 +- (exit $ac_status); }; }; then
1.115 +- ac_cv_type_statfs64=yes
1.116 +-else
1.117 +- echo "$as_me: failed program was:" >&5
1.118 +-sed 's/^/| /' conftest.$ac_ext >&5
1.119 +-
1.120 +-ac_cv_type_statfs64=no
1.121 +-fi
1.122 +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
1.123 +-fi
1.124 +-
1.125 +-echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
1.126 +-echo "${ECHO_T}$ac_cv_type_statfs64" >&6
1.127 +-if test "$ac_cv_type_statfs64" = yes
1.128 +-then
1.129 +-
1.130 +-cat >>confdefs.h <<\_ACEOF
1.131 +-#define HAVE_STATFS64 1
1.132 +-_ACEOF
1.133 +-
1.134 +-fi
1.135 +-
1.136 +
1.137 + int
1.138 + main ()
1.139 +@@ -5947,7 +5918,7 @@
1.140 + do :
1.141 + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.142 + ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h>
1.143 +-#include <linux/socket.h>
1.144 ++#include <sys/socket.h>
1.145 + "
1.146 + eval as_val=\$$as_ac_Header
1.147 + if test "x$as_val" = x""yes; then :
1.148 +diff -ruN strace-4.5.19.orig/Makefile.in strace-4.5.19/Makefile.in
1.149 +--- strace-4.5.19.orig/Makefile.in 2009-10-21 19:41:14.000000000 +0200
1.150 ++++ strace-4.5.19/Makefile.in 2010-01-01 10:39:36.000000000 +0100
1.151 +@@ -42,8 +42,9 @@
1.152 + subdir = .
1.153 + DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
1.154 + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
1.155 +- $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS INSTALL \
1.156 +- NEWS TODO config.guess config.sub depcomp install-sh missing
1.157 ++ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
1.158 ++ ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
1.159 ++ install-sh missing
1.160 + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1.161 + am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
1.162 + $(top_srcdir)/configure.ac