1 |
commit: 932966d8e53c771d30e0eebbc12a9b6256f81ce9 |
2 |
Author: Jannis Achstetter <kripton <AT> kripserver <DOT> net> |
3 |
AuthorDate: Sat Dec 19 09:26:41 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 05:01:04 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932966d8 |
7 |
|
8 |
dev-embedded/openocd: Fix compilation with gcc 10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/722640 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Jannis Achstetter <kripton <AT> kripserver.net> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/18722 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
.../openocd/files/openocd-0.10.0-gcc10.patch | 36 ++++++++++++++++++++++ |
17 |
dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 4 +++ |
18 |
2 files changed, 40 insertions(+) |
19 |
|
20 |
diff --git a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..b7e3ea13bfb |
23 |
--- /dev/null |
24 |
+++ b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch |
25 |
@@ -0,0 +1,36 @@ |
26 |
+https://bugs.gentoo.org/722640 |
27 |
+http://openocd.zylin.com/gitweb?p=openocd.git;a=commitdiff;h=c60252ac2b636c4d99b766a574b9df0966151696 |
28 |
+From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001 |
29 |
+From: Andreas Fritiofson <andreas.fritiofson@×××××.com> |
30 |
+Date: Fri, 17 Apr 2020 13:49:28 +0200 |
31 |
+Subject: [PATCH] bitbang: Fix FTBFS with GCC 10 |
32 |
+ |
33 |
+GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd |
34 |
+struct between bitbang drivers due to a missing extern. |
35 |
+ |
36 |
+Change-Id: I2b4122f7939cec91a72284006748f99a23548324 |
37 |
+Signed-off-by: Andreas Fritiofson <andreas.fritiofson@×××××.com> |
38 |
+Reviewed-on: http://openocd.zylin.com/5592 |
39 |
+Tested-by: jenkins |
40 |
+Reviewed-by: Antonio Borneo <borneo.antonio@×××××.com> |
41 |
+Reviewed-by: Jonathan McDowell <noodles-openocd@×××××.li> |
42 |
+--- |
43 |
+ src/jtag/drivers/bitbang.h | 2 +- |
44 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
45 |
+ |
46 |
+diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h |
47 |
+index edb779c..bbbc693 100644 |
48 |
+--- a/src/jtag/drivers/bitbang.h |
49 |
++++ b/src/jtag/drivers/bitbang.h |
50 |
+@@ -56,7 +56,7 @@ struct bitbang_interface { |
51 |
+ void (*swdio_drive)(bool on); |
52 |
+ }; |
53 |
+ |
54 |
+-const struct swd_driver bitbang_swd; |
55 |
++extern const struct swd_driver bitbang_swd; |
56 |
+ |
57 |
+ extern bool swd_mode; |
58 |
+ |
59 |
+-- |
60 |
+1.9.1 |
61 |
+ |
62 |
|
63 |
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild |
64 |
index 168fc249956..1934a0ba1a0 100644 |
65 |
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild |
66 |
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild |
67 |
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND} |
68 |
virtual/pkgconfig" |
69 |
[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 |
70 |
|
71 |
+PATCHES=( |
72 |
+ "${FILESDIR}/${P}-gcc10.patch" |
73 |
+) |
74 |
+ |
75 |
src_prepare() { |
76 |
default |