1 |
commit: 7c920a1be3f8f839262ecd9ae17054671f9b443e |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 14:15:35 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 14:15:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c920a1b |
7 |
|
8 |
dev-embedded/openocd: Sync live ebuild |
9 |
|
10 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
11 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
dev-embedded/openocd/openocd-9999.ebuild | 123 ++++++++++--------------------- |
15 |
1 file changed, 40 insertions(+), 83 deletions(-) |
16 |
|
17 |
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild |
18 |
index 99592e57a11..f7d5c4b834c 100644 |
19 |
--- a/dev-embedded/openocd/openocd-9999.ebuild |
20 |
+++ b/dev-embedded/openocd/openocd-9999.ebuild |
21 |
@@ -1,14 +1,13 @@ |
22 |
# Copyright 1999-2020 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI="7" |
26 |
+EAPI=7 |
27 |
|
28 |
-inherit eutils multilib flag-o-matic toolchain-funcs udev |
29 |
+inherit udev |
30 |
|
31 |
-# One ebuild to rule them all |
32 |
if [[ ${PV} == *9999 ]] ; then |
33 |
inherit autotools git-r3 |
34 |
- EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code" |
35 |
+ EGIT_REPO_URI=" https://repo.or.cz/openocd.git" |
36 |
else |
37 |
MY_PV="${PV/_/-}" |
38 |
MY_P="${PN}-${MY_PV}" |
39 |
@@ -29,113 +28,71 @@ RDEPEND=" |
40 |
acct-group/plugdev |
41 |
>=dev-lang/jimtcl-0.76:0= |
42 |
cmsis-dap? ( dev-libs/hidapi ) |
43 |
- jlink? ( >=dev-embedded/libjaylink-0.2 ) |
44 |
+ jlink? ( >=dev-embedded/libjaylink-0.2.0 ) |
45 |
usb? ( |
46 |
virtual/libusb:0 |
47 |
virtual/libusb:1 |
48 |
) |
49 |
ftdi? ( dev-embedded/libftdi:= )" |
50 |
|
51 |
-DEPEND="${RDEPEND} |
52 |
+DEPEND="${RDEPEND}" |
53 |
+BDEPEND=" |
54 |
+ sys-apps/texinfo |
55 |
virtual/pkgconfig" |
56 |
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946 |
57 |
|
58 |
src_prepare() { |
59 |
default |
60 |
|
61 |
- if [[ ${PV} == "9999" ]] ; then |
62 |
+ if [[ ${PV} == *9999 ]] ; then |
63 |
AT_NO_RECURSIVE=yes eautoreconf |
64 |
fi |
65 |
} |
66 |
|
67 |
src_configure() { |
68 |
- # Here are some defaults |
69 |
local myconf=( |
70 |
- --enable-buspirate |
71 |
- --disable-werror |
72 |
- --disable-internal-jimtcl |
73 |
- --disable-internal-libjaylink |
74 |
--enable-amtjtagaccel |
75 |
- --enable-ep93xx |
76 |
+ --enable-arm-jtag-ew |
77 |
--enable-at91rm9200 |
78 |
+ --enable-bcm2835gpio |
79 |
+ --enable-buspirate |
80 |
+ --enable-ep93xx |
81 |
--enable-gw16012 |
82 |
- --enable-arm-jtag-ew |
83 |
--enable-sysfsgpio |
84 |
- --enable-bcm2835gpio |
85 |
+ --disable-internal-jimtcl |
86 |
+ --disable-internal-libjaylink |
87 |
+ --disable-werror |
88 |
+ $(use_enable cmsis-dap) |
89 |
+ $(use_enable dummy) |
90 |
+ $(use_enable ftdi openjtag) |
91 |
+ $(use_enable ftdi presto) |
92 |
+ $(use_enable ftdi usb-blaster) |
93 |
+ $(use_enable jlink) |
94 |
+ $(use_enable parport) |
95 |
+ $(use_enable parport parport_ppdev) |
96 |
+ $(use_enable usb aice) |
97 |
+ $(use_enable usb armjtagew) |
98 |
+ $(use_enable usb ftdi) |
99 |
+ $(use_enable usb osbdm) |
100 |
+ $(use_enable usb opendous) |
101 |
+ $(use_enable usb rlink) |
102 |
+ $(use_enable usb stlink) |
103 |
+ $(use_enable usb ti-icdi) |
104 |
+ $(use_enable usb usbprog) |
105 |
+ $(use_enable usb usb-blaster-2) |
106 |
+ $(use_enable usb ulink) |
107 |
+ $(use_enable usb vsllink) |
108 |
+ $(use_enable verbose-io verbose-jtag-io) |
109 |
+ $(use_enable verbose-io verbose-usb-io) |
110 |
+ $(use_enable verbose-io verbose_usb_comms) |
111 |
) |
112 |
|
113 |
- # Adapters requiring usb/libusb-1.X support |
114 |
- if use usb; then |
115 |
- myconf+=( |
116 |
- --enable-aice |
117 |
- --enable-usb-blaster-2 |
118 |
- --enable-ftdi |
119 |
- --enable-ti-icdi |
120 |
- --enable-ulink |
121 |
- --enable-osbdm |
122 |
- --enable-opendous |
123 |
- --enable-usbprog |
124 |
- --enable-rlink |
125 |
- --enable-stlink |
126 |
- --enable-vsllink |
127 |
- --enable-armjtagew |
128 |
- $(use_enable verbose-io verbose-usb-io) |
129 |
- $(use_enable verbose-io verbose_usb_comms) |
130 |
- ) |
131 |
- else |
132 |
- myconf+=( |
133 |
- --disable-aice |
134 |
- --disable-usb-blaster-2 |
135 |
- --disable-ftdi |
136 |
- --disable-ti-icdi |
137 |
- --disable-ulink |
138 |
- --disable-osbdm |
139 |
- --disable-opendous |
140 |
- --disable-usbprog |
141 |
- --disable-rlink |
142 |
- --disable-stlink |
143 |
- --disable-vsllink |
144 |
- --disable-armjtagew |
145 |
- ) |
146 |
- fi |
147 |
- |
148 |
- if use jlink; then |
149 |
- myconf+=( |
150 |
- --enable-jlink |
151 |
- ) |
152 |
- else |
153 |
- myconf+=( |
154 |
- --disable-jlink |
155 |
- ) |
156 |
- fi |
157 |
- |
158 |
- if use ftdi; then |
159 |
- myconf+=( |
160 |
- --enable-usb-blaster |
161 |
- --enable-openjtag |
162 |
- --enable-presto |
163 |
- ) |
164 |
- else |
165 |
- myconf+=( |
166 |
- --disable-openjtag |
167 |
- --disable-presto |
168 |
- --disable-usb-blaster |
169 |
- ) |
170 |
- fi |
171 |
- |
172 |
- econf \ |
173 |
- $(use_enable dummy) \ |
174 |
- $(use_enable cmsis-dap) \ |
175 |
- $(use_enable parport) \ |
176 |
- $(use_enable parport parport_ppdev) \ |
177 |
- $(use_enable verbose-io verbose-jtag-io) \ |
178 |
- "${myconf[@]}" |
179 |
+ econf "${myconf[@]}" |
180 |
} |
181 |
|
182 |
src_install() { |
183 |
default |
184 |
dostrip /usr/bin |
185 |
- udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules |
186 |
+ udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules |
187 |
} |
188 |
|
189 |
pkg_postinst() { |