diff options
| -rw-r--r-- | dev-embedded/openocd/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-0.6.1.ebuild | 62 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-9999.ebuild | 58 |
3 files changed, 92 insertions, 37 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog index c935c37c0576..c090c13e2078 100644 --- a/dev-embedded/openocd/ChangeLog +++ b/dev-embedded/openocd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-embedded/openocd -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.34 2012/11/09 20:28:21 hwoarang Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.35 2013/04/23 03:16:09 vapier Exp $ + + 23 Apr 2013; Mike Frysinger <vapier@gentoo.org> openocd-0.6.1.ebuild, + openocd-9999.ebuild: + Clean up the ebuild a bit and fix building against either libftdi-0.x or + libftdi-1.x #460916 by Marcin Sporysz. *openocd-0.6.1 (09 Nov 2012) diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild index 50fa3f2565ab..b00340dd9176 100644 --- a/dev-embedded/openocd/openocd-0.6.1.ebuild +++ b/dev-embedded/openocd/openocd-0.6.1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.6.1.ebuild,v 1.1 2012/11/09 20:28:21 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.6.1.ebuild,v 1.2 2013/04/23 03:16:09 vapier Exp $ EAPI="4" -inherit eutils multilib +inherit eutils multilib flag-o-matic toolchain-funcs if [[ ${PV} == "9999" ]] ; then inherit autotools git-2 KEYWORDS="" EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" else KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${P/_/-}.tar.bz2" + SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" fi DESCRIPTION="OpenOCD - Open On-Chip Debugger" @@ -32,33 +32,58 @@ RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" -S="${WORKDIR}"/${P/_/-} - src_prepare() { if [[ ${PV} == "9999" ]] ; then sed -i -e "/@include version.texi/d" doc/${PN}.texi || die AT_NO_RECURSIVE=yes eautoreconf fi + + # Disable craptastic build settings. + sed -i \ + -e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \ + configure || die + + if use ftdi ; then + local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" + # Use libftdi-1 paths #460916 + local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) + sed -i \ + -e "s:-lftdi -lusb:${libs}:" \ + configure src/Makefile.in || die + append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc}) + fi } src_configure() { # Here are some defaults - myconf="--enable-buspirate --enable-ioutil --disable-werror - --disable-internal-jimtcl --enable-amtjtagaccel - --enable-ep93xx --enable-at91rm9200 --enable-gw16012 - --enable-oocd_trace" + local myconf=( + --enable-buspirate + --enable-ioutil + --disable-werror + --disable-internal-jimtcl + --enable-amtjtagaccel + --enable-ep93xx + --enable-at91rm9200 + --enable-gw16012 + --enable-oocd_trace + ) if use usb; then - myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \ - --enable-vsllink --enable-arm-jtag-ew" + myconf+=( + --enable-usbprog + --enable-jlink + --enable-rlink + --enable-vsllink + --enable-arm-jtag-ew + ) fi # add explicitely the path to libftd2xx - use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)" + use ftd2xx && append-ldflags -L/opt/$(get_libdir) if use blaster; then - use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi" - use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx" + use ftdi && myconf+=( --enable-usb_blaster_libftdi ) + use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx ) fi econf \ $(use_enable dummy) \ @@ -69,11 +94,10 @@ src_configure() { $(use_enable presto presto_ftd2xx) \ $(use_enable segger jlink) \ $(use_enable versaloon vsllink) \ - ${myconf} + "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README TODO || die - prepstrip "${D}"/usr/bin + default + env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) } diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 3995ddc73b08..e9820bbb5f1c 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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.25 2012/08/29 17:51:45 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.26 2013/04/23 03:16:09 vapier Exp $ EAPI="4" -inherit eutils multilib +inherit eutils multilib flag-o-matic toolchain-funcs if [[ ${PV} == "9999" ]] ; then inherit autotools git-2 KEYWORDS="" @@ -37,26 +37,53 @@ src_prepare() { sed -i -e "/@include version.texi/d" doc/${PN}.texi || die AT_NO_RECURSIVE=yes eautoreconf fi + + # Disable craptastic build settings. + sed -i \ + -e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \ + configure || die + + if use ftdi ; then + local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" + # Use libftdi-1 paths #460916 + local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) + sed -i \ + -e "s:-lftdi -lusb:${libs}:" \ + configure src/Makefile.in || die + append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc}) + fi } src_configure() { # Here are some defaults - myconf="--enable-buspirate --enable-ioutil --disable-werror - --disable-internal-jimtcl --enable-amtjtagaccel - --enable-ep93xx --enable-at91rm9200 --enable-gw16012 - --enable-oocd_trace" + local myconf=( + --enable-buspirate + --enable-ioutil + --disable-werror + --disable-internal-jimtcl + --enable-amtjtagaccel + --enable-ep93xx + --enable-at91rm9200 + --enable-gw16012 + --enable-oocd_trace + ) if use usb; then - myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \ - --enable-vsllink --enable-arm-jtag-ew" + myconf+=( + --enable-usbprog + --enable-jlink + --enable-rlink + --enable-vsllink + --enable-arm-jtag-ew + ) fi # add explicitely the path to libftd2xx - use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)" + use ftd2xx && append-ldflags -L/opt/$(get_libdir) if use blaster; then - use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi" - use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx" + use ftdi && myconf+=( --enable-usb_blaster_libftdi ) + use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx ) fi econf \ $(use_enable dummy) \ @@ -67,11 +94,10 @@ src_configure() { $(use_enable presto presto_ftd2xx) \ $(use_enable segger jlink) \ $(use_enable versaloon vsllink) \ - ${myconf} + "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README TODO || die - prepstrip "${D}"/usr/bin + default + env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) } |