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 ABCE813835B for ; Sat, 13 Feb 2021 10:14:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E439AE088C; Sat, 13 Feb 2021 10:14:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CAEB5E088F for ; Sat, 13 Feb 2021 10:14:54 +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 958153410C8 for ; Sat, 13 Feb 2021 10:14:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C51F14E4 for ; Sat, 13 Feb 2021 10:14:50 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1613211272.655ddf5db91609cdf30abf364fb22e0eaf78affd.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/files/, dev-embedded/openocd/ 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: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 655ddf5db91609cdf30abf364fb22e0eaf78affd X-VCS-Branch: master Date: Sat, 13 Feb 2021 10:14:50 +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: 73179d54-82ec-459d-989e-18738ad42f0b X-Archives-Hash: 9767e8302c4900dacc74397296db8d08 commit: 655ddf5db91609cdf30abf364fb22e0eaf78affd Author: Jakov Smolic sartura hr> AuthorDate: Sat Feb 13 10:14:32 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Feb 13 10:14:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655ddf5d dev-embedded/openocd: Remove duplicate gcc-10 patch from 0.10.0-r1 Closes: https://github.com/gentoo/gentoo/pull/19404 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert 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 deletions(-) diff --git a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch deleted file mode 100644 index b7e3ea13bfb..00000000000 --- a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 ac8942db0b0..6c7a9d5bcfa 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -40,10 +40,6 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) -PATCHES=( - "${FILESDIR}/${P}-gcc10.patch" -) - src_prepare() { default