From patchwork Mon Aug 6 22:57:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 143536 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3806860ljj; Mon, 6 Aug 2018 15:58:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfWeR0d1Iwjw1GhhWvmdISTx4gmDwfwtBjU/q6LjLDXxLPX/pCrauUkXTx8fh4zvUKtG25D X-Received: by 2002:a17:902:8b86:: with SMTP id ay6-v6mr15235364plb.25.1533596310923; Mon, 06 Aug 2018 15:58:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533596310; cv=none; d=google.com; s=arc-20160816; b=Av6CuIjnZ3CWCy2saE44/dlSpgqyo+a9kfmobwd0iwOsecPSJTVJlNf68GMpibMT9O Wj9X2Hw35kSd9lF/BL9As0Iwl9c+1mawXJDVe4jEvapiJViL0+VgXtUddmFad95/HgFd qzLfZQLA19EGL1i7fhXNKD6RYL4brby7w6cY6jq6XMOWJmkZfpmvieSimXQaNihUjarQ XHwvraRT4EXB9OpTUWVZLFX+FHYZ5j4FJ1cKK4LuRNglwuKBwnsQefIfUghZpZGSEkGW oxSPMjTuMilcXpPxyFhkjVPiJZT8HDcJK2UyuxDOgmFI2p3/Vkj26EanAjElHIEcnmRP lbFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=cxB0ZSKqH7WrciLbRylhksp3TbdCX0qFMKCXQxHonWg=; b=RYoX2Z4Wj53qHnmwjrRuJ+Q+oGwDrpZG5uhgZohX4jdIUiONYNI9IyIlMb6WUq96WG Nw86CyNY92WqRPwPSEfvvX9A6uqi92gxOci++Zj626cGu6YJ2fapYfLD80Hu9abLY/Os FCY143LU53+8oSJJtin3Sc2/nKHDLs9DcUyHOA9LEHElBOCfGthOsb0me3oJomNR5Kn4 9J9zqx/GiLS0PuQXLs/tbcC1yLFYr6cBjfSK+KUlMQMjTX0VIuCXFTulosE82re01FrN ByFg0HLNepeKisN9MAgt38t1VzhdT6nRV6mJEH/T2/BNhz4ZC4RxqcKSXcEOUoExBRIw DBXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Bp4YpVnE; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w15-v6si10990510ply.501.2018.08.06.15.58.30; Mon, 06 Aug 2018 15:58:30 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Bp4YpVnE; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9251178C1E; Mon, 6 Aug 2018 22:57:50 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl0-f53.google.com (mail-pl0-f53.google.com [209.85.160.53]) by mail.openembedded.org (Postfix) with ESMTP id 870D178BB2 for ; Mon, 6 Aug 2018 22:57:33 +0000 (UTC) Received: by mail-pl0-f53.google.com with SMTP id e11-v6so6252441plb.3 for ; Mon, 06 Aug 2018 15:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JB8orQ2MiNtPbdXuSOmVd4nnQPZKGoHQ9VbMWICjYMM=; b=Bp4YpVnEH0OQgvtTtpm6EMmmuRsYPCwWAFmELFvDemgRJwwjykseo9hsik79k/YKOe GUt0w2VBD+EsUu/Pj9oNcjCvETxIQqcF9tVYFiowE+Ku4uTwiYmkMbF6TzzGdm0zbYib TNS6AUgCeqk/Gj7sxpYWkiTIl9NKgVreKAHZk8t8bbfOuKz8d4Ol3f+WhlR8K5Olzl8L 4dJKiTcVuF5aAHiXOnYXjr8hXeKcWrvqdOErJrQG5wpe2dgorUcOd1x2bWQkN1ZFfWC3 i8a0M5hXR0xNPKqQ2i6pgNNhgGDrnUnspvA88jPYq1JKExiV4kpzdOxdJzziZGdpeApI W5kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JB8orQ2MiNtPbdXuSOmVd4nnQPZKGoHQ9VbMWICjYMM=; b=Rn3nWV6xx0aNU7l9UhYG+ApiBCyBqm7+vQsyOvWnUsVL2mKB/NQAFz1l8YnDgg5NlZ 1uYJtIcuTIK5cQauc/gZcndWMlN1X9GtIIKrdd0kzIWIFdGTOfV9DEvP6of38LUDSMyF GkFCFuiHJA9O1V8SOnWh+PYPTlzmJFGqoYuYzkOaSWFDh+dBtnQ0wblhe7fMTCXR725g 0XbqEPdxp+Ecas0rihM1V13MMdRCq084ApAhc3R0YaoUEoqdEm38+uO7EsISn5t3ICx9 TJEzabHjrieurRUofKgCfcx3sEISRz2PbCq/AroFFKGL3khkunCw+RKB70Qy5Js0tWRe wwEA== X-Gm-Message-State: AOUpUlEYe980AihAr936hCKhgTCJ+OCWDqeeZGmNxbhfLnfhXmKRkkK4 vqrPH5jzJfqJd9N+EWBPmuE2FcTc X-Received: by 2002:a17:902:8482:: with SMTP id c2-v6mr15615936plo.45.1533596254265; Mon, 06 Aug 2018 15:57:34 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::1d00]) by smtp.gmail.com with ESMTPSA id x1-v6sm11993137pgr.59.2018.08.06.15.57.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 15:57:33 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 6 Aug 2018 15:57:05 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 08/18] strace: Fix build with glibc 2.28 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...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" +Date: Sun, 15 Jul 2018 22:14:29 +0000 +Subject: [PATCH] tests: fix build with fresh glibc + +Workaround additional incompatibility between and + introduced by glibc-2.27.9000-566-gfd70af4. + +* tests/xstatx.c (statx, statx_timestamp): Redefine before the inclusion +of 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 +--- + + 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 + # include +-# 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"