commit: 655ddf5db91609cdf30abf364fb22e0eaf78affd Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Sat Feb 13 10:14:32 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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 <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> 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 <andreas.fritiof...@gmail.com> -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 <andreas.fritiof...@gmail.com> -Reviewed-on: http://openocd.zylin.com/5592 -Tested-by: jenkins -Reviewed-by: Antonio Borneo <borneo.anto...@gmail.com> -Reviewed-by: Jonathan McDowell <noodles-open...@earth.li> ---- - 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
