From patchwork Wed Sep 23 17:16:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1369974 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.133; helo=hemlock.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=MFEYjap7; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BxPwF2qc0z9sSn for ; Thu, 24 Sep 2020 03:16:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 83EA784F98; Wed, 23 Sep 2020 17:16:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qxRoknZ8P7yW; Wed, 23 Sep 2020 17:16:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E79F884FB8; Wed, 23 Sep 2020 17:16:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4DD871BF21A for ; Wed, 23 Sep 2020 17:16:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4A04B872F5 for ; Wed, 23 Sep 2020 17:16:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6TBfB+mp+E7e for ; Wed, 23 Sep 2020 17:16:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6B7B987357 for ; Wed, 23 Sep 2020 17:16:07 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id z1so885133wrt.3 for ; Wed, 23 Sep 2020 10:16:07 -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=L23rGMyPEt3TuIj3+AJ9X3EAg2LaH9v6CmgI3s44bj8=; b=MFEYjap7aL2g0Rb+9brP2wArQ57d57+t0Yw7Wlt96h0FC0gHwe7ghkU4drrcQc/d4l d4AfGTi5JX1BnXNG3Pund0khMaKb/cMPaE8CDl6sd0kn8hjZkdf5s5HNt4ZVrPtYVRBu dBgI5XBfy+/lMN23dDfr6C5fBvWCfkhcZiWeF1pkbd6TfMv9jBqmEqYBDlLk3Bcpydj3 YaYJyf9kG/22Iz11n87jn4geiM5kKpYwLxW0BVuXfUb+nu4n5gD3X7n/5/ctEORVR88T 9PVb5OjBp4RWUciolx6E/sLC6VnJgGzMj7130btlYLPwAyyfMwOAgq7rPGSzQJZL+6U/ QYDQ== 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=L23rGMyPEt3TuIj3+AJ9X3EAg2LaH9v6CmgI3s44bj8=; b=IM+dy/0PFV/YYXagr1XRlMhttC2lrrFe+cEMFooWtw2Q9PoyEXwvbeNlDsp6cjXruq dCn4zN4Sh1L9Ywmsndt1H9q44JtjfDeR4UN8Ea+CyMXImulw5ZwkQ1Bjlox3/FgEtRyv QSytAJJcFTCKGDcCpWxzWT5+8txgdaPLg4CdYgdT+zOzjMTQnHOiyYiPFzdYN8ryGupI DDUNlA7hqz/6BgLMM4eftC9X4445jLp9k1+4tv0B4hVTjMHEy8omsSaF0SSizpmLYZni 4K/pDxPKbhMiRWatsxPGT7zQcKjV/jrlvXB+5mrrllTYLeTv6e8GtHR14g+SSiIXnCtE RzNg== X-Gm-Message-State: AOAM530PU2p2FwfmYy2Ap3hMnyCGYuN1WG2c/OH8fT1wP+uEgODaihYV N0b95ZXLg5FAYeJjBButBQE4WVZe2EI= X-Google-Smtp-Source: ABdhPJx3kHedhd7iNeJh2myOQ03QdnFVNdsrQeV0ItEugUsAa148i6Kx5RsSoa7nhK0SQAvU21iqRA== X-Received: by 2002:a5d:458a:: with SMTP id p10mr696915wrq.282.1600881365512; Wed, 23 Sep 2020 10:16:05 -0700 (PDT) Received: from kali.home (2a01cb0881b76d0062c55ff6bf2a37aa.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:62c5:5ff6:bf2a:37aa]) by smtp.gmail.com with ESMTPSA id k22sm493869wrd.29.2020.09.23.10.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2020 10:16:04 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 23 Sep 2020 19:16:01 +0200 Message-Id: <20200923171601.353451-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/open-plc-utils: 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: Fabrice Fontaine , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483 Signed-off-by: Fabrice Fontaine --- ...0002-plc-plc.h-fix-build-with-gcc-10.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch diff --git a/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch b/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch new file mode 100644 index 0000000000..063bfc536c --- /dev/null +++ b/package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch @@ -0,0 +1,37 @@ +From 27222be0b8db59cae30a5fcca93255daea147bb6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 23 Sep 2020 19:05:23 +0200 +Subject: [PATCH] plc/plc.h: fix build with gcc 10 + +Drop plcproperty from plc/plc.h to avoid the following build failure +with gcc 10 (which defaults to -fno-common): + +/home/buildroot/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: rules.o:(.bss+0x0): multiple definition of `plcproperty'; pibruin.o:(.bss+0x0): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/6b3064b64dea3d4aaf219f787429c25918101483 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/qca/open-plc-utils/pull/141] +--- + plc/plc.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/plc/plc.h b/plc/plc.h +index 1fa32b53..208cf91a 100644 +--- a/plc/plc.h ++++ b/plc/plc.h +@@ -496,9 +496,7 @@ struct __packed plcproperty + uint8_t DATA_FORMAT; + uint32_t DATA_LENGTH; + uint8_t DATA_BUFFER [128]; +-} +- +-plcproperty; ++}; + + #ifndef __GNUC__ + #pragma pack (pop) +-- +2.28.0 +