summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-11-29 21:02:33 +0000
committerMike Frysinger <vapier@gentoo.org>2008-11-29 21:02:33 +0000
commite86bd24be869d2369d6a0099184f54c283e9f910 (patch)
treeacf3bc20cdee73ca6a09bc0a8a5f90b384627439 /dev-embedded
parentVersion bump for bug 226143, thanks to René Neumann and Ilya Kashirin. (diff)
downloadgentoo-2-e86bd24be869d2369d6a0099184f54c283e9f910.tar.gz
gentoo-2-e86bd24be869d2369d6a0099184f54c283e9f910.tar.bz2
gentoo-2-e86bd24be869d2369d6a0099184f54c283e9f910.zip
Make usb support optional #249211 by Scott.
(Portage version: 2.2_rc16/cvs/Linux 2.6.27.4 x86_64)
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/openocd/ChangeLog5
-rw-r--r--dev-embedded/openocd/openocd-9999.ebuild9
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 40487fbbf226..611888d421a7 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-embedded/openocd
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.4 2008/10/26 20:05:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.5 2008/11/29 21:02:33 vapier Exp $
+
+ 29 Nov 2008; Mike Frysinger <vapier@gentoo.org> openocd-9999.ebuild:
+ Make usb support optional #249211 by Scott.
26 Oct 2008; Mike Frysinger <vapier@gentoo.org> openocd-9999.ebuild:
Add support for ft2232 with amd64 multilib by Jason.
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index ced43b5b2cf6..ac1cceaec8e0 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.3 2008/10/26 20:05:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.4 2008/11/29 21:02:33 vapier Exp $
ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk"
inherit eutils subversion autotools multilib
@@ -12,11 +12,12 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="ft2232 ftdi parport presto"
+IUSE="ft2232 ftdi parport presto usb"
RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
-DEPEND="presto? ( dev-embedded/libftd2xx )
+DEPEND="usb? ( dev-libs/libusb )
+ presto? ( dev-embedded/libftd2xx )
ft2232? ( || ( ftdi? ( dev-embedded/libftdi ) dev-embedded/libftd2xx ) )"
pkg_setup() {
@@ -49,8 +50,8 @@ src_compile() {
--enable-ep93xx \
--enable-at91rm9200 \
--enable-gw16012 \
- --enable-usbprog \
--enable-oocd_trace \
+ $(use_enable usb usbprog) \
$(use_enable parport parport_giveio) \
$(use_enable presto presto_ftd2xx) \
$(use ft2232 && use_enable ftdi ft2232_libftdi) \