diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2018-08-23 16:11:20 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 18:02:19 +0100 |
commit | 20b45274681892cc761bbef87360dc1088d040a1 (patch) | |
tree | 5b67a1bf24574a8d2cc73d6714727ad5772cf3e9 /meta/recipes-devtools/strace | |
parent | 10b935c713748346aea6c36c2f41e0ae6c320821 (diff) | |
download | openembedded-core-contrib-20b45274681892cc761bbef87360dc1088d040a1.tar.gz |
strace: 4.23 -> 4.24
Remove backported patch 0001-tests-fix-build-with-fresh-glibc.patch.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/strace')
-rw-r--r-- | meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace_4.24.bb (renamed from meta/recipes-devtools/strace/strace_4.23.bb) | 5 |
2 files changed, 2 insertions, 45 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 deleted file mode 100644 index ce6e567da0..0000000000 --- a/meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bba1b0085f2a2c83839647fee48628ee054aceb7 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. - -Upstream-Status: Backport [https://gitlab.com/strace/strace/commit/3dbffb7] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - - tests/xstatx.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/xstatx.c b/tests/xstatx.c -index 7fb9326..441f4a8 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 - diff --git a/meta/recipes-devtools/strace/strace_4.23.bb b/meta/recipes-devtools/strace/strace_4.24.bb index d30d440abc..e6f7e9cba7 100644 --- a/meta/recipes-devtools/strace/strace_4.23.bb +++ b/meta/recipes-devtools/strace/strace_4.24.bb @@ -14,10 +14,9 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ - file://0001-tests-fix-build-with-fresh-glibc.patch \ " -SRC_URI[md5sum] = "fad4bba0947553cef34d46a9fd78f039" -SRC_URI[sha256sum] = "7860a6965f1dd832747bd8281a04738274398d32c56e9fbd0a68b1bb9ec09aad" +SRC_URI[md5sum] = "8780136849c85acf76ad3a522aa4462a" +SRC_URI[sha256sum] = "1f4e59fc1edfa2bfb4adf2a748623dc25b105ec79713dd84404199f91b0b0634" inherit autotools ptest bluetooth |