hwoarang 14/04/06 16:02:36 Modified: openocd-9999.ebuild ChangeLog Added: openocd-0.8.0_rc1.ebuild Log: Add initial ebuild for openocd-0.8.0-rc1 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Revision Changes Path 1.32 dev-embedded/openocd/openocd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.32&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.32&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?r1=1.31&r2=1.32 Index: openocd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- openocd-9999.ebuild 11 Jun 2013 20:24:50 -0000 1.31 +++ openocd-9999.ebuild 6 Apr 2014 16:02:36 -0000 1.32 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.31 2013/06/11 20:24:50 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.32 2014/04/06 16:02:36 hwoarang Exp $ EAPI="5" @@ -12,8 +12,11 @@ KEYWORDS="" EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + S="${WORKDIR}"/${MY_P} KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" + SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi DESCRIPTION="OpenOCD - Open On-Chip Debugger" @@ -21,18 +24,22 @@ LICENSE="GPL-2" SLOT="0" -IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger stlink usb versaloon verbose-io" +IUSE="blaster dummy ftdi minidriver parport presto segger +usb versaloon verbose-io" RESTRICT="strip" # includes non-native binaries -# libftd2xx is the default because it is reported to work better. +# versaloon needs libusb:0 but the rest of the devices need libusb:1 +# Therefore, treat versaloon as a special case and always pull libusb:1 +# so most of the devices are supported by default. DEPEND=">=dev-lang/jimtcl-0.73 - usb? ( virtual/libusb:0 ) - presto? ( dev-embedded/libftd2xx ) - ftd2xx? ( dev-embedded/libftd2xx ) + usb? ( + versaloon? ( virtual/libusb:0 ) + virtual/libusb:1 + ) ftdi? ( dev-embedded/libftdi )" + RDEPEND="${DEPEND}" -REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" +REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi ) versaloon? ( usb )" src_prepare() { epatch_user @@ -70,44 +77,58 @@ --enable-at91rm9200 --enable-gw16012 --enable-oocd_trace - --enable-ulink --enable-arm-jtag-ew - --enable-ti-icdi - --enable-osbdm - --enable-opendous ) + # Adapters requiring usb/libusb-1.X support if use usb; then myconf+=( + --enable-aice + --enable-ti-icdi + --enable-ulink + --enable-osbdm + --enable-opendous --enable-usbprog --enable-jlink --enable-rlink + --enable-stlink --enable-vsllink --enable-arm-jtag-ew $(use_enable verbose-io verbose-usb-io) $(use_enable verbose-io verbose_usb_comms) ) + else + myconf+=( + --disable-aice + --disable-stlink + --disable-ti-icdi + --disable-ulink + --disable-osbdm + --disable-opendous + ) fi - # add explicitely the path to libftd2xx - use ftd2xx && append-ldflags -L/opt/$(get_libdir) - if use blaster; then - use ftdi && myconf+=( --enable-usb_blaster_libftdi ) - use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx ) + myconf+=( + --enable-usb_blaster_libftdi + --enable-usb-blaster-2 + ) + else + myconf+=( + --disable-usb_blaster_libftdi + --disable-usb-blaster-2 + ) fi + econf \ $(use_enable dummy) \ - $(use_enable ftdi ft2232_libftdi) \ $(use_enable ftdi) \ - $(use_enable ftd2xx ft2232_ftd2xx) \ $(use_enable minidriver minidriver-dummy) \ $(use_enable parport) \ $(use_enable parport parport_ppdev) \ $(use_enable parport parport_giveio) \ - $(use_enable presto presto_ftd2xx) \ + $(use_enable presto presto_libftdi) \ $(use_enable segger jlink) \ - $(use_enable stlink) \ $(use_enable versaloon vsllink) \ $(use_enable verbose-io verbose-jtag-io) \ "${myconf[@]}" 1.46 dev-embedded/openocd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.46&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.46&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?r1=1.45&r2=1.46 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ChangeLog 21 Dec 2013 12:40:31 -0000 1.45 +++ ChangeLog 6 Apr 2014 16:02:36 -0000 1.46 @@ -1,6 +1,12 @@ # ChangeLog for dev-embedded/openocd -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.45 2013/12/21 12:40:31 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.46 2014/04/06 16:02:36 hwoarang Exp $ + +*openocd-0.8.0_rc1 (06 Apr 2014) + + 06 Apr 2014; Markos Chandras <hwoar...@gentoo.org> +openocd-0.8.0_rc1.ebuild, + openocd-9999.ebuild: + Add initial ebuild for openocd-0.8.0-rc1 21 Dec 2013; Markos Chandras <hwoar...@gentoo.org> -openocd-0.3.1-r1.ebuild, -openocd-0.4.0.ebuild: 1.1 dev-embedded/openocd/openocd-0.8.0_rc1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild?rev=1.1&content-type=text/plain Index: openocd-0.8.0_rc1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild,v 1.1 2014/04/06 16:02:36 hwoarang Exp $ EAPI="5" inherit eutils multilib flag-o-matic toolchain-funcs # One ebuild to rule them all if [[ ${PV} == "9999" ]] ; then inherit autotools git-2 KEYWORDS="" EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" S="${WORKDIR}"/${MY_P} KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" fi DESCRIPTION="OpenOCD - Open On-Chip Debugger" HOMEPAGE="http://openocd.sourceforge.net"; LICENSE="GPL-2" SLOT="0" IUSE="blaster dummy ftdi minidriver parport presto segger +usb versaloon verbose-io" RESTRICT="strip" # includes non-native binaries # versaloon needs libusb:0 but the rest of the devices need libusb:1 # Therefore, treat versaloon as a special case and always pull libusb:1 # so most of the devices are supported by default. DEPEND=">=dev-lang/jimtcl-0.73 usb? ( versaloon? ( virtual/libusb:0 ) virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )" RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi ) versaloon? ( usb )" src_prepare() { epatch_user 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 local myconf=( --enable-buspirate --enable-ioutil --disable-werror --disable-internal-jimtcl --enable-amtjtagaccel --enable-ep93xx --enable-at91rm9200 --enable-gw16012 --enable-oocd_trace --enable-arm-jtag-ew ) # Adapters requiring usb/libusb-1.X support if use usb; then myconf+=( --enable-aice --enable-ti-icdi --enable-ulink --enable-osbdm --enable-opendous --enable-usbprog --enable-jlink --enable-rlink --enable-stlink --enable-vsllink --enable-arm-jtag-ew $(use_enable verbose-io verbose-usb-io) $(use_enable verbose-io verbose_usb_comms) ) else myconf+=( --disable-aice --disable-stlink --disable-ti-icdi --disable-ulink --disable-osbdm --disable-opendous ) fi if use blaster; then myconf+=( --enable-usb_blaster_libftdi --enable-usb-blaster-2 ) else myconf+=( --disable-usb_blaster_libftdi --disable-usb-blaster-2 ) fi econf \ $(use_enable dummy) \ $(use_enable ftdi) \ $(use_enable minidriver minidriver-dummy) \ $(use_enable parport) \ $(use_enable parport parport_ppdev) \ $(use_enable parport parport_giveio) \ $(use_enable presto presto_libftdi) \ $(use_enable segger jlink) \ $(use_enable versaloon vsllink) \ $(use_enable verbose-io verbose-jtag-io) \ "${myconf[@]}" } src_install() { default env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) }
