[08/18] strace: Fix build with glibc 2.28

Message ID	b9df34fabd8b908df7767261bdac250a5cf164e5.1533595822.git.raj.khem@gmail.com
State	Accepted
Commit	2a37692d591411b05bfd9f0745ae00678b587b67
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; From: Khem Raj <raj.khem@gmail.com> To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:05 -0700 Message-Id: <b9df34fabd8b908df7767261bdac250a5cf164e5.1533595822.git.raj.khem@gmail.com> In-Reply-To: <cover.1533595822.git.raj.khem@gmail.com> References: <cover.1533595822.git.raj.khem@gmail.com> Subject: [OE-core] [PATCH 08/18] strace: Fix build with glibc 2.28 Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org
Series	Update to glibc 2.28 \| expand [V2,00/18] Update to glibc 2.28 [01/18] glibc: Upgrade to 2.28 [02/18] systemd: Detect if statx struct is defined in sys/stat.h [03/18] m4: Workaround gnulib's fseeko.c implementation [04/18] findutils: Fix build with glibc 2.28 [05/18] bootchart2: Update to master-tip [06/18] gzip: Fix build with glibc 2.28 [07/18] bison: Fix build break with glibc 2.28 [08/18] strace: Fix build with glibc 2.28 [09/18] blktool: Fix build with glibc 2.28 [10/18] ppp: Use openssl for the DES instead of the libcrypt / glibc [11/18] glibc: Drop packaging libcrypt from 2.28+ onwards [12/18] file: Update to 5.34 [13/18] Disable crypt support in glibc [14/18] libxcrypt: Provide virtual/crypt for target and native as well [15/18] libxcrypt: Upgrade to 4.1.1 [16/18] cross-localedef-native: Update to build with glibc 2.28 [17/18] ppp, libpam: Add missing dep on virtual/crypt [18/18] sysvinit: Fix build with glibc 2.28 + libxcrypt

Message ID

b9df34fabd8b908df7767261bdac250a5cf164e5.1533595822.git.raj.khem@gmail.com

State

Accepted

Commit

2a37692d591411b05bfd9f0745ae00678b587b67

Headers

Received-SPF: pass (google.com: best guess record for domain of
	openembedded-core-bounces@lists.openembedded.org designates
	140.211.169.62 as permitted sender) client-ip=140.211.169.62; 
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Date: Mon,  6 Aug 2018 15:57:05 -0700
Message-Id: <b9df34fabd8b908df7767261bdac250a5cf164e5.1533595822.git.raj.khem@gmail.com>
In-Reply-To: <cover.1533595822.git.raj.khem@gmail.com>
References: <cover.1533595822.git.raj.khem@gmail.com>
Subject: [OE-core] [PATCH 08/18] strace: Fix build with glibc 2.28
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: openembedded-core-bounces@lists.openembedded.org
Errors-To: openembedded-core-bounces@lists.openembedded.org

Series

Update to glibc 2.28 | expand

Commit Message

Khem Raj Aug. 6, 2018, 10:57 p.m. UTC

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...001-tests-fix-build-with-fresh-glibc.patch | 42 +++++++++++++++++++
 meta/recipes-devtools/strace/strace_4.23.bb   |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta/recipes-devtools/strace/strace/0001-tests-fix-build-with-fresh-glibc.patch

-- 
2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

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 @@ 
+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.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 \
            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"