From patchwork Sun Aug 16 22:34:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1345529 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=o5GKLlbw; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BVBp55ssmz9sTH for ; Mon, 17 Aug 2020 08:35:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 70D03203C7; Sun, 16 Aug 2020 22:35:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YfR-e--yGAYY; Sun, 16 Aug 2020 22:35:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0F10B21515; Sun, 16 Aug 2020 22:35:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 65D311BF390 for ; Sun, 16 Aug 2020 22:35:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 61CDB8532E for ; Sun, 16 Aug 2020 22:35:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id POahcWy4NJyE for ; Sun, 16 Aug 2020 22:35:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DD4D88532B for ; Sun, 16 Aug 2020 22:35:03 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id 3so12443980wmi.1 for ; Sun, 16 Aug 2020 15:35:03 -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:mime-version :content-transfer-encoding; bh=lLWDxI6KVmXSgIV3FsNfKnMstbZUj4QNdspOnsp80pE=; b=o5GKLlbwTqh1eOS6VO56TODbpog+7xImjZaBoVgVZbFufGdc/TR8wtILHE/LMU+UI5 KIatEmQ+QIQH/vskYBBe26wpFkxmS6kSsHbLBNhVCn1dUNAxnNjy8WT41eu1Cg9CTShN 1QNa0fFNQxE6yN2Awe0bE6RiHu5jp/lJfiGzQe6slHg63VIWL0H1PrI2mH2Q/riNaSsn SpJ+Juv+otVABazwRDIQNWj3fyc/yb+ZK81uEO2VJOqPnnXidHYw8JdvHVrROOookzWJ 9Gh94e6q1suxHn6mhpVwwO5BWxdjyQUPhJHafFSyNlZ+7RarXEHWEFFrhrBql+qdjFxC iuOg== 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:mime-version :content-transfer-encoding; bh=lLWDxI6KVmXSgIV3FsNfKnMstbZUj4QNdspOnsp80pE=; b=plyrDmkGS8wZrPb5qSofG0b84JNoTQpdJ8g9loiDa3QTcFLmwG5sTSNoBTvvtNQYP7 aBb8rQmS01JTW/MKiQl7AOusChR0B7guNeKKNvSpCc1REakwwxiLi5d5twNa9A0JzSfu 2w+nDwZ/u/MU6sYKxDRf22XkhKCBt7lZ7MS3CbNSe6xt/r8Bgc7FjtNv94yiiGkIy81q ldW5qVIklOPRyed5ms9V1rYPGbIWst7I2oJt3Kk0CIAcricVhb9MHsw59nbDED/QNcab potRlnWBLwbozOhhhYRXC+MWke6izquexrk9Z7BahrvcgjiIbxJ9czFh1uV6FdtvSBsJ NEOg== X-Gm-Message-State: AOAM531qQs4DUkRfnmngotjeeSbUDrcGlP9ziyuc6dF6IcbZiwpW6eE4 NSRc3197Y3zpJAmC3RzZ6vrMWKXCp+c= X-Google-Smtp-Source: ABdhPJy/wf/GylV5IpeVK0LUjTePb/atSKEwyv8fEfzmypPjU+Vl64J+KfhMYSgjNWjHJcyHx7S7Ng== X-Received: by 2002:a05:600c:2116:: with SMTP id u22mr12099432wml.35.1597617300870; Sun, 16 Aug 2020 15:35:00 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id j11sm27174389wrq.69.2020.08.16.15.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Aug 2020 15:35:00 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 17 Aug 2020 00:34:51 +0200 Message-Id: <20200816223451.1490784-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/iftop: fix build with gcc 10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bogdan Radulescu , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/55a8581f11e776439782c228441ef1c8c1243386 Signed-off-by: Fabrice Fontaine --- ...01-ui_common.h-fix-build-with-gcc-10.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch diff --git a/package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch b/package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch new file mode 100644 index 0000000000..4bee03eb1b --- /dev/null +++ b/package/iftop/0001-ui_common.h-fix-build-with-gcc-10.patch @@ -0,0 +1,60 @@ +From 18a9f7732944bfe45023f9dd7528295e7d43e678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 12 Aug 2020 22:31:33 +0200 +Subject: [PATCH] ui_common.h: fix build with gcc 10 + +Define global variables as extern in header to fix the build with gcc 10 +which default to -fno-common: https://gcc.gnu.org/gcc-10/porting_to.html + +Fixes: + - http://autobuild.buildroot.org/results/55a8581f11e776439782c228441ef1c8c1243386 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to iftop-users@lists.beasts.org] +--- + ui_common.c | 6 ++++++ + ui_common.h | 10 +++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/ui_common.c b/ui_common.c +index dcf6646..b1027ec 100644 +--- a/ui_common.c ++++ b/ui_common.c +@@ -17,6 +17,12 @@ + + #include "ui_common.h" + ++sorted_list_type screen_list; ++host_pair_line totals; ++int peaksent, peakrecv, peaktotal; ++hash_type* screen_hash; ++hash_type* service_hash; ++ + /* 2, 10 and 40 seconds */ + int history_divs[HISTORY_DIVISIONS] = {1, 5, 20}; + +diff --git a/ui_common.h b/ui_common.h +index 63ae5bb..add72fe 100644 +--- a/ui_common.h ++++ b/ui_common.h +@@ -33,12 +33,12 @@ typedef struct host_pair_line_tag { + + extern options_t options; + +-sorted_list_type screen_list; +-host_pair_line totals; +-int peaksent, peakrecv, peaktotal; ++extern sorted_list_type screen_list; ++extern host_pair_line totals; ++extern int peaksent, peakrecv, peaktotal; + extern history_type history_totals; +-hash_type* screen_hash; +-hash_type* service_hash; ++extern hash_type* screen_hash; ++extern hash_type* service_hash; + + void analyse_data(void); + void screen_list_init(void); +-- +2.27.0 +