Accepting request 626905 from devel:tools

- statx-redefinition.patch: Workaround incompatibility between
  <sys/stat.h> and <asm/stat.h> (forwarded request 626904 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/626905
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/strace?expand=0&rev=68

statx-redefinition.patch

@@ -0,0 +1,38 @@
+From 3dbffb74cc2b4323016ba8ba05380a6aba5f3a8f Mon Sep 17 00:00:00 2001
+From: "Dmitry V. Levin" <ldv@altlinux.org>
+Date: Sun, 15 Jul 2018 22:14:29 +0000
+Subject: [PATCH] tests: fix build with fresh glibc
+
+Workaround additional incompatibility between <sys/stat.h> and
+<asm/stat.h> introduced by glibc-2.27.9000-566-gfd70af4.
+
+* tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion
+of <sys/stat.h> to avoid conflicts between definitions provided by the
+linux kernel headers and the GNU libc.
+---
+ tests/xstatx.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/xstatx.c b/tests/xstatx.c
+index 7fb9326589..441f4a8305 100644
+--- a/tests/xstatx.c
++++ b/tests/xstatx.c
+@@ -64,10 +64,14 @@ typedef off_t libc_off_t;
+ 
+ # define stat libc_stat
+ # define stat64 libc_stat64
++# define statx libc_statx
++# define statx_timestamp libc_statx_timestamp
+ # include <fcntl.h>
+ # include <sys/stat.h>
+-# undef stat
++# undef statx_timestamp
++# undef statx
+ # undef stat64
++# undef stat
+ 
+ # undef st_atime
+ # undef st_mtime
+-- 
+2.18.0
+

strace.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug  1 13:19:36 UTC 2018 - schwab@suse.de
+
+- statx-redefinition.patch: Workaround incompatibility between
+  <sys/stat.h> and <asm/stat.h>
+
 -------------------------------------------------------------------
 Sat Jun 16 13:55:58 UTC 2018 - schwab@linux-m68k.org
 

strace.spec

@@ -29,6 +29,7 @@ Source:         https://github.com/strace/strace/releases/download/v%{version}/%
 Source2:        https://github.com/strace/strace/releases/download/v%{version}/%{name}-%{version}.tar.xz.asc
 Source3:        %{name}.keyring
 Source4:        baselibs.conf
+Patch1:         statx-redefinition.patch
 BuildRequires:  haveged
 BuildRequires:  libacl-devel
 BuildRequires:  libaio-devel
@@ -58,6 +59,7 @@ and processes can be seen.  Child processes can also be tracked.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure \