summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-embedded/openocd/ChangeLog9
-rw-r--r--dev-embedded/openocd/metadata.xml4
-rw-r--r--dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild75
-rw-r--r--dev-embedded/openocd/openocd-9999.ebuild53
4 files changed, 113 insertions, 28 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 8c56eec48d6b..f8758f249605 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-embedded/openocd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.12 2011/03/14 19:36:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.13 2011/03/17 12:47:29 hwoarang Exp $
+
+*openocd-0.5.0_pre20110317 (17 Mar 2011)
+
+ 17 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
+ +openocd-0.5.0_pre20110317.ebuild, openocd-9999.ebuild, metadata.xml:
+ Add openocd snapshot and refactor live ebuild. Bug #346473. Thanks to Peter
+ Stuge <peter@stuge.se> for the initial ebuilds
14 Mar 2011; Sergei Trofimovich <slyfox@gentoo.org> openocd-9999.ebuild:
Fixed build failure (now upstream uses submodules)
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index a6f0c64a88c6..e87232e172cd 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -7,9 +7,13 @@
<name>Markos Chandras</name>
</maintainer>
<use>
+ <flag name='blaster'>Enable support for Altera USE-Blaster</flag>
+ <flag name='versaloon'></flag>
<flag name='ftd2xx'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
<flag name='ftdi'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
<flag name='parport'>Enable support for parport JTAG devices</flag>
<flag name='presto'>Enable support for AXIS PRESTO devices</flag>
+ <flag name='segger'>Enable support for the Segger J-Link JTAG</flag>
+ <flag name='versaloon'>Enable building support for the Versallon-lInk JTAG</flag>
</use>
</pkgmetadata>
diff --git a/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild b/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild
new file mode 100644
index 000000000000..62fef32aaec5
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild,v 1.1 2011/03/17 12:47:29 hwoarang Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+if [[ ${PV} == "9999" ]] ; then
+ inherit git
+ KEYWORDS=""
+ EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.berlios.de/web/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="blaster ftd2xx ftdi parport presto segger versaloon usb"
+RESTRICT="strip" # includes non-native binaries
+
+# libftd2xx is the default because it is reported to work better.
+DEPEND="dev-lang/jimtcl
+ usb? ( dev-libs/libusb )
+ presto? ( dev-embedded/libftd2xx )
+ ftd2xx? ( dev-embedded/libftd2xx )
+ ftdi? ( dev-embedded/libftdi )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ if use ftdi && use ftd2xx ; then
+ ewarn "You can only use one FTDI library at a time, so picking"
+ ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
+ fi
+}
+
+src_prepare() {
+ [[ ${PV} != "9999" ]] && sed -i -e "/@include version.texi/d" doc/${PN}.texi
+ AT_NO_RECURSIVE=yes eautoreconf
+}
+
+src_configure() {
+ if use usb;then
+ myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
+ --enable-vsllink --enable-arm-jtag-ew"
+ fi
+ [[ ${PV} != "9999" ]] && myconf="${myconf} --enable-maintainer-mode"
+ # add explicitely the path to libftd2xx
+ use ftd2xx && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+ econf \
+ --disable-werror \
+ --disable-internal-jimtcl \
+ --enable-amtjtagaccel \
+ --enable-ep93xx \
+ --enable-at91rm9200 \
+ --enable-gw16012 \
+ --enable-oocd_trace \
+ $(use_enable blaster usb_flaster_libftdi) \
+ $(use_enable ftdi ft2232_libftdi) \
+ $(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+ $(use_enable parport) \
+ $(use_enable presto presto_ftd2xx) \
+ $(use_enable segger jlink) \
+ $(use_enable versal0on vsllink) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README TODO || die
+ prepstrip "${D}"/usr/bin
+}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index f1328f661838..d946fa1e5766 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2011 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.11 2011/03/14 19:36:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.12 2011/03/17 12:47:29 hwoarang Exp $
-EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
-EGIT_HAS_SUBMODULES=YES
-inherit eutils
+EAPI="2"
+
+inherit autotools eutils
if [[ ${PV} == "9999" ]] ; then
- inherit git autotools
- #KEYWORDS=""
- SRC_URI=""
+ inherit git
+ KEYWORDS=""
+ EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
else
KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+ SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
fi
DESCRIPTION="OpenOCD - Open On-Chip Debugger"
@@ -19,11 +19,12 @@ HOMEPAGE="http://openocd.berlios.de/web/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="ftd2xx ftdi parport presto usb"
+IUSE="blaster ftd2xx ftdi parport presto segger versaloon usb"
RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
-DEPEND="usb? ( dev-libs/libusb )
+DEPEND="dev-lang/jimtcl
+ usb? ( dev-libs/libusb )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"
@@ -36,39 +37,37 @@ pkg_setup() {
fi
}
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git_src_unpack
- cd "${S}"
- eautoreconf
- else
- unpack ${A}
- fi
+src_prepare() {
+ AT_NO_RECURSIVE=yes eautoreconf
}
-src_compile() {
- if [[ ${PV} == "9999" ]] ; then
- myconf="${myconf} --enable-maintainer-mode"
+src_configure() {
+ if use usb;then
+ myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
+ --enable-vsllink --enable-arm-jtag-ew"
fi
-
+ # add explicitely the path to libftd2xx
+ use ftd2xx && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
econf \
--disable-werror \
+ --disable-internal-jimtcl \
--enable-amtjtagaccel \
--enable-ep93xx \
--enable-at91rm9200 \
--enable-gw16012 \
--enable-oocd_trace \
- $(use_enable usb usbprog) \
- $(use_enable parport) \
- $(use_enable presto presto_ftd2xx) \
+ $(use_enable blaster usb_flaster_libftdi) \
$(use_enable ftdi ft2232_libftdi) \
$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+ $(use_enable parport) \
+ $(use_enable presto presto_ftd2xx) \
+ $(use_enable segger jlink) \
+ $(use_enable versal0on vsllink) \
${myconf}
- emake || die "Error in emake!"
}
src_install() {
emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README TODO
+ dodoc AUTHORS ChangeLog NEWS README TODO || die
prepstrip "${D}"/usr/bin
}