summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-10-26 20:05:59 +0000
committerMike Frysinger <vapier@gentoo.org>2008-10-26 20:05:59 +0000
commit66dfa33530b04758f765f8957d33c44b262495ac (patch)
tree05d94a219b096df6c805e6c3a584d613fc511bba /dev-embedded
parentCleanup ebuild and add support for amd64 multilib by Jason. (diff)
downloadgentoo-2-66dfa33530b04758f765f8957d33c44b262495ac.tar.gz
gentoo-2-66dfa33530b04758f765f8957d33c44b262495ac.tar.bz2
gentoo-2-66dfa33530b04758f765f8957d33c44b262495ac.zip
Add support for ft2232 with amd64 multilib by Jason.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/openocd/ChangeLog5
-rw-r--r--dev-embedded/openocd/openocd-9999.ebuild13
2 files changed, 15 insertions, 3 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 3b05ee9c9ab7..40487fbbf226 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.3 2008/08/05 19:04:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.4 2008/10/26 20:05:59 vapier Exp $
+
+ 26 Oct 2008; Mike Frysinger <vapier@gentoo.org> openocd-9999.ebuild:
+ Add support for ft2232 with amd64 multilib by Jason.
05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 7ebcff0c8c78..ced43b5b2cf6 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,9 +1,9 @@
# 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.2 2008/06/04 17:03:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.3 2008/10/26 20:05:59 vapier Exp $
ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk"
-inherit eutils subversion autotools
+inherit eutils subversion autotools multilib
DESCRIPTION="OpenOCD - Open On-Chip Debugger"
HOMEPAGE="http://openocd.berlios.de/web/"
@@ -24,6 +24,15 @@ pkg_setup() {
ewarn "You enabled libftdi but not ft2232!"
ewarn "libftdi is only used for ft2232, so this is meaningless!"
fi
+
+ # stupid ft2232 is binary only, so we have to force
+ # a 32bit build of openocd if people want to use it
+ if use ft2232 && has_multilib_profile ; then
+ ABI="x86"
+ if use ftdi ; then
+ die "ft2232 is x86 and ftdi is amd64, choose one or the other!"
+ fi
+ fi
}
src_unpack() {