From patchwork Fri Sep 25 21:43:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1371617 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=YVsikN1U; 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 4BylmQ5z0nz9ryj for ; Sat, 26 Sep 2020 07:44:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 28E0187697; Fri, 25 Sep 2020 21:44:01 +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 0hItCMQU6RVj; Fri, 25 Sep 2020 21:43:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C808F8768C; Fri, 25 Sep 2020 21:43:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8E5111BF5AE for ; Fri, 25 Sep 2020 21:43:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B04C86C08 for ; Fri, 25 Sep 2020 21:43:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L5uxBMue8+2I for ; Fri, 25 Sep 2020 21:43:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5C21B86AFE for ; Fri, 25 Sep 2020 21:43:57 +0000 (UTC) Received: by mail-wm1-f43.google.com with SMTP id k18so728444wmj.5 for ; Fri, 25 Sep 2020 14:43:57 -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=eIpCRZgQdkj7s5DOwj3Cu1FQhpua0LwqLPcG8RITw24=; b=YVsikN1U+u8RkcPxR3f65TPe//F6Z15dIZeojeeyd0Gqayt+qCmfoIdFoH45Pj5e9h jw5IoV4r+QmeB++Hn6TnY3MOcR+KrnXvBaFfnxNApn1bvEoRKgvQQjoEUItUYXTEu6ea WntNN6xH80Lzo1F3BgwHaKUkIIg6kYN0ObtlczBtsIDRtDcQeweVH4xwK5QDTxQOp+JK sh+zvQMYjD++lFwMJ7n5ZZS8UqkapPZ/X2FXfRzVhAfKw9LZ8GnXg6CHclfpDHieJOQq pdcRt86BvNT8OKEMSKeNK/oby15gEnHXOOfGFNqxhecyS2yvoYzYp19bkrmZp/Z+Q4js CQwg== 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=eIpCRZgQdkj7s5DOwj3Cu1FQhpua0LwqLPcG8RITw24=; b=bDUvCtOPwA/Ty/iTwb3IxP3UaCum4Wa1mCYPsQWiXdjnDC5tITH5f98H+k3PBKgVmD IuwpGFtGdFzi1T6rrI0dLCaAstJjCPpR1gH3i+iT5yMYJK/AjouhKu+Y7agBEUE5pxf7 W+H5jZkawZcvDfLPaeRQFcG1DGkHF9w3heb4CzTYM47R54YXsgp+gnseyQ44WrY5q2UP KSkCDu24wdImG+w0gd4vLMBdjJ5+k2DdkJX0byHVlBaHQisBsaN6DH7/WKWd3tSdIvhI tZyIv6d/MZroPFBQlOwcXJE88fpz72/fpS1+H06dFz5cwjR2bVHqUbPpsGMa10avDsdV IaYQ== X-Gm-Message-State: AOAM532oW89LX7Xk1UDHP09AcQ4EN8l9fXbpbPCv6jA4tERY9vcM4WnH VdSJoLMGvB2LCYtR2W391TPM17q6fso= X-Google-Smtp-Source: ABdhPJwyrHpv9r+bcZS2KbeMgSOzLEhwwcv3mVJcLC35Feo+Ppr+g0Gc6G7t2Ic/1PJmb7/JfdFKPw== X-Received: by 2002:a05:600c:2105:: with SMTP id u5mr571040wml.150.1601070235224; Fri, 25 Sep 2020 14:43:55 -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 f6sm4240734wro.5.2020.09.25.14.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 14:43:54 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 25 Sep 2020 23:43:44 +0200 Message-Id: <20200925214344.3723600-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/socketcand: 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 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Also update socketcand.hash as the patch is updating socketcand.c Fixes: - http://autobuild.buildroot.org/results/a72f3e34c161a012e8091db331d02bbf2da6ad94 Signed-off-by: Fabrice Fontaine --- .../0001-Fix-GCC10-build-failure.patch | 113 ++++++++++++++++++ package/socketcand/socketcand.hash | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 package/socketcand/0001-Fix-GCC10-build-failure.patch diff --git a/package/socketcand/0001-Fix-GCC10-build-failure.patch b/package/socketcand/0001-Fix-GCC10-build-failure.patch new file mode 100644 index 0000000000..057cd40657 --- /dev/null +++ b/package/socketcand/0001-Fix-GCC10-build-failure.patch @@ -0,0 +1,113 @@ +From ae0af080058a576d62c72ffc011d644d0b4dcb98 Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Tue, 7 Jul 2020 19:39:41 +0200 +Subject: [PATCH] Fix GCC10 build failure (#17) + +GCC10 breaks on multiple definitions: + +ld: /tmp/ccFiGYO7.o:(.bss+0x114): multiple definition of `tv'; /tmp/cc7f6J5h.o:(.bss+0x80): first defined here + +Change the scope of the related variables. + +Signed-off-by: Yegor Yefremov + +[Retrieved from: +https://github.com/linux-can/socketcand/commit/ae0af080058a576d62c72ffc011d644d0b4dcb98] +Signed-off-by: Fabrice Fontaine +--- + socketcand.c | 3 ++- + state_bcm.c | 4 ++-- + state_isotp.c | 2 +- + state_raw.c | 2 +- + 4 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/socketcand.c b/socketcand.c +index 8d84754..6125be9 100644 +--- a/socketcand.c ++++ b/socketcand.c +@@ -102,7 +102,6 @@ socklen_t unaddrlen; + struct sockaddr_un remote_unaddr; + socklen_t remote_unaddrlen; + char* interface_string; +-struct ifreq ifr, ifr_brd; + + int state_changed(char *buf, int current_state) + { +@@ -666,6 +665,8 @@ int receive_command(int socket, char *buffer) { + } + + void determine_adress() { ++ struct ifreq ifr, ifr_brd; ++ + int probe_socket = socket(AF_INET, SOCK_DGRAM, 0); + + if(probe_socket < 0) { +diff --git a/state_bcm.c b/state_bcm.c +index cfaa8ed..05a5f7c 100644 +--- a/state_bcm.c ++++ b/state_bcm.c +@@ -28,8 +28,6 @@ + #define RXLEN 128 + + int sc = -1; +-fd_set readfds; +-struct timeval tv; + + void state_bcm() { + int i, j, ret; +@@ -38,6 +36,7 @@ void state_bcm() { + struct ifreq ifr; + char rxmsg[RXLEN]; + char buf[MAXLEN]; ++ fd_set readfds; + + struct { + struct bcm_msg_head msg_head; +@@ -91,6 +90,7 @@ void state_bcm() { + } + + if (FD_ISSET(sc, &readfds)) { ++ struct timeval tv; + + ret = recvfrom(sc, &msg, sizeof(msg), 0, + (struct sockaddr*)&caddr, &caddrlen); +diff --git a/state_isotp.c b/state_isotp.c +index 5c671f9..e1b944b 100644 +--- a/state_isotp.c ++++ b/state_isotp.c +@@ -25,7 +25,6 @@ + #include + + int si = -1; +-fd_set readfds; + + void state_isotp() { + int i, items, ret; +@@ -39,6 +38,7 @@ void state_isotp() { + char buf[MAXLEN]; /* inet commands to can */ + unsigned char isobuf[ISOTPLEN+1]; /* binary buffer for isotp socket */ + unsigned char tmp; ++ fd_set readfds; + + while(previous_state != STATE_ISOTP) { + +diff --git a/state_raw.c b/state_raw.c +index e83e6ec..2c49975 100644 +--- a/state_raw.c ++++ b/state_raw.c +@@ -25,7 +25,6 @@ + int raw_socket; + struct ifreq ifr; + struct sockaddr_can addr; +-fd_set readfds; + struct msghdr msg; + struct can_frame frame; + struct iovec iov; +@@ -36,6 +35,7 @@ struct cmsghdr *cmsg; + void state_raw() { + char buf[MAXLEN]; + int i, ret, items; ++ fd_set readfds; + + if(previous_state != STATE_RAW) { + diff --git a/package/socketcand/socketcand.hash b/package/socketcand/socketcand.hash index 6ee0c314a8..713939897d 100644 --- a/package/socketcand/socketcand.hash +++ b/package/socketcand/socketcand.hash @@ -1,3 +1,3 @@ # Locally computed sha256 3c5cc7af4ff707ac344e62d2e37a74b59aeccd14b88e837cc142c52b69d64a39 socketcand-69e2201222f015a1abe7a58ecf61325012cd91b1.tar.gz -sha256 b32028a4080be38208ee951c6e8afc6f3bfb3d5496559b260ab0dce9472740f6 socketcand.c +sha256 18bda0db4e3c56cefdb1b9b01b7eada7764c0746f6321378c30d78f5ee81cfee socketcand.c