summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2009-02-23 22:47:08 +0000
committerMarkus Meier <maekke@gentoo.org>2009-02-23 22:47:08 +0000
commitdefea180e67253afb34876b3fb01aa010c593c57 (patch)
treebd9fa4f46060eb03a38d037d5cd85f7b8c8c2c69 /dev-embedded/openocd
parentStatus return fix from bug 250159 (diff)
downloadhistorical-defea180e67253afb34876b3fb01aa010c593c57.tar.gz
historical-defea180e67253afb34876b3fb01aa010c593c57.tar.bz2
historical-defea180e67253afb34876b3fb01aa010c593c57.zip
bumb to first openocd release, also tweak the live ebuild, bug #259938
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'dev-embedded/openocd')
-rw-r--r--dev-embedded/openocd/ChangeLog10
-rw-r--r--dev-embedded/openocd/Manifest14
-rw-r--r--dev-embedded/openocd/openocd-0.1.0.ebuild77
-rw-r--r--dev-embedded/openocd/openocd-9999.ebuild30
4 files changed, 113 insertions, 18 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 611888d421a7..baaddd07407c 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,12 @@
# 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.5 2008/11/29 21:02:33 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.6 2009/02/23 22:47:08 maekke Exp $
+
+*openocd-0.1.0 (23 Feb 2009)
+
+ 23 Feb 2009; Markus Meier <maekke@gentoo.org> +openocd-0.1.0.ebuild,
+ openocd-9999.ebuild:
+ bumb to first openocd release, also tweak the live ebuild, bug #259938
29 Nov 2008; Mike Frysinger <vapier@gentoo.org> openocd-9999.ebuild:
Make usb support optional #249211 by Scott.
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 25d6c0f2b9e4..3bb716ca5667 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,13 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-EBUILD openocd-9999.ebuild 1854 RMD160 9093e091bb921e904ba13863bc6a55ef332c7dc8 SHA1 01984443b54eb31fabeca8c15f6c882ba373047f SHA256 ce01253bff94da5408c89fbe61f4b135f5a5d558c4b3b7b31583e7585d185bf5
-MISC ChangeLog 865 RMD160 549b2d5c7408defb718e29add5bcc377232a0a88 SHA1 e54a3805e1be6066fc8d0b1de8abbc68553b87e1 SHA256 822bdc7e50c9f03f83ee139d713ab3c4a738842c564fdf38ba83e3bcda8f4799
+DIST openocd-0.1.0.tar.gz 985328 RMD160 164ae54191d4e7b1908ecab7b9882938b3189402 SHA1 149f8581c1e2482283d3126c4aac5793c2065db8 SHA256 e468c907355727f7aede5623afd77721eb75abe7686af7f2f388f41a7c0f2911
+EBUILD openocd-0.1.0.ebuild 2020 RMD160 fe28c045d9bb56c1a5930131151f9c7a52664862 SHA1 69cd4f84cc4bfefb29f8ac728714cddb6c3afe91 SHA256 332d77ad0c466890b8f8ead9e1e82a140d8e9e33dd23cc0ad3f4fb54023df209
+EBUILD openocd-9999.ebuild 2015 RMD160 47e06931adbe8482ed66387170fade0b61dbb5b3 SHA1 e53ac43ed7bb6d0c521a8fbe7deef4affcf1788f SHA256 b6c57bb87709a91ab4c7738314218cedd5ba3e10b49a783c7e4a431fbd3e147a
+MISC ChangeLog 1063 RMD160 180a6362d749f48b30760f99f3ea836d9c8f83ab SHA1 cc257d937232b38c6054dbbb77357e5934f492e4 SHA256 e5db062549e7ee3572a5470bc865eb6058f655541f369bed130cbbca392cccc4
MISC metadata.xml 515 RMD160 dc20f59bb785387a70cfdbd696c6f867ceb8bfe0 SHA1 9c3c91356fd1b1975f59a80c900132e5fd4a92df SHA256 3d98c84abc54e79e0b065416ae199a0bb562bfed1ee3ccf5b5f45158715e6364
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
-iEYEARECAAYFAkkxre8ACgkQ67wieSYcaxcPRgCffw3EeGM8+TuNFz+Mubk/qwiZ
-FnMAoKatMKySZ2GwO2jGqZOstqDWYbw7
-=kvv4
+iEYEARECAAYFAkmjJ8wACgkQkKaRLQcq0GJbrQCeNcP/eEQ46790NEF0U0oTSzhL
+jsUAniHNwCNzcejFxe8a5JffHC3+G/61
+=WCq1
-----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/openocd-0.1.0.ebuild b/dev-embedded/openocd/openocd-0.1.0.ebuild
new file mode 100644
index 000000000000..fe3a0d9cd720
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.1.0.ebuild,v 1.1 2009/02/23 22:47:08 maekke Exp $
+
+ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk"
+inherit eutils multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit subversion autotools
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~x86"
+ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.berlios.de/web/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ft2232 ftdi parport presto usb"
+RESTRICT="strip" # includes non-native binaries
+
+# libftd2xx is the default because it is reported to work better.
+DEPEND="usb? ( dev-libs/libusb )
+ presto? ( dev-embedded/libftd2xx )
+ ft2232? ( || ( ftdi? ( dev-embedded/libftdi ) dev-embedded/libftd2xx ) )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ if use ftdi && ! use ft2232 ; then
+ 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() {
+ if [[ ${PV} == "9999" ]] ; then
+ subversion_src_unpack
+ cd "${S}"
+ eautoreconf
+ else
+ unpack ${A}
+ fi
+}
+
+src_compile() {
+ econf \
+ --enable-parport \
+ --enable-parport_ppdev \
+ --enable-amtjtagaccel \
+ --enable-ep93xx \
+ --enable-at91rm9200 \
+ --enable-gw16012 \
+ --enable-oocd_trace \
+ $(use_enable usb usbprog) \
+ $(use_enable parport parport_giveio) \
+ $(use_enable presto presto_ftd2xx) \
+ $(use ft2232 && use_enable ftdi ft2232_libftdi) \
+ $(use ft2232 && use_enable !ftdi ft2232_ftd2xx)
+ emake || die "Error in emake!"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README TODO
+ prepstrip "${D}"/usr/bin
+}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index ac1cceaec8e0..656dbade44be 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,17 +1,23 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4 2008/11/29 21:02:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.5 2009/02/23 22:47:08 maekke Exp $
ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk"
-inherit eutils subversion autotools multilib
+inherit eutils multilib
+if [[ ${PV} == "9999" ]] ; then
+ inherit subversion autotools
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS=""
+ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+fi
DESCRIPTION="OpenOCD - Open On-Chip Debugger"
HOMEPAGE="http://openocd.berlios.de/web/"
-SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
IUSE="ft2232 ftdi parport presto usb"
RESTRICT="strip" # includes non-native binaries
@@ -19,6 +25,7 @@ RESTRICT="strip" # includes non-native binaries
DEPEND="usb? ( dev-libs/libusb )
presto? ( dev-embedded/libftd2xx )
ft2232? ( || ( ftdi? ( dev-embedded/libftdi ) dev-embedded/libftd2xx ) )"
+RDEPEND="${DEPEND}"
pkg_setup() {
if use ftdi && ! use ft2232 ; then
@@ -37,9 +44,13 @@ pkg_setup() {
}
src_unpack() {
- subversion_src_unpack
- cd "${S}"
- eautoreconf
+ if [[ ${PV} == "9999" ]] ; then
+ subversion_src_unpack
+ cd "${S}"
+ eautoreconf
+ else
+ unpack ${A}
+ fi
}
src_compile() {
@@ -55,8 +66,7 @@ src_compile() {
$(use_enable parport parport_giveio) \
$(use_enable presto presto_ftd2xx) \
$(use ft2232 && use_enable ftdi ft2232_libftdi) \
- $(use ft2232 && use_enable !ftdi ft2232_ftd2xx) \
- || die "Error in econf!"
+ $(use ft2232 && use_enable !ftdi ft2232_ftd2xx)
emake || die "Error in emake!"
}