hwoarang 14/04/26 11:26:17 Modified: openocd-9999.ebuild ChangeLog Added: openocd-0.8.0_rc2.ebuild Removed: openocd-0.8.0_rc1.ebuild Log: Version bump. Drop versaloon use flag and merge it to the usb one. Update live ebuild (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Revision Changes Path 1.33 dev-embedded/openocd/openocd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.33&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.33&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?r1=1.32&r2=1.33 Index: openocd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- openocd-9999.ebuild 6 Apr 2014 16:02:36 -0000 1.32 +++ openocd-9999.ebuild 26 Apr 2014 11:26:17 -0000 1.33 @@ -1,6 +1,6 @@ # 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.32 2014/04/06 16:02:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.33 2014/04/26 11:26:17 hwoarang Exp $ EAPI="5" @@ -24,22 +24,21 @@ LICENSE="GPL-2" SLOT="0" -IUSE="blaster dummy ftdi minidriver parport presto segger +usb versaloon verbose-io" +IUSE="blaster dummy ftdi minidriver parport presto segger +usb 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. +# Pull both libusb:0 and libusb:1 because some device need the former +# others need the later etc. DEPEND=">=dev-lang/jimtcl-0.73 usb? ( - versaloon? ( virtual/libusb:0 ) + virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )" RDEPEND="${DEPEND}" -REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi ) versaloon? ( usb )" +REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )" src_prepare() { epatch_user @@ -129,7 +128,6 @@ $(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[@]}" } 1.47 dev-embedded/openocd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?r1=1.46&r2=1.47 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ChangeLog 6 Apr 2014 16:02:36 -0000 1.46 +++ ChangeLog 26 Apr 2014 11:26:17 -0000 1.47 @@ -1,6 +1,13 @@ # ChangeLog for dev-embedded/openocd # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.47 2014/04/26 11:26:17 hwoarang Exp $ + +*openocd-0.8.0_rc2 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras <[email protected]> +openocd-0.8.0_rc2.ebuild, + -openocd-0.8.0_rc1.ebuild, openocd-9999.ebuild: + Version bump. Drop versaloon use flag and merge it to the usb one. Update live + ebuild *openocd-0.8.0_rc1 (06 Apr 2014) 1.1 dev-embedded/openocd/openocd-0.8.0_rc2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild?rev=1.1&content-type=text/plain Index: openocd-0.8.0_rc2.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_rc2.ebuild,v 1.1 2014/04/26 11:26:17 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 verbose-io" RESTRICT="strip" # includes non-native binaries # Pull both libusb:0 and libusb:1 because some device need the former # others need the later etc. DEPEND=">=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )" RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )" 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 verbose-io verbose-jtag-io) \ "${myconf[@]}" } src_install() { default env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) }
