From 6dc6e1b22158279038e87244b6566b324779ae21 Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Mon, 23 Feb 2009 22:47:08 +0000 Subject: bumb to first openocd release, also tweak the live ebuild, bug #259938 (Portage version: 2.2_rc23/cvs/Linux i686) --- dev-embedded/openocd/ChangeLog | 10 +++- dev-embedded/openocd/openocd-0.1.0.ebuild | 77 +++++++++++++++++++++++++++++++ dev-embedded/openocd/openocd-9999.ebuild | 30 ++++++++---- 3 files changed, 105 insertions(+), 12 deletions(-) create mode 100644 dev-embedded/openocd/openocd-0.1.0.ebuild (limited to 'dev-embedded') 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 +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 openocd-9999.ebuild: Make usb support optional #249211 by Scott. 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!" } -- cgit v1.2.3-65-gdbad