Fixed bug #155665, thanks to Robert Pearce. Added patch from upstream CVS fixing duplicate label issue.

(Portage version: 2.1.2.2)

5 files changed, 148 insertions, 1 deletions

diff --git a/dev-embedded/gputils/ChangeLog b/dev-embedded/gputils/ChangeLog
index 6feec5acd2dd..b063b60afe72 100644
--- a/dev-embedded/gputils/ChangeLog
+++ b/dev-embedded/gputils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-embedded/gputils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/ChangeLog,v 1.32 2007/02/13 11:49:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/ChangeLog,v 1.33 2007/03/27 22:25:26 calchan Exp $
+
+*gputils-0.13.4-r1 (27 Mar 2007)
+
+  27 Mar 2007; Denis Dupeyron <calchan@gentoo.org>
+  +files/gputils-0.13.4-duplicate-label.patch,
+  +files/gputils-0.13.4-mapping.patch, +gputils-0.13.4-r1.ebuild:
+  Fixed bug #155665, thanks to Robert Pearce. Added patch from upstream CVS
+  fixing duplicate label issue.
 
   13 Feb 2007; Markus Rothe <corsair@gentoo.org> gputils-0.13.3-r1.ebuild:
   Stable on ppc64; bug #146422
diff --git a/dev-embedded/gputils/files/digest-gputils-0.13.4-r1 b/dev-embedded/gputils/files/digest-gputils-0.13.4-r1
new file mode 100644
index 000000000000..e65b3805ac7a
--- /dev/null
+++ b/dev-embedded/gputils/files/digest-gputils-0.13.4-r1
@@ -0,0 +1,3 @@
+MD5 c60e1370d20d7a3bb560a7a3795fd404 gputils-0.13.4.tar.gz 2052436
+RMD160 2e63238d30bbaf0792455c4e3e78af6775b0f6f0 gputils-0.13.4.tar.gz 2052436
+SHA256 62a194dce099f35fb03f0aa83aea067fba17ebf5b2aa03dfacb9ae5d3d494c1f gputils-0.13.4.tar.gz 2052436
diff --git a/dev-embedded/gputils/files/gputils-0.13.4-duplicate-label.patch b/dev-embedded/gputils/files/gputils-0.13.4-duplicate-label.patch
new file mode 100644
index 000000000000..d457c4b4febc
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-0.13.4-duplicate-label.patch
@@ -0,0 +1,83 @@
+diff -ur gputils-0.13.4.orig/ChangeLog gputils-0.13.4/ChangeLog
+--- gputils-0.13.4.orig/ChangeLog	2006-08-20 00:24:14.000000000 +0200
++++ gputils-0.13.4/ChangeLog	2007-03-27 23:44:01.000000000 +0200
+@@ -1,3 +1,6 @@
++2006-12-16 Scott Dattalo <scott@dattalo.com>
++  * [gpasm] Patch from David Barnett to fix 'Duplicate Label' bug.
++
+ 2006-08-19 Craig Franklin <craigfranklin@users.sourceforge.net>
+   * gputils 0.13.4 Released.
+   * [gputils] Updated header files and linker scripts.
+diff -ur gputils-0.13.4.orig/gpasm/evaluate.c gputils-0.13.4/gpasm/evaluate.c
+--- gputils-0.13.4.orig/gpasm/evaluate.c	2006-08-19 16:06:41.000000000 +0200
++++ gputils-0.13.4/gpasm/evaluate.c	2007-03-27 23:49:38.000000000 +0200
+@@ -433,7 +433,8 @@
+     if (strcmp(p->value.symbol, "$") == 0) {
+       char buffer[BUFSIZ];
+       
+-      snprintf(buffer, sizeof(buffer), "_$_%06x", state.org << _16bit_core);
++      snprintf(buffer, sizeof(buffer), "_%s_%06x", state.obj.new_sec_name,
++                       state.org << _16bit_core);
+       set_global(buffer, state.org << _16bit_core, PERMANENT, gvt_static);
+       s = get_symbol(state.stTop, buffer);
+     } else {
+diff -ur gputils-0.13.4.orig/gpasm/Makefile.in gputils-0.13.4/gpasm/Makefile.in
+--- gputils-0.13.4.orig/gpasm/Makefile.in	2006-08-20 00:20:43.000000000 +0200
++++ gputils-0.13.4/gpasm/Makefile.in	2007-03-27 23:45:34.000000000 +0200
+@@ -15,6 +15,8 @@
+ @SET_MAKE@
+ 
+ 
++SOURCES = $(libgpasm_a_SOURCES) $(gpasm_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+diff -ur gputils-0.13.4.orig/gplink/Makefile.in gputils-0.13.4/gplink/Makefile.in
+--- gputils-0.13.4.orig/gplink/Makefile.in	2006-08-20 00:20:43.000000000 +0200
++++ gputils-0.13.4/gplink/Makefile.in	2007-03-27 23:50:19.000000000 +0200
+@@ -14,6 +14,8 @@
+ 
+ @SET_MAKE@
+ 
++SOURCES = $(gplink_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+diff -ur gputils-0.13.4.orig/gputils/Makefile.in gputils-0.13.4/gputils/Makefile.in
+--- gputils-0.13.4.orig/gputils/Makefile.in	2006-08-20 00:20:43.000000000 +0200
++++ gputils-0.13.4/gputils/Makefile.in	2007-03-27 23:50:53.000000000 +0200
+@@ -14,6 +14,8 @@
+ 
+ @SET_MAKE@
+ 
++SOURCES = $(gpdasm_SOURCES) $(gplib_SOURCES) $(gpstrip_SOURCES) $(gpvc_SOURCES) $(gpvo_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+diff -ur gputils-0.13.4.orig/libgputils/Makefile.in gputils-0.13.4/libgputils/Makefile.in
+--- gputils-0.13.4.orig/libgputils/Makefile.in	2006-08-20 00:20:43.000000000 +0200
++++ gputils-0.13.4/libgputils/Makefile.in	2007-03-27 23:51:45.000000000 +0200
+@@ -14,6 +14,8 @@
+ 
+ @SET_MAKE@
+ 
++SOURCES = $(libgputils_a_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+diff -ur gputils-0.13.4.orig/libiberty/Makefile.in gputils-0.13.4/libiberty/Makefile.in
+--- gputils-0.13.4.orig/libiberty/Makefile.in	2006-08-20 00:20:44.000000000 +0200
++++ gputils-0.13.4/libiberty/Makefile.in	2007-03-27 23:52:36.000000000 +0200
+@@ -14,6 +14,8 @@
+ 
+ @SET_MAKE@
+ 
++SOURCES = $(libiberty_a_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
diff --git a/dev-embedded/gputils/files/gputils-0.13.4-mapping.patch b/dev-embedded/gputils/files/gputils-0.13.4-mapping.patch
new file mode 100644
index 000000000000..fc940e34c08d
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-0.13.4-mapping.patch
@@ -0,0 +1,23 @@
+diff -ur gputils-0.13.4.orig/gplink/lst.c gputils-0.13.4/gplink/lst.c
+--- gputils-0.13.4.orig/gplink/lst.c	2005-01-03 23:21:20.000000000 +0100
++++ gputils-0.13.4/gplink/lst.c	2007-03-28 00:07:16.000000000 +0200
+@@ -101,9 +101,9 @@
+       if ((line->symbol == symbol) && 
+           (line->line_number == line_number)) {
+         if (section != line_section) {
+-          /* switching sections, so update was_org with the new section
++          /* switching sections, so update was_org with the new 
+              address */
+-          state.lst.was_org = section->address >> state.byte_addr;
++          state.lst.was_org = line->address >> state.byte_addr;
+           line_section = section;
+         }  
+         return line;    
+@@ -179,6 +179,7 @@
+                  data & 0xffff, 
+                  dasmbuf,
+                  linebuf);
++        state.lst.was_org = org;
+         cod_lst_line(COD_NORMAL_LST_LINE);
+         org++;
+         if (num_words != 1) {
diff --git a/dev-embedded/gputils/gputils-0.13.4-r1.ebuild b/dev-embedded/gputils/gputils-0.13.4-r1.ebuild
new file mode 100644
index 000000000000..27c143b759c1
--- /dev/null
+++ b/dev-embedded/gputils/gputils-0.13.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.13.4-r1.ebuild,v 1.1 2007/03/27 22:25:26 calchan Exp $
+
+inherit eutils
+
+DESCRIPTION="Collection of tools including assembler, linker and librarian for PIC microcontrollers."
+HOMEPAGE="http://gputils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${P}-duplicate-label.patch" || die "Patching failed"
+	epatch "${FILESDIR}/${P}-mapping.patch" || die "Patching failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "Installation failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
+	insinto /usr/share/doc/${PF}/
+	doins doc/gputils.pdf
+}