From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A29F8138350 for ; Sat, 7 Mar 2020 09:39:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFFCDE0883; Sat, 7 Mar 2020 09:39:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 837C0E0883 for ; Sat, 7 Mar 2020 09:39:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7394334F019 for ; Sat, 7 Mar 2020 09:39:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E88C2103 for ; Sat, 7 Mar 2020 09:39:14 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1583573946.b8401f22eb250e5c0d5c120d4f66e35ea89cf821.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dtc/files/, sys-apps/dtc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/dtc/dtc-1.5.0.ebuild sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch X-VCS-Directories: sys-apps/dtc/files/ sys-apps/dtc/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: b8401f22eb250e5c0d5c120d4f66e35ea89cf821 X-VCS-Branch: master Date: Sat, 7 Mar 2020 09:39:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: de699adb-db27-45e7-be2c-b50af224f0c2 X-Archives-Hash: 20fc7a86cfcd4e3b35ebc6fa3256084c commit: b8401f22eb250e5c0d5c120d4f66e35ea89cf821 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Mar 7 09:34:15 2020 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Mar 7 09:39:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8401f22 sys-apps/dtc: tweak for gcc-10, bug #706660 Pull in upstream patch 0e9225eb0dfec5 "Remove redundant YYLOC global declaration". Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/706660 Package-Manager: Portage-2.3.92, Repoman-2.3.20 Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/dtc/dtc-1.5.0.ebuild | 3 +- sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch | 50 +++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild index d0d47ebca8e..cbe4052e612 100644 --- a/sys-apps/dtc/dtc-1.5.0.ebuild +++ b/sys-apps/dtc/dtc-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -32,6 +32,7 @@ DOCS=" PATCHES=( "${FILESDIR}"/${PN}-1.4.4-posix-shell.patch "${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch + "${FILESDIR}"/${PN}-1.5.0-gcc-10.patch ) src_prepare() { diff --git a/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch b/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch new file mode 100644 index 00000000000..80773bfaebb --- /dev/null +++ b/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/706660 +https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=0e9225eb0dfec51def612b928d2f1836b092bc7e + +From 0e9225eb0dfec51def612b928d2f1836b092bc7e Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Tue, 14 Jan 2020 18:53:41 +0100 +Subject: Remove redundant YYLOC global declaration + +gcc 10 will default to -fno-common, which causes this error at link +time: + + (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here + +This is because both dtc-lexer as well as dtc-parser define the same +global symbol yyloc. Before with -fcommon those were merged into one +defintion. The proper solution would be to to mark this as "extern", +however that leads to: + + dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] + 26 | extern YYLTYPE yylloc; + | ^~~~~~ +In file included from dtc-lexer.l:24: +dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here + 127 | extern YYLTYPE yylloc; + | ^~~~~~ +cc1: all warnings being treated as errors + +which means the declaration is completely redundant and can just be +dropped. + +Signed-off-by: Dirk Mueller +Message-Id: <20200114175341.2994-1-dmueller@suse.com> +Signed-off-by: David Gibson +--- + dtc-lexer.l | 1 - + 1 file changed, 1 deletion(-) + +--- a/dtc-lexer.l ++++ b/dtc-lexer.l +@@ -23,7 +23,6 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +-- +cgit 1.2-0.3.lf.el7 +