diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
commit | 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch) | |
tree | 53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-embedded/openocd | |
parent | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff) |
gentoo new year resync : 01.01.2021
Diffstat (limited to 'dev-embedded/openocd')
-rw-r--r-- | dev-embedded/openocd/Manifest | 8 | ||||
-rw-r--r-- | dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch | 11 | ||||
-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 | 129 | ||||
-rw-r--r-- | dev-embedded/openocd/openocd-0.9.0.ebuild | 132 | ||||
-rw-r--r-- | dev-embedded/openocd/openocd-9999.ebuild | 123 |
6 files changed, 136 insertions, 303 deletions
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest index 8e13f29a5436..419092ae10ad 100644 --- a/dev-embedded/openocd/Manifest +++ b/dev-embedded/openocd/Manifest @@ -1,7 +1,7 @@ +AUX openocd-0.10.0-fno-common.patch 259 BLAKE2B f209b830242cc2f93faa1000c50805889b2abc7d99634302d48c011adad885137f86774740e4316300440c5c503729a6f6a89e941bf11e98b4f27e17d265bc47 SHA512 bc60476c74599bc6eae2d50dac7ee723732fb693923b487caae83475779bde31c2e71ea8b837fb0ca78b814ee8a2634ac2e887c91c3839425c5d980d61e49c7d +AUX openocd-0.10.0-gcc10.patch 1224 BLAKE2B 9832211d66104b1a3e6f64f425afe43c9aa8de5f75d95fbec8f358b602d65a8235174962d8759a97800d6e78fefb2637a5eb0382d82e2f1fb8f1272821b79d1a SHA512 d45d4f37c38ca8357bfe6f7f0240d72d8e0ab3549b3f763142a2352d447f6151e9e9979bc3898700d9f3656cbb13a50ab4e85cac67e190f0c3f0dc04f6296d31 DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a -DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227 -EBUILD openocd-0.10.0-r1.ebuild 2806 BLAKE2B 0ebf96676f1f826d64de6af8ac4311bf5973ef1781b2f4f038637fbe6ca4d57dee3405eb2828e51b84e48efafe89fda6c89462cb637b2c34815f0f0f0df797e5 SHA512 2741dbac39b556681a78690c14be02947c467171cfa1a628b66e1e9fb54abc2ce212253ab5ca39ae5fa0e1ad84e759ca9abba046e07ad9042ab7e8879185de0a +EBUILD openocd-0.10.0-r1.ebuild 2282 BLAKE2B 1f91ef471d27179319b81c1b91aac05a8aa6bcec77855d768f9c23c83ad89dd774fcdd1f86ab16249267108a507c81e18bad1e9c7e3612775aca8c8282f3e740 SHA512 7786005fb1db1fd171fb3c2642d94dd4f069956091ec2207f8ba70f24e085253960a9581af432875a37239d8df69beb6f6e2de114ca1137f14e24070db7eadb4 EBUILD openocd-0.10.0.ebuild 2787 BLAKE2B 33c90c335a3b21eafa6d62eef353fc93f767044f1643d6b75335173dff63a8324a9a740a516a5d640763e46082bf28fe802d055b36d5ab372c936da026f353a7 SHA512 bd33f8487f420ce308c157580ba56604fb37e8f53bca6c37ce28118cfeeec1419ac0d01da6e78afe540634b64fc509c228f1d6ebb764d5672a7ff8c519d8aeb6 -EBUILD openocd-0.9.0.ebuild 2648 BLAKE2B b97c24d80399668aa3dbbf9ad03a358f779da66b38bee58a29c704125de6e0d5ed85f12b19687c2fce3e08ad7c9489c76266bc606bc64f0e00f878cd5a2cabc9 SHA512 7b437860ca4ea98c2bf37e7f69bea3b080d3c47a5bf72473d4fb31aa36631239d349a2a38199f222367a9fb2d92c2096b61d6021a2a803010c13db0545f49e17 -EBUILD openocd-9999.ebuild 2812 BLAKE2B ac1c8da61b98a6b7f19d7bd1faeef6d6666f8a6d0f188a0c64ddd670be0d9a7bc90898213b79be7bb4017a4453ecc17102d17aae04a686d33e1cd936dada21d0 SHA512 0918d22ac2dd1da2cff5549f56647d0bece014e9a014b14d65f8a7a8dcc5c385d4434d8df1c7886023827eb2a33d24e9c6dbaf5cb00b8c21fa0ef4c969ecb7cc +EBUILD openocd-9999.ebuild 2216 BLAKE2B c9963a550d494a58de3577a2d75635ba25234b243cc5ccfb99bbd1886a463c110de03a3eba880a8f9c9c1a99bbeea15b255b2a0a4d0f154b88b6d336bbb46c7b SHA512 ca57152b7c19904a31abd40ce7c3ac122be687d9eb5ce0d262940cf595763260a2485f43db4e2f31bcd9412d26cfcd4f633688604d49f7dc843e62f9eda1b898 MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76 diff --git a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch new file mode 100644 index 000000000000..c924b2f8fec0 --- /dev/null +++ b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/jtag/drivers/bitbang.h ++++ b/src/jtag/drivers/bitbang.h +@@ -35,7 +35,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; + 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..14fbf084e901 100644 --- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild +++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code" + EGIT_REPO_URI=" https://repo.or.cz/openocd.git" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -36,106 +35,68 @@ RDEPEND=" ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +PATCHES=( + "${FILESDIR}/${P}-gcc10.patch" +) src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999 ]] ; then AT_NO_RECURSIVE=yes eautoreconf fi } src_configure() { - # Here are some defaults local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink --enable-amtjtagaccel - --enable-ep93xx + --enable-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use jlink; then - myconf+=( - --enable-jlink - ) - else - myconf+=( - --disable-jlink - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb-blaster - --enable-openjtag - --enable-presto - ) - else - myconf+=( - --disable-openjtag - --disable-presto - --disable-usb-blaster - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" + econf "${myconf[@]}" } src_install() { default dostrip /usr/bin - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules } pkg_postinst() { diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild deleted file mode 100644 index c7878693cd02..000000000000 --- a/dev-embedded/openocd/openocd-0.9.0.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils multilib flag-o-matic toolchain-funcs udev - -# One ebuild to rule them all -if [[ ${PV} == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code" -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~arm ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" -RESTRICT="strip" # includes non-native binaries - -RDEPEND=" - acct-group/plugdev - >=dev-lang/jimtcl-0.76 - cmsis-dap? ( dev-libs/hidapi ) - usb? ( - virtual/libusb:0 - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi:= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch_user - - if [[ ${PV} == "9999" ]] ; then - AT_NO_RECURSIVE=yes eautoreconf - fi -} - -src_configure() { - # Here are some defaults - local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --enable-amtjtagaccel - --enable-ep93xx - --enable-at91rm9200 - --enable-gw16012 - --enable-oocd_trace - --enable-arm-jtag-ew - --enable-sysfsgpio - --enable-bcm2835gpio - ) - - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-jlink - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-jlink - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb_blaster_libftdi - --enable-openjtag_ftdi - --enable-presto_libftdi - ) - else - myconf+=( - --disable-openjtag_ftdi - --disable-presto_libftdi - --disable-usb_blaster_libftdi - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" -} - -src_install() { - default - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules -} - -pkg_postinst() { - elog "To access openocd devices as user you must be in the plugdev group" -} diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 99592e57a118..f7d5c4b834cb 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit eutils multilib flag-o-matic toolchain-funcs udev +inherit udev -# One ebuild to rule them all if [[ ${PV} == *9999 ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code" + EGIT_REPO_URI=" https://repo.or.cz/openocd.git" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -29,113 +28,71 @@ RDEPEND=" acct-group/plugdev >=dev-lang/jimtcl-0.76:0= cmsis-dap? ( dev-libs/hidapi ) - jlink? ( >=dev-embedded/libjaylink-0.2 ) + jlink? ( >=dev-embedded/libjaylink-0.2.0 ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + sys-apps/texinfo virtual/pkgconfig" -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999 ]] ; then AT_NO_RECURSIVE=yes eautoreconf fi } src_configure() { - # Here are some defaults local myconf=( - --enable-buspirate - --disable-werror - --disable-internal-jimtcl - --disable-internal-libjaylink --enable-amtjtagaccel - --enable-ep93xx + --enable-arm-jtag-ew --enable-at91rm9200 + --enable-bcm2835gpio + --enable-buspirate + --enable-ep93xx --enable-gw16012 - --enable-arm-jtag-ew --enable-sysfsgpio - --enable-bcm2835gpio + --disable-internal-jimtcl + --disable-internal-libjaylink + --disable-werror + $(use_enable cmsis-dap) + $(use_enable dummy) + $(use_enable ftdi openjtag) + $(use_enable ftdi presto) + $(use_enable ftdi usb-blaster) + $(use_enable jlink) + $(use_enable parport) + $(use_enable parport parport_ppdev) + $(use_enable usb aice) + $(use_enable usb armjtagew) + $(use_enable usb ftdi) + $(use_enable usb osbdm) + $(use_enable usb opendous) + $(use_enable usb rlink) + $(use_enable usb stlink) + $(use_enable usb ti-icdi) + $(use_enable usb usbprog) + $(use_enable usb usb-blaster-2) + $(use_enable usb ulink) + $(use_enable usb vsllink) + $(use_enable verbose-io verbose-jtag-io) + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-usb-blaster-2 - --enable-ftdi - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-armjtagew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-usb-blaster-2 - --disable-ftdi - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - --disable-usbprog - --disable-rlink - --disable-stlink - --disable-vsllink - --disable-armjtagew - ) - fi - - if use jlink; then - myconf+=( - --enable-jlink - ) - else - myconf+=( - --disable-jlink - ) - fi - - if use ftdi; then - myconf+=( - --enable-usb-blaster - --enable-openjtag - --enable-presto - ) - else - myconf+=( - --disable-openjtag - --disable-presto - --disable-usb-blaster - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable cmsis-dap) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" + econf "${myconf[@]}" } src_install() { default dostrip /usr/bin - udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules + udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules } pkg_postinst() { |