summaryrefslogtreecommitdiff
path: root/dev-embedded/openocd
diff options
context:
space:
mode:
Diffstat (limited to 'dev-embedded/openocd')
-rw-r--r--dev-embedded/openocd/Manifest8
-rw-r--r--dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch36
-rw-r--r--dev-embedded/openocd/metadata.xml1
-rw-r--r--dev-embedded/openocd/openocd-0.10.0-r1.ebuild8
-rw-r--r--dev-embedded/openocd/openocd-0.10.0.ebuild142
-rw-r--r--dev-embedded/openocd/openocd-0.11.0_rc2.ebuild98
6 files changed, 105 insertions, 188 deletions
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 419092ae10ad..38acaa4a9cd8 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
-EBUILD openocd-0.10.0-r1.ebuild 2282 BLAKE2B 1f91ef471d27179319b81c1b91aac05a8aa6bcec77855d768f9c23c83ad89dd774fcdd1f86ab16249267108a507c81e18bad1e9c7e3612775aca8c8282f3e740 SHA512 7786005fb1db1fd171fb3c2642d94dd4f069956091ec2207f8ba70f24e085253960a9581af432875a37239d8df69beb6f6e2de114ca1137f14e24070db7eadb4
-EBUILD openocd-0.10.0.ebuild 2787 BLAKE2B 33c90c335a3b21eafa6d62eef353fc93f767044f1643d6b75335173dff63a8324a9a740a516a5d640763e46082bf28fe802d055b36d5ab372c936da026f353a7 SHA512 bd33f8487f420ce308c157580ba56604fb37e8f53bca6c37ce28118cfeeec1419ac0d01da6e78afe540634b64fc509c228f1d6ebb764d5672a7ff8c519d8aeb6
+DIST openocd-0.11.0-rc2.tar.gz 7232180 BLAKE2B 7631b9b85d28472a4f445c304091173350bc5084f0a29b22d1ffd9b92f23c5041218c5aa9c19957c6e25f5a516f6e8d579a9d6c4f9c2bad7e3350dee58faba41 SHA512 b49f631272852dec5a45023a702f2a8446aa386c38eb4ba8ae4b4bf6c84fdd69082f8ae09b5beaa176538644b304b61dfbb8f3da31b7053e02228a5c2dbf1714
+EBUILD openocd-0.10.0-r1.ebuild 2235 BLAKE2B 5c3bb924ad4f04172d3a6020c1c0463e9b3a0481b536c620a9217894ee35aede3825b6b9740a5ab8540d5b2c3f36068278d2620c8ae4d8c1351b9b877160f3c7 SHA512 9722e83dd2416b57a4d245d9eb88234efc175ce24d1b72bf2a7775f4973cf5c855f7981f3ccbdc3bc8529896a796f026320030154f9cfdf3b10fddbb1185912d
+EBUILD openocd-0.11.0_rc2.ebuild 2224 BLAKE2B e42a39589aea254e12964b2bfc8e3db5003b142e3d42f441bfcf47ad6b962457be9f7d0f9f52f8c6ba441077f4994911f711e0fbe0dc7655a98636e9bd0b00ed SHA512 ff24e9f4794df158b729178b5143add285a7dc3877fe50c349ba198432175b14578f9bc23cc3959033074bf7c8985db4225285b1bd4578c537fe8f22eb6b0f0c
EBUILD openocd-9999.ebuild 2216 BLAKE2B c9963a550d494a58de3577a2d75635ba25234b243cc5ccfb99bbd1886a463c110de03a3eba880a8f9c9c1a99bbeea15b255b2a0a4d0f154b88b6d336bbb46c7b SHA512 ca57152b7c19904a31abd40ce7c3ac122be687d9eb5ce0d262940cf595763260a2485f43db4e2f31bcd9412d26cfcd4f633688604d49f7dc843e62f9eda1b898
-MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
+MISC metadata.xml 970 BLAKE2B 0833bb355690206b4f9f65f4ad1c4ee74809af3e60ed8dea9ae995cab3d58e0e53ae8892fb99c9ee0b6e6ce4ae4cc9c44240c448b847d80a47ada8b6dd0b82be SHA512 17a37770d2cbea11d804d66e74aee49033c09a2f42a6d9fe84aa6a64735dd2cd1686f022a971cb6e40e3232c80eae0e37061b62c48582ef2c4062cee6ed7b974
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 b7e3ea13bfb0..000000000000
--- 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.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/metadata.xml b/dev-embedded/openocd/metadata.xml
index 13ad31053b9b..2931185a0a90 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -10,6 +10,7 @@
<name>Paul Fertser</name>
</maintainer>
<use>
+ <flag name="capstone">Use <pkg>dev-libs/capstone</pkg> for disassembly support</flag>
<flag name="cmsis-dap">Support for CMSIS-DAP compliant adapters</flag>
<flag name="dummy">Build the dummy port driver</flag>
<flag name="jlink"> Build the SEGGER J-Link driver</flag>
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
index 14fbf084e901..6c7a9d5bcfa7 100644
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ else
MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"
S="${WORKDIR}"/${MY_P}
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
fi
@@ -40,10 +40,6 @@ BDEPEND="virtual/pkgconfig"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-PATCHES=(
- "${FILESDIR}/${P}-gcc10.patch"
-)
-
src_prepare() {
default
diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
deleted file mode 100644
index 671c16ab48f7..000000000000
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ /dev/null
@@ -1,142 +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 +jlink parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND="
- acct-group/plugdev
- >=dev-lang/jimtcl-0.76
- cmsis-dap? ( dev-libs/hidapi )
- jlink? ( dev-embedded/libjaylink )
- usb? (
- virtual/libusb:0
- virtual/libusb:1
- )
- ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
-
-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
- --disable-internal-libjaylink
- --enable-amtjtagaccel
- --enable-ep93xx
- --enable-at91rm9200
- --enable-gw16012
- --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-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[@]}"
-}
-
-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-0.11.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild
new file mode 100644
index 000000000000..7f476f17dfe6
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools udev
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI=" https://repo.or.cz/openocd.git"
+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="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
+RESTRICT="strip" # includes non-native binaries
+
+RDEPEND="
+ acct-group/plugdev
+ >=dev-lang/jimtcl-0.76:0=
+ capstone? ( dev-libs/capstone )
+ cmsis-dap? ( dev-libs/hidapi )
+ jlink? ( >=dev-embedded/libjaylink-0.2.0 )
+ usb? (
+ virtual/libusb:0
+ virtual/libusb:1
+ )
+ ftdi? ( dev-embedded/libftdi:= )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ AT_NO_RECURSIVE=yes eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --enable-amtjtagaccel
+ --enable-arm-jtag-ew
+ --enable-at91rm9200
+ --enable-bcm2835gpio
+ --enable-buspirate
+ --enable-ep93xx
+ --enable-gw16012
+ --enable-sysfsgpio
+ --disable-internal-jimtcl
+ --disable-internal-libjaylink
+ --disable-werror
+ $(use_with capstone)
+ $(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)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ dostrip /usr/bin
+ udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules
+}
+
+pkg_postinst() {
+ elog "To access openocd devices as user you must be in the plugdev group"
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 19:18:41 +0000