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 <kripton@kripserver.net>
Closes: https://github.com/gentoo/gentoo/pull/18722
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Jannis Achstetter
2020-12-19 10:26:41 +01:00
committed by Sam James
parent 484d90b5aa
commit 932966d8e5
2 changed files with 40 additions and 0 deletions

View File

@@ -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 <andreas.fritiofson@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.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/5592
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-by: Jonathan McDowell <noodles-openocd@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

View File

@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
PATCHES=(
"${FILESDIR}/${P}-gcc10.patch"
)
src_prepare() {
default