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 553FD1382C5 for ; Sun, 27 Dec 2020 05:05:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CE67E0BCB; Sun, 27 Dec 2020 05:05:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 64734E0BCB for ; Sun, 27 Dec 2020 05:05:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 F15AB340FE4 for ; Sun, 27 Dec 2020 05:05:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 745FC46C for ; Sun, 27 Dec 2020 05:05:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1609045264.932966d8e53c771d30e0eebbc12a9b6256f81ce9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/, dev-embedded/openocd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch dev-embedded/openocd/openocd-0.10.0-r1.ebuild X-VCS-Directories: dev-embedded/openocd/files/ dev-embedded/openocd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 932966d8e53c771d30e0eebbc12a9b6256f81ce9 X-VCS-Branch: master Date: Sun, 27 Dec 2020 05:05:54 +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: bc7b99ec-041c-45b9-9eea-4af094d5e169 X-Archives-Hash: 847a29919f1f1dc3aa09555c95e10bb5 commit: 932966d8e53c771d30e0eebbc12a9b6256f81ce9 Author: Jannis Achstetter kripserver net> AuthorDate: Sat Dec 19 09:26:41 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 27 05:01:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932966d8 dev-embedded/openocd: Fix compilation with gcc 10 Closes: https://bugs.gentoo.org/722640 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Jannis Achstetter kripserver.net> Closes: https://github.com/gentoo/gentoo/pull/18722 Signed-off-by: Sam James gentoo.org> .../openocd/files/openocd-0.10.0-gcc10.patch | 36 ++++++++++++++++++++++ dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 4 +++ 2 files changed, 40 insertions(+) diff --git a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch new file mode 100644 index 00000000000..b7e3ea13bfb --- /dev/null +++ b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/722640 +http://openocd.zylin.com/gitweb?p=openocd.git;a=commitdiff;h=c60252ac2b636c4d99b766a574b9df0966151696 +From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001 +From: Andreas Fritiofson +Date: Fri, 17 Apr 2020 13:49:28 +0200 +Subject: [PATCH] bitbang: Fix FTBFS with GCC 10 + +GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd +struct between bitbang drivers due to a missing extern. + +Change-Id: I2b4122f7939cec91a72284006748f99a23548324 +Signed-off-by: Andreas Fritiofson +Reviewed-on: http://openocd.zylin.com/5592 +Tested-by: jenkins +Reviewed-by: Antonio Borneo +Reviewed-by: Jonathan McDowell +--- + src/jtag/drivers/bitbang.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h +index edb779c..bbbc693 100644 +--- a/src/jtag/drivers/bitbang.h ++++ b/src/jtag/drivers/bitbang.h +@@ -56,7 +56,7 @@ struct bitbang_interface { + void (*swdio_drive)(bool on); + }; + +-const struct swd_driver bitbang_swd; ++extern const struct swd_driver bitbang_swd; + + extern bool swd_mode; + +-- +1.9.1 + diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 168fc249956..1934a0ba1a0 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -40,6 +40,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig" [[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" +) + src_prepare() { default