From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/
Date: Mon, 28 Dec 2020 14:16:03 +0000 (UTC) [thread overview]
Message-ID: <1609164935.7c920a1be3f8f839262ecd9ae17054671f9b443e.soap@gentoo> (raw)
commit: 7c920a1be3f8f839262ecd9ae17054671f9b443e
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 14:15:35 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 14:15:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c920a1b
dev-embedded/openocd: Sync live ebuild
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-embedded/openocd/openocd-9999.ebuild | 123 ++++++++++---------------------
1 file changed, 40 insertions(+), 83 deletions(-)
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 99592e57a11..f7d5c4b834c 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() {
next reply other threads:[~2020-12-28 14:16 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 14:16 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-17 2:12 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/ Yixun Lan
2023-11-14 11:14 Yixun Lan
2023-11-14 11:14 Yixun Lan
2023-06-08 11:23 Viorel Munteanu
2023-04-22 13:14 Viorel Munteanu
2023-04-22 13:02 Sam James
2023-04-22 11:34 Sam James
2023-01-20 11:49 Yixun Lan
2023-01-04 0:38 Yixun Lan
2023-01-04 0:38 Yixun Lan
2022-12-19 1:09 Yixun Lan
2022-08-12 20:36 Yixun Lan
2022-04-23 19:44 Sven Wegener
2021-10-27 6:37 Agostino Sarubbo
2021-10-27 6:35 Agostino Sarubbo
2021-03-10 6:08 Yixun Lan
2021-03-10 6:08 Yixun Lan
2021-02-13 10:14 David Seifert
2021-02-12 15:10 Sam James
2021-02-11 9:31 Sam James
2021-02-11 7:54 Sam James
2020-12-28 14:16 David Seifert
2020-01-15 21:03 Göktürk Yüksek
2019-09-13 12:58 Michał Górny
2019-08-31 12:16 Sergei Trofimovich
2019-02-18 9:08 Sergei Trofimovich
2019-02-18 9:08 Sergei Trofimovich
2018-05-30 11:31 Jason Zaman
2018-05-29 12:40 Thomas Deutschmann
2017-12-25 19:17 David Seifert
2017-01-24 21:54 Richard Farina
2017-01-24 20:27 Richard Farina
2017-01-24 16:53 Richard Farina
2016-10-30 20:05 Sven Wegener
2016-01-10 11:17 Sven Wegener
2016-01-10 9:31 Sven Wegener
2016-01-10 9:31 Sven Wegener
2016-01-10 9:31 Sven Wegener
2016-01-10 9:31 Sven Wegener
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609164935.7c920a1be3f8f839262ecd9ae17054671f9b443e.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox