summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorKirill K. Smirnov <kirill.k.smirnov@gmail.com>2016-09-17 18:59:57 (GMT)
committerKirill K. Smirnov <kirill.k.smirnov@gmail.com>2016-09-17 18:59:57 (GMT)
commit2811011dc6ee93be587345a1989cdc83e8974b9a (patch)
tree268b8c5d8ec8aadb599255a0e9cdfa83afa974e6 /patches
parent01a2000898bb1484c34be51498f34c9ea693caa9 (diff)
patches: cleanup patches for strace 4.5.19
Old series of patches: 1) update configure with old patch for 4.5.18 2) update configure.ac 3) update configure again, effectively reverting changes from 1). Remove patch 1) and regenerate patch 3) Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/strace/4.5.19/100-autoreconf.patch77
-rw-r--r--patches/strace/4.5.19/170-update-configure.patch76
2 files changed, 1 insertions, 152 deletions
diff --git a/patches/strace/4.5.19/100-autoreconf.patch b/patches/strace/4.5.19/100-autoreconf.patch
deleted file mode 100644
index e7972db..0000000
--- a/patches/strace/4.5.19/100-autoreconf.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -durN strace-4.5.19.orig/configure strace-4.5.19/configure
---- strace-4.5.19.orig/configure 2009-10-21 19:41:11.000000000 +0200
-+++ strace-4.5.19/configure 2009-10-28 18:47:18.000000000 +0100
-@@ -5773,6 +5773,73 @@
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-+echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
-+echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
-+if test "${ac_cv_type_statfs64+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#ifdef LINUX
-+#include <linux/types.h>
-+#include <sys/statfs.h>
-+#else
-+#include <sys/vfs.h>
-+#endif
-+int
-+main ()
-+{
-+struct statfs64 st;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_type_statfs64=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_statfs64=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
-+echo "${ECHO_T}$ac_cv_type_statfs64" >&6
-+if test "$ac_cv_type_statfs64" = yes
-+then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_STATFS64 1
-+_ACEOF
-+
-+fi
-+
-
- int
- main ()
diff --git a/patches/strace/4.5.19/170-update-configure.patch b/patches/strace/4.5.19/170-update-configure.patch
index cf90583..5d12276 100644
--- a/patches/strace/4.5.19/170-update-configure.patch
+++ b/patches/strace/4.5.19/170-update-configure.patch
@@ -59,81 +59,7 @@ diff -ruN strace-4.5.19.orig/configure strace-4.5.19/configure
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
$as_echo_n "checking return type of signal handlers... " >&6; }
-@@ -5773,73 +5811,6 @@
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
--echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
--echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
--if test "${ac_cv_type_statfs64+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#ifdef LINUX
--#include <linux/types.h>
--#include <sys/statfs.h>
--#else
--#include <sys/vfs.h>
--#endif
--int
--main ()
--{
--struct statfs64 st;
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_type_statfs64=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_type_statfs64=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
--echo "${ECHO_T}$ac_cv_type_statfs64" >&6
--if test "$ac_cv_type_statfs64" = yes
--then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STATFS64 1
--_ACEOF
--
--fi
--
-
- int
- main ()
-@@ -5947,7 +5918,7 @@
+@@ -5880,7 +5851,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h>