summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-06 15:57:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-08 10:51:59 +0100
commite803b9567ac5340ec354d4f21e36f17c68aa4805 (patch)
treeb2defab44bcd73ad84ba80a296a723e1105dcdc5 /meta
parent5e441f3f8aa896e264f44ba8b699e5841cceade4 (diff)
downloadpoky-e803b9567ac5340ec354d4f21e36f17c68aa4805.tar.gz
strace: Fix build with glibc 2.28
(From OE-Core rev: 2a37692d591411b05bfd9f0745ae00678b587b67) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch42
-rw-r--r--meta/recipes-devtools/strace/strace_4.23.bb1
2 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch b/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch
new file mode 100644
index 0000000000..ce6e567da0
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch
@@ -0,0 +1,42 @@
1From bba1b0085f2a2c83839647fee48628ee054aceb7 Mon Sep 17 00:00:00 2001
2From: "Dmitry V. Levin" <ldv@altlinux.org>
3Date: Sun, 15 Jul 2018 22:14:29 +0000
4Subject: [PATCH] tests: fix build with fresh glibc
5
6Workaround additional incompatibility between <sys/stat.h> and
7<asm/stat.h> introduced by glibc-2.27.9000-566-gfd70af4.
8
9* tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion
10of <sys/stat.h> to avoid conflicts between definitions provided by the
11linux kernel headers and the GNU libc.
12
13Upstream-Status: Backport [https://gitlab.com/strace/strace/commit/3dbffb7]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16
17 tests/xstatx.c | 6 +++++-
18 1 file changed, 5 insertions(+), 1 deletion(-)
19
20diff --git a/tests/xstatx.c b/tests/xstatx.c
21index 7fb9326..441f4a8 100644
22--- a/tests/xstatx.c
23+++ b/tests/xstatx.c
24@@ -64,10 +64,14 @@ typedef off_t libc_off_t;
25
26 # define stat libc_stat
27 # define stat64 libc_stat64
28+# define statx libc_statx
29+# define statx_timestamp libc_statx_timestamp
30 # include <fcntl.h>
31 # include <sys/stat.h>
32-# undef stat
33+# undef statx_timestamp
34+# undef statx
35 # undef stat64
36+# undef stat
37
38 # undef st_atime
39 # undef st_mtime
40--
412.18.0
42
diff --git a/meta/recipes-devtools/strace/strace_4.23.bb b/meta/recipes-devtools/strace/strace_4.23.bb
index 0c159fc6f6..d30d440abc 100644
--- a/meta/recipes-devtools/strace/strace_4.23.bb
+++ b/meta/recipes-devtools/strace/strace_4.23.bb
@@ -14,6 +14,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
14 file://mips-SIGEMT.patch \ 14 file://mips-SIGEMT.patch \
15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ 16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
17 file://0001-tests-fix-build-with-fresh-glibc.patch \
17 " 18 "
18SRC_URI[md5sum] = "fad4bba0947553cef34d46a9fd78f039" 19SRC_URI[md5sum] = "fad4bba0947553cef34d46a9fd78f039"
19SRC_URI[sha256sum] = "7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad" 20SRC_URI[sha256sum] = "7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad"