From patchwork Sun Jul 28 16:04:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 169957 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp242092ile; Sun, 28 Jul 2019 09:04:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqySVOkhYkJ9feTd6Go4J7g2oORRoUQ/hovTFDCPyyCf22fDwTR3HjeFslM79LpzWBgPV+Vk X-Received: by 2002:a63:f048:: with SMTP id s8mr71745258pgj.26.1564329870827; Sun, 28 Jul 2019 09:04:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564329870; cv=none; d=google.com; s=arc-20160816; b=n0E/IC1hUn3UQV6hGAa7jN9cGtyL74GlAlGf3NpplocBHNM3LSJ9CtRSg4xGxRyHJr WVIslzQ9vZkRMF/LPG8uRCNj6yC2x1FFtSEgXt/uz883gQUM4TO8od6zD99ARYigzAe7 R/TKw/ojFeFTmLRvL3FPqSf4Oxafex1Iff2sq1NB5+p/o490FY/RczHOou2Pyc7EpQR7 0AfYPPu3xINitr0CXTBjosSJcd76Hp6P5zXtRiR/D3IQaprVptiBPHtmfAiIIcKP0zOv QjirDn0RFdN9TkFNyGpmA5dcLvrRcHrejxOF4GU37sAn2fyKprKTFfunUsetnFhwj3r3 CLUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=F6GaJxI5sgwYMZzSIqoLqvtUv6dd/Fad+G8AZf8Pj4A=; b=BvLNstsaavg1miaadkRREVn3bzwPTkjMA+Fy4uuvq5CeXQxbIfGE/8rkUsUEvNCAjN /ParccT+Ngup5idsHY0cw6zrs3Knpm34fErb4AqNBdS7BDnX6E4sEWMRhQnhGGIGxDm2 l+UW0xSbypxfX4Gi1W963Mu+HF5f19SIyCWoFS6GIFVeT8vSJNeA9cm9ORnXT+mY9pJk uoUdCUcwRJl5wKABXDVvsCWPoNqVjJ38a9BRmVpXadr0GLToEleywas8733O5xd/unAb b0WjJsZX5rho1sRJxFak5PEYu9W4u7ixfHc8YtHZSBUER/OFUEpRli6cLUyVoCyghd+F vSOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nAecGqef; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-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 t18si21835298plo.328.2019.07.28.09.04.30; Sun, 28 Jul 2019 09:04:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=nAecGqef; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7620A7F214; Sun, 28 Jul 2019 16:04:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id C87227BD9A for ; Sun, 28 Jul 2019 16:04:09 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id a93so26491994pla.7 for ; Sun, 28 Jul 2019 09:04:11 -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 :mime-version:content-transfer-encoding; bh=28d1IDl2001hRXgb9etoA9b3fY+DEvl2dCuTroG3iQA=; b=nAecGqefe1FBh4OdRXPCTxJYqFwDkQiOlkEbSPz2H6JdTqZB46tsm11Z/KYfNFX1LG ykDVySL0m+AbytwQPVhVSda7wP3Eod+3ShRLRoLY69NV76Och5CTT5T5W+SyIcEFFbhg b2AGmSMNRPluD2fxlbkuuo/6T5wEnA+R91g2+bTSNCvrbuTeckmZFzQCYv8UQhq401V5 QQ6tHFyJ7OIQVBrQWLLhRMvQckk0zaquDtCAyO3CVhYs5GWEtYRq56AtIFqsSar5N9gp YvrPN42v0aMFPfNrnOmREx6ewVHJd3/0peR5/F81syUEwHfTZ48mzPuhp3xWD+B6vdiZ n7mw== 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:mime-version:content-transfer-encoding; bh=28d1IDl2001hRXgb9etoA9b3fY+DEvl2dCuTroG3iQA=; b=b6dZ9vFdagakOHw8xfha3GAjwgUru2va1FrVTlAO1IpQqUibeiZzXlr1EZ3LgJXxtp dfmH9JTt1DHbu37XzmrVvOnSUPfEYIntSGkIzz6kPsuJ2TSJY59CSpDOczkdXapku+z0 mhnCeY4gue40yQLrabvjWJTbIOqAMGUUZL5aCt8+PzJfBuzHxyRpODbvYrTJUoLDdbIQ jVueGE+HjKfUANlOOe9mR560v3hfc9OrSz2f0KTAC0WkwvXegU5T866hAupZUhif/Va4 rCVxiINpoXud0YJC5McmGqenkTVdcWMVfSMRKEiQ5ngJzNXK0vuMooSDmr8eHieYEkjm sdXg== X-Gm-Message-State: APjAAAVxgBi0iczBCGwPEOllG7kQOxFPk5ADfrEqMVqf7oqwPpy9ULG6 Bx21LS7MlfdGUwCa8CGGp3LPU6PN58M= X-Received: by 2002:a17:902:1102:: with SMTP id d2mr105825455pla.149.1564329850713; Sun, 28 Jul 2019 09:04:10 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id j1sm82508439pgl.12.2019.07.28.09.04.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 28 Jul 2019 09:04:10 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 28 Jul 2019 09:04:01 -0700 Message-Id: <20190728160401.23849-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190728160401.23849-1-raj.khem@gmail.com> References: <20190728160401.23849-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH v2 2/2] collectd: Fix build with glibc 2.30 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- v2: Apply the fix just for glibc based systems ...-sys-sysctl.h-on-glibc-based-systems.patch | 76 +++++++++++++++++++ .../collectd/collectd_5.8.1.bb | 1 + 2 files changed, 77 insertions(+) create mode 100644 meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch -- 2.22.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch b/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch new file mode 100644 index 0000000000..86a1a82cf7 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch @@ -0,0 +1,76 @@ +From 090a17ca338a9311d682ecc5933b32bff67cf07f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 27 Jul 2019 14:20:14 -0700 +Subject: [PATCH] Remove including sys/sysctl.h on glibc based systems + +Glibc 2.30 has added deprecation notice and collectd detects it as warning [1] + +Fixes +sys/sysctl.h:21:2: error: "The header is deprecated and will be removed." [-Werror,-W#warnings] + +[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=744e829637162bb7d5029632aacf341c64b86990 + +Upstream-Status: Submitted [https://github.com/collectd/collectd/pull/3234] +Signed-off-by: Khem Raj +--- + src/contextswitch.c | 2 +- + src/memory.c | 2 +- + src/swap.c | 2 +- + src/uuid.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/contextswitch.c b/src/contextswitch.c +index cf3d3dae..4711e66d 100644 +--- a/src/contextswitch.c ++++ b/src/contextswitch.c +@@ -26,7 +26,7 @@ + #include "plugin.h" + #include "utils/common/common.h" + +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include + #endif + +diff --git a/src/memory.c b/src/memory.c +index 10bccdee..50a80868 100644 +--- a/src/memory.c ++++ b/src/memory.c +@@ -28,7 +28,7 @@ + #include "plugin.h" + #include "utils/common/common.h" + +-#ifdef HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include + #endif + #ifdef HAVE_SYS_VMMETER_H +diff --git a/src/swap.c b/src/swap.c +index 61c9e284..5a475e4f 100644 +--- a/src/swap.c ++++ b/src/swap.c +@@ -49,7 +49,7 @@ + #if HAVE_SYS_PARAM_H + #include + #endif +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include + #endif + #if HAVE_SYS_DKSTAT_H +diff --git a/src/uuid.c b/src/uuid.c +index 60d09b51..17e4dd81 100644 +--- a/src/uuid.c ++++ b/src/uuid.c +@@ -29,7 +29,7 @@ + #include "plugin.h" + #include "utils/common/common.h" + +-#if HAVE_SYS_SYSCTL_H ++#if defined(HAVE_SYS_SYSCTL_H) && !defined(__GLIBC__) + #include + #endif + +-- +2.22.0 + diff --git a/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb b/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb index 6dff18c16b..0951ac076f 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.8.1.bb @@ -14,6 +14,7 @@ SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://0005-Disable-new-gcc8-warnings.patch \ file://0006-libcollectdclient-Fix-string-overflow-errors.patch \ + file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \ " SRC_URI[md5sum] = "bfce96c42cede5243028510bcc57c1e6" SRC_URI[sha256sum] = "e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da"