From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0C61A139085 for ; Tue, 24 Jan 2017 20:27:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD08921C028; Tue, 24 Jan 2017 20:27:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9616A21C028 for ; Tue, 24 Jan 2017 20:27:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D3B0341675 for ; Tue, 24 Jan 2017 20:27:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1D222E13 for ; Tue, 24 Jan 2017 20:27:43 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1485289652.512d00ca1fbb0b5d7601c8d2a993e67ac0b684ff.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/openocd/metadata.xml dev-embedded/openocd/openocd-9999.ebuild X-VCS-Directories: dev-embedded/openocd/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 512d00ca1fbb0b5d7601c8d2a993e67ac0b684ff X-VCS-Branch: master Date: Tue, 24 Jan 2017 20:27:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b0ccdcea-3282-4fb2-a195-0146151ad3b1 X-Archives-Hash: ece2b9e5750d3f3fa6a894783a8c2ebe commit: 512d00ca1fbb0b5d7601c8d2a993e67ac0b684ff Author: Zero_Chaos gentoo org> AuthorDate: Tue Jan 24 20:27:14 2017 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Jan 24 20:27:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512d00ca dev-embedded/openocd: update live ebuild per upstream and bug #589954 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-embedded/openocd/metadata.xml | 1 + dev-embedded/openocd/openocd-9999.ebuild | 29 ++++++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml index 305f9c4..78e604f 100644 --- a/dev-embedded/openocd/metadata.xml +++ b/dev-embedded/openocd/metadata.xml @@ -14,6 +14,7 @@ Enable support for Altera USE-Blaster Support for CMSIS-DAP compliant adapters Build the dummy port driver + Build the SEGGER J-Link driver Build the dummy minidriver Enable support for USB FTDI chips via dev-embedded/libftd2xx Enable support for USB FTDI chips via dev-embedded/libftdi diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 54bd4c2..f18b1f1 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -24,12 +24,12 @@ HOMEPAGE="http://openocd.sourceforge.net" LICENSE="GPL-2+" SLOT="0" -IUSE="cmsis-dap dummy ftdi parport +usb verbose-io" +IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io" RESTRICT="strip" # includes non-native binaries RDEPEND=">=dev-lang/jimtcl-0.76 - dev-embedded/libjaylink cmsis-dap? ( dev-libs/hidapi ) + jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 @@ -63,7 +63,6 @@ src_configure() { --enable-ep93xx --enable-at91rm9200 --enable-gw16012 - --enable-oocd_trace --enable-arm-jtag-ew --enable-sysfsgpio --enable-bcm2835gpio @@ -80,7 +79,6 @@ src_configure() { --enable-osbdm --enable-opendous --enable-usbprog - --enable-jlink --enable-rlink --enable-stlink --enable-vsllink @@ -98,7 +96,6 @@ src_configure() { --disable-osbdm --disable-opendous --disable-usbprog - --disable-jlink --disable-rlink --disable-stlink --disable-vsllink @@ -106,17 +103,27 @@ src_configure() { ) fi + if use jlink; then + myconf+=( + --enable-jlink + ) + else + myconf+=( + --disable-jlink + ) + fi + if use ftdi; then myconf+=( - --enable-usb_blaster_libftdi - --enable-openjtag_ftdi - --enable-presto_libftdi + --enable-usb-blaster + --enable-openjtag + --enable-presto ) else myconf+=( - --disable-openjtag_ftdi - --disable-presto_libftdi - --disable-usb_blaster_libftdi + --disable-openjtag + --disable-presto + --disable-usb-blaster ) fi