summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2010-11-17 22:59:51 +0000
committerMichael Weber <xmw@gentoo.org>2010-11-17 22:59:51 +0000
commit2b680eab6129cd34566835138fdb04da342f036f (patch)
tree2a6daeb4b142e1c1b40c67848382e48ff774fadd /dev-embedded
parentVersion bump (bug #345189 by Deniss Gaplevsky). (diff)
downloadgentoo-2-2b680eab6129cd34566835138fdb04da342f036f.tar.gz
gentoo-2-2b680eab6129cd34566835138fdb04da342f036f.tar.bz2
gentoo-2-2b680eab6129cd34566835138fdb04da342f036f.zip
Revbump to include dragon-segfault.patch (bug #300312).
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-embedded')
-rw-r--r--dev-embedded/avrdude/ChangeLog8
-rw-r--r--dev-embedded/avrdude/avrdude-5.8-r1.ebuild48
-rw-r--r--dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch16
3 files changed, 71 insertions, 1 deletions
diff --git a/dev-embedded/avrdude/ChangeLog b/dev-embedded/avrdude/ChangeLog
index 512f72ec9e7e..67492f616110 100644
--- a/dev-embedded/avrdude/ChangeLog
+++ b/dev-embedded/avrdude/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-embedded/avrdude
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.42 2010/02/28 19:56:30 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.43 2010/11/17 22:59:51 xmw Exp $
+
+*avrdude-5.8-r1 (17 Nov 2010)
+
+ 17 Nov 2010; Michael Weber <xmw@gentoo.org> +avrdude-5.8-r1.ebuild,
+ +files/avrdude-5.8-dragon-segfault.patch:
+ Revbump to include dragon-segfault.patch (bug #300312).
28 Feb 2010; <solar@gentoo.org> avrdude-5.5.ebuild:
stable arm
diff --git a/dev-embedded/avrdude/avrdude-5.8-r1.ebuild b/dev-embedded/avrdude/avrdude-5.8-r1.ebuild
new file mode 100644
index 000000000000..b712b09d85f5
--- /dev/null
+++ b/dev-embedded/avrdude/avrdude-5.8-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.8-r1.ebuild,v 1.1 2010/11/17 22:59:51 xmw Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="AVR Downloader/UploaDEr"
+HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
+SRC_URI_BASE="http://savannah.nongnu.org/download/${PN}"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.gz
+ doc? ( ${SRC_URI_BASE}/${PN}-doc-${PV}.tar.gz
+ ${SRC_URI_BASE}/${PN}-doc-${PV}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc"
+
+RDEPEND="virtual/libusb"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # let the build system re-generate these, bug #120194
+ rm -f lexer.c config_gram.c config_gram.h
+ epatch "${FILESDIR}"/avrdude-5.8-dragon-segfault.patch
+}
+
+src_compile() {
+ # The automake target for these files does not use tempfiles or create these
+ # atomically, confusing a parallel build. So we force them first.
+ emake lexer.c config_gram.c config_gram.h || die "emake of lexer failed"
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+
+ dodoc AUTHORS ChangeLog* NEWS README || die "dodoc failed"
+
+ if use doc ; then
+ newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf || \
+ die "newdoc failed"
+ dohtml -r "${WORKDIR}/avrdude-html/" || die "dohtml failed"
+ fi
+}
diff --git a/dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch b/dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch
new file mode 100644
index 000000000000..dc6225f38612
--- /dev/null
+++ b/dev-embedded/avrdude/files/avrdude-5.8-dragon-segfault.patch
@@ -0,0 +1,16 @@
+Suggested by http://savannah.nongnu.org/users/alexdm
+on http://savannah.nongnu.org/bugs/?27507
+
+--- avrdude-5.8/stk500v2.c
++++ avrdude-5.8/stk500v2.c
+@@ -3586,8 +3586,8 @@
+ pgm->paged_load = stk500v2_paged_load;
+ pgm->print_parms = stk500v2_print_parms;
+ pgm->set_sck_period = stk500v2_set_sck_period_mk2;
+- pgm->setup = jtagmkII_setup;
+- pgm->teardown = jtagmkII_teardown;
++ pgm->setup = stk500v2_jtagmkII_setup;
++ pgm->teardown = stk500v2_jtagmkII_teardown;
+ pgm->page_size = 256;
+ }
+