diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-03-17 12:50:00 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-03-17 12:50:00 +0000 |
| commit | ca4a23a27d5d2597459f9e705c7db77d104f9533 (patch) | |
| tree | 88f6e12bd7129781f29e979c761c4641ebf647e7 | |
| parent | Add openocd snapshot and refactor live ebuild. Bug #346473. Thanks to Peter S... (diff) | |
| download | gentoo-2-ca4a23a27d5d2597459f9e705c7db77d104f9533.tar.gz gentoo-2-ca4a23a27d5d2597459f9e705c7db77d104f9533.tar.bz2 gentoo-2-ca4a23a27d5d2597459f9e705c7db77d104f9533.zip | |
Fix typo. Backport fixes to live ebuild
(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)
| -rw-r--r-- | dev-embedded/openocd/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild | 4 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-9999.ebuild | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog index f8758f249605..1a99141856de 100644 --- a/dev-embedded/openocd/ChangeLog +++ b/dev-embedded/openocd/ChangeLog @@ -1,6 +1,10 @@ # 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.13 2011/03/17 12:47:29 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.14 2011/03/17 12:50:00 hwoarang Exp $ + + 17 Mar 2011; Markos Chandras <hwoarang@gentoo.org> + openocd-0.5.0_pre20110317.ebuild, openocd-9999.ebuild: + Fix typo. Backport fixes to live ebuild *openocd-0.5.0_pre20110317 (17 Mar 2011) diff --git a/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild b/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild index 62fef32aaec5..0d57a4c3d089 100644 --- a/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild +++ b/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild,v 1.2 2011/03/17 12:50:00 hwoarang Exp $ EAPI="2" @@ -64,7 +64,7 @@ src_configure() { $(use_enable parport) \ $(use_enable presto presto_ftd2xx) \ $(use_enable segger jlink) \ - $(use_enable versal0on vsllink) \ + $(use_enable versaloon vsllink) \ ${myconf} } diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index d946fa1e5766..3bfe3c47fcab 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,6 +1,6 @@ # 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.12 2011/03/17 12:47:29 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.13 2011/03/17 12:50:00 hwoarang Exp $ EAPI="2" @@ -38,6 +38,7 @@ pkg_setup() { } src_prepare() { + [[ ${PV} != "9999" ]] && sed -i -e "/@include version.texi/d" doc/${PN}.texi AT_NO_RECURSIVE=yes eautoreconf } @@ -46,6 +47,7 @@ src_configure() { 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 \ @@ -62,7 +64,7 @@ src_configure() { $(use_enable parport) \ $(use_enable presto presto_ftd2xx) \ $(use_enable segger jlink) \ - $(use_enable versal0on vsllink) \ + $(use_enable versaloon vsllink) \ ${myconf} } |