Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/strace/4.5.19/130-statfs64-check.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Wed Jun 08 15:47:43 2011 +0200 (2011-06-08)
changeset 2508 9e2761e59a75
permissions -rw-r--r--
debug/cross-gdb: check host dependencies

Cross-gdb depends on expat and python. If either is missing, cross-gdb will
build successfully, but lacking some features.

Especially, if expat is missing, cross-gdb will be unable to parse the target
description, which may lead to runtime malfunctions and the following GDB
warning:
"Can not parse XML target description; XML support was disabled at compile time"

Hence, expat should be considered mandatory.

On the other hand, the features missing without python are not critical, so
python should not be considered mandatory.

This patch does the following:
- At configure time, warn the user if either expat or python is missing.
- In menuconfig, disable the static build options regarding cross-gdb if no
static version of expat is available, and disable cross-gdb if expat is
missing.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
[yann.morin.1998@anciens.enib.fr: add comment for impossible static cross-gdb]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 diff -durN strace-4.5.19.orig/acinclude.m4 strace-4.5.19/acinclude.m4

     2 --- strace-4.5.19.orig/acinclude.m4	2004-04-14 04:45:53.000000000 +0200

     3 +++ strace-4.5.19/acinclude.m4	2009-10-28 18:47:18.000000000 +0100

     4 @@ -210,6 +210,26 @@

     5  fi

     6  ])

     7  

     8 +dnl ### A macro to determine whether statfs64 is defined.

     9 +AC_DEFUN([AC_STATFS64],

    10 +[AC_MSG_CHECKING(for statfs64 in sys/(statfs|vfs).h)

    11 +AC_CACHE_VAL(ac_cv_type_statfs64,

    12 +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef LINUX

    13 +#include <linux/types.h>

    14 +#include <sys/statfs.h>

    15 +#else

    16 +#include <sys/vfs.h>

    17 +#endif]], [[struct statfs64 st;]])],[ac_cv_type_statfs64=yes],[ac_cv_type_statfs64=no])])

    18 +AC_MSG_RESULT($ac_cv_type_statfs64)

    19 +if test "$ac_cv_type_statfs64" = yes

    20 +then

    21 +	AC_DEFINE([HAVE_STATFS64], 1,

    22 +[Define if statfs64 is available in sys/statfs.h or sys/vfs.h.])

    23 +fi

    24 +])

    25 +

    26 +

    27 +

    28  dnl ### A macro to determine if off_t is a long long

    29  AC_DEFUN([AC_OFF_T_IS_LONG_LONG],

    30  [AC_MSG_CHECKING(for long long off_t)

    31 diff -durN strace-4.5.19.orig/configure.ac strace-4.5.19/configure.ac

    32 --- strace-4.5.19.orig/configure.ac	2009-10-12 21:54:43.000000000 +0200

    33 +++ strace-4.5.19/configure.ac	2009-10-28 18:47:18.000000000 +0100

    34 @@ -187,6 +187,7 @@

    35  		  struct stat.st_level,

    36  		  struct stat.st_rdev])

    37  AC_STAT64

    38 +AC_STATFS64

    39  

    40  AC_TYPE_SIGNAL

    41  AC_TYPE_UID_T

    42 diff -durN strace-4.5.19.orig/file.c strace-4.5.19/file.c

    43 --- strace-4.5.19.orig/file.c	2009-10-21 15:44:04.000000000 +0200

    44 +++ strace-4.5.19/file.c	2009-10-28 18:47:18.000000000 +0100

    45 @@ -1688,7 +1688,7 @@

    46  	return 0;

    47  }

    48  

    49 -#ifdef LINUX

    50 +#ifdef HAVE_STATFS64

    51  static void

    52  printstatfs64(struct tcb *tcp, long addr)

    53  {
crosstool-ng