patches/strace/4.5.17/100-autoreconf.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 746 b150d6f590fc
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

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