From patchwork Tue Jul 18 03:10:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108051 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp5336757qge; Mon, 17 Jul 2017 20:12:18 -0700 (PDT) X-Received: by 10.84.176.100 with SMTP id u91mr846483plb.182.1500347538469; Mon, 17 Jul 2017 20:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500347538; cv=none; d=google.com; s=arc-20160816; b=h9u/g3MHBO0aRU4p87ru/HrhUZwWa+K/TE7B1Jmt1lLg+l/nLZFNSrq9L4VmaW0erq +S567eynnFG0egny5Jdrbh7FU1ZjsZUsnfvoh5MPiMgrzKqP/3UsS2D7FpSTaLjxa2yd JwWdztim5tKE9FUTQJIdN7uNj4/jBgCcjHaRA1zUjg8QiQyMmKvEHv+4QaXhb8UjgNyp Qw6X6bEE6vKM8OAHWYJXP37n0qYGXuxLYN9wX7vDESncrrFXzNz1L4Fvb/hiUtsl4jh5 PI1Pb99TWQh0f1mByvxX1a8a1lsIdDjvu7giJyM5K1HQ8H2d6jrlYI/uaOC63rMDqDJ0 5ipw== 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=NrrSeAW1sm0kJb2xuC4fibvN+HXSjcDkJ90k2Zq9has=; b=kRyJBxN6y60sFthXxBSN2tNWrfa/0QqqSGtnSBW0yLoD0F7uNgvg6R3J8pSStzPu7N tqLsEC3nqPo4MRdmIJM6XYZ44/A/Y/KAKWvfNfqMydVLwQ7X0A2TZmk5Em3zbC49e+mo /2texthhjtnXWVU1Zuez1UQHVxrjmuJ8RW064qaiFMhLB/cKU7VvpRpT/wZGXYu7Y0m2 Nm4cCD5fRzEfobpRAaZggkYydns29eM0al9imIIPzi9CJRlfnb9uIVY85JEXPQuu+Bbb /l9a0gpDfl8RJCVorPXabuCkJm1EyvDZV0gtKitwWuwk3asrxokXHf+F7UKJCnCAEMsH iSfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=YNp3gBE8; 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=NONE 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 1si745376pgw.226.2017.07.17.20.12.18; Mon, 17 Jul 2017 20:12:18 -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.b=YNp3gBE8; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B839478187; Tue, 18 Jul 2017 03:10:50 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 636F878075 for ; Tue, 18 Jul 2017 03:10:42 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id z1so1060074pgs.0 for ; Mon, 17 Jul 2017 20:10:44 -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=wJwLV3JJRITdVgWXacnPfiphMJeaWy0zEF8uFIak3sg=; b=YNp3gBE8ZVNUjyc4rWEgpuPWfRcM3EYOUke40Afo90xgorreSu+cabGxX6RbVrKRb+ eqjG0i0uwnA58VghTdoONebE6NHFqOEiirRKUAucxQwF3A/BJmnVBmoC4LQwpDMcaG8Y 61xpaky0dVuSvMHFnjfsd6fXwQpYcGzpLWEHQPqxphqj6FFCbXlt6UiTKcDSPD26dFkh j5Awjjb0FMirGnjhrODvBMchWvJKRJDX8E0dmvFRXUAXjxCvoqiRXdAes3wH63J6SesF xhlfj2XcE7iT9NIn9gQi0t8WjoJVJw5joCkRhsx4c1THt+JDWrpwfAapCCeQMQsvCOKj XD4w== 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=wJwLV3JJRITdVgWXacnPfiphMJeaWy0zEF8uFIak3sg=; b=OmyAQpiI2lSvlD28YQFKB3sM8pVkqs4/GUFsmWWY8gKlAMFCeFKIGnzUY3XHlqye2v WmkV1o9xLmXXjEQo6T/sCseM6v45oiKfDl7Pk111FVvd3+XGg3OwGDSDGVzvLcnzOG39 lIC2dniRtkD6KatX5kmiZ0YuYQwiYPaSO0cbvqMveYUkwKuZZSowqInEHgTRq4f81Pbs vH+JZ2LjO8x4UKnduz9e/8wyuL3/3WIChyzadIUwHKR3OKCel0s3EyYiZ8gDqXgl/WXb FWnzfkGI8STAon09dJAwQYeDksjTW2wQFQrj8YQI7ula+5/mFvwhtejJpOKQI1pu7igS qELA== X-Gm-Message-State: AIVw112J3Np5XrobYMDlbWZXqjniJaENuvrsS9CQhuYIxU0pa/OzlftT chpZRdLSZftBrYUs X-Received: by 10.98.28.71 with SMTP id c68mr827379pfc.116.1500347443736; Mon, 17 Jul 2017 20:10:43 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id w85sm1086674pfj.115.2017.07.17.20.10.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 20:10:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 17 Jul 2017 20:10:10 -0700 Message-Id: <20170718031013.44536-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170718031013.44536-1-raj.khem@gmail.com> References: <20170718031013.44536-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 14/17] nicstat: Fix build on musl/x86_64 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...tat.c-Do-not-define-uint64_t-and-uint32_t.patch | 37 ++++++++++++++++++++++ meta-oe/recipes-extended/nicstat/nicstat_1.95.bb | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch new file mode 100644 index 000000000..a208f97eb --- /dev/null +++ b/meta-oe/recipes-extended/nicstat/nicstat/0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch @@ -0,0 +1,37 @@ +From 52590fbf735cef3fec85a042458aa89a02c52b57 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 15 Jul 2017 11:33:12 -0700 +Subject: [PATCH] nicstat.c: Do not define uint64_t and uint32_t + +Use the defines from platform + +Signed-off-by: Khem Raj + +--- + nicstat.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/nicstat.c b/nicstat.c +index 83ad557..2a6e0c1 100644 +--- a/nicstat.c ++++ b/nicstat.c +@@ -32,6 +32,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -88,8 +89,6 @@ + #define PROC_NET_BUFSIZ (128 * 1024) + #define PROC_UPTIME "/proc/uptime" + /* Needs to be fixed if not built under ILP32 */ +-typedef unsigned long long uint64_t; +-typedef unsigned int uint32_t; + extern char *optarg; + extern int optind, opterr, optopt; + #endif /* OS_LINUX */ +-- +2.13.3 + diff --git a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb index 5126a31cd..3875f0f60 100644 --- a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb +++ b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb @@ -5,7 +5,9 @@ HOMEPAGE = "http://nicstat.sourceforge.net" LICENSE = "Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0" -SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz" +SRC_URI = "http://softlayer-sng.dl.sourceforge.net/project/${BPN}/${BP}.tar.gz \ + file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \ + " SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d" SRC_URI[sha256sum] = "c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367"