| 1 |
commit: 512d00ca1fbb0b5d7601c8d2a993e67ac0b684ff |
| 2 |
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 24 20:27:14 2017 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 24 20:27:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512d00ca |
| 7 |
|
| 8 |
dev-embedded/openocd: update live ebuild per upstream and bug #589954 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-embedded/openocd/metadata.xml | 1 + |
| 13 |
dev-embedded/openocd/openocd-9999.ebuild | 29 ++++++++++++++++++----------- |
| 14 |
2 files changed, 19 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml |
| 17 |
index 305f9c4..78e604f 100644 |
| 18 |
--- a/dev-embedded/openocd/metadata.xml |
| 19 |
+++ b/dev-embedded/openocd/metadata.xml |
| 20 |
@@ -14,6 +14,7 @@ |
| 21 |
<flag name="blaster">Enable support for Altera USE-Blaster</flag> |
| 22 |
<flag name="cmsis-dap">Support for CMSIS-DAP compliant adapters</flag> |
| 23 |
<flag name="dummy">Build the dummy port driver</flag> |
| 24 |
+ <flag name="jlink"> Build the SEGGER J-Link driver</flag> |
| 25 |
<flag name="minidriver">Build the dummy minidriver</flag> |
| 26 |
<flag name="ftd2xx">Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag> |
| 27 |
<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag> |
| 28 |
|
| 29 |
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild |
| 30 |
index 54bd4c2..f18b1f1 100644 |
| 31 |
--- a/dev-embedded/openocd/openocd-9999.ebuild |
| 32 |
+++ b/dev-embedded/openocd/openocd-9999.ebuild |
| 33 |
@@ -24,12 +24,12 @@ HOMEPAGE="http://openocd.sourceforge.net" |
| 34 |
|
| 35 |
LICENSE="GPL-2+" |
| 36 |
SLOT="0" |
| 37 |
-IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" |
| 38 |
+IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" |
| 39 |
RESTRICT="strip" # includes non-native binaries |
| 40 |
|
| 41 |
RDEPEND=">=dev-lang/jimtcl-0.76 |
| 42 |
- dev-embedded/libjaylink |
| 43 |
cmsis-dap? ( dev-libs/hidapi ) |
| 44 |
+ jlink? ( dev-embedded/libjaylink ) |
| 45 |
usb? ( |
| 46 |
virtual/libusb:0 |
| 47 |
virtual/libusb:1 |
| 48 |
@@ -63,7 +63,6 @@ src_configure() { |
| 49 |
--enable-ep93xx |
| 50 |
--enable-at91rm9200 |
| 51 |
--enable-gw16012 |
| 52 |
- --enable-oocd_trace |
| 53 |
--enable-arm-jtag-ew |
| 54 |
--enable-sysfsgpio |
| 55 |
--enable-bcm2835gpio |
| 56 |
@@ -80,7 +79,6 @@ src_configure() { |
| 57 |
--enable-osbdm |
| 58 |
--enable-opendous |
| 59 |
--enable-usbprog |
| 60 |
- --enable-jlink |
| 61 |
--enable-rlink |
| 62 |
--enable-stlink |
| 63 |
--enable-vsllink |
| 64 |
@@ -98,7 +96,6 @@ src_configure() { |
| 65 |
--disable-osbdm |
| 66 |
--disable-opendous |
| 67 |
--disable-usbprog |
| 68 |
- --disable-jlink |
| 69 |
--disable-rlink |
| 70 |
--disable-stlink |
| 71 |
--disable-vsllink |
| 72 |
@@ -106,17 +103,27 @@ src_configure() { |
| 73 |
) |
| 74 |
fi |
| 75 |
|
| 76 |
+ if use jlink; then |
| 77 |
+ myconf+=( |
| 78 |
+ --enable-jlink |
| 79 |
+ ) |
| 80 |
+ else |
| 81 |
+ myconf+=( |
| 82 |
+ --disable-jlink |
| 83 |
+ ) |
| 84 |
+ fi |
| 85 |
+ |
| 86 |
if use ftdi; then |
| 87 |
myconf+=( |
| 88 |
- --enable-usb_blaster_libftdi |
| 89 |
- --enable-openjtag_ftdi |
| 90 |
- --enable-presto_libftdi |
| 91 |
+ --enable-usb-blaster |
| 92 |
+ --enable-openjtag |
| 93 |
+ --enable-presto |
| 94 |
) |
| 95 |
else |
| 96 |
myconf+=( |
| 97 |
- --disable-openjtag_ftdi |
| 98 |
- --disable-presto_libftdi |
| 99 |
- --disable-usb_blaster_libftdi |
| 100 |
+ --disable-openjtag |
| 101 |
+ --disable-presto |
| 102 |
+ --disable-usb-blaster |
| 103 |
) |
| 104 |
fi |
Archives