diff options
| author |   Jannis Achstetter <kripton@kripserver.net> | 2020-12-19 10:26:41 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2020-12-27 05:01:04 +0000 |
| commit | 932966d8e53c771d30e0eebbc12a9b6256f81ce9 (patch) | |
| tree | 825597ac2bd437bde19fd4dd70bbd394b8ff4e79 | |
| parent | net-analyzer/snort: fix typos (diff) | |
| download | gentoo-932966d8e53c771d30e0eebbc12a9b6256f81ce9.tar.gz gentoo-932966d8e53c771d30e0eebbc12a9b6256f81ce9.tar.bz2 gentoo-932966d8e53c771d30e0eebbc12a9b6256f81ce9.zip | |
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>
| -rw-r--r-- | dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch | 36 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-0.10.0-r1.ebuild | 4 |
2 files changed, 40 insertions, 0 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 new file mode 100644 index 000000000000..b7e3ea13bfb0 --- /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 <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 + diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild index 168fc2499564..1934a0ba1a0b 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 |