From f5a29fe511c8c59bc2961ae2e30628cf68d2b4cc Mon Sep 17 00:00:00 2001 From: Denis Dupeyron Date: Tue, 27 Mar 2007 22:25:26 +0000 Subject: [PATCH] Fixed bug #155665, thanks to Robert Pearce. Added patch from upstream CVS fixing duplicate label issue. Package-Manager: portage-2.1.2.2 --- dev-embedded/gputils/ChangeLog | 10 ++- dev-embedded/gputils/Manifest | 23 ++++- .../gputils/files/digest-gputils-0.13.4-r1 | 3 + .../gputils-0.13.4-duplicate-label.patch | 83 +++++++++++++++++++ .../files/gputils-0.13.4-mapping.patch | 23 +++++ dev-embedded/gputils/gputils-0.13.4-r1.ebuild | 30 +++++++ 6 files changed, 167 insertions(+), 5 deletions(-) create mode 100644 dev-embedded/gputils/files/digest-gputils-0.13.4-r1 create mode 100644 dev-embedded/gputils/files/gputils-0.13.4-duplicate-label.patch create mode 100644 dev-embedded/gputils/files/gputils-0.13.4-mapping.patch create mode 100644 dev-embedded/gputils/gputils-0.13.4-r1.ebuild 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 + +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 gputils-0.13.3-r1.ebuild: Stable on ppc64; bug #146422 diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest index d71c51233c02..700721eb60b0 100644 --- a/dev-embedded/gputils/Manifest +++ b/dev-embedded/gputils/Manifest @@ -1,3 +1,11 @@ +AUX gputils-0.13.4-duplicate-label.patch 3098 RMD160 435a30502e23a2a514a194e861e694dec4631214 SHA1 b6379321edc1881bf256b820cfdb4c50d9803ceb SHA256 9db4f07a450c53e8fb72d924aad8b9e2789423887f339b99af0f09343810e4cc +MD5 d6e75fabd186cdc00afca72d36a25d5d files/gputils-0.13.4-duplicate-label.patch 3098 +RMD160 435a30502e23a2a514a194e861e694dec4631214 files/gputils-0.13.4-duplicate-label.patch 3098 +SHA256 9db4f07a450c53e8fb72d924aad8b9e2789423887f339b99af0f09343810e4cc files/gputils-0.13.4-duplicate-label.patch 3098 +AUX gputils-0.13.4-mapping.patch 965 RMD160 a2d8d919a61db02fe1fe696aef6c633abf0a06cb SHA1 b0c315b85e360f7623835798443d8f743c10bdbf SHA256 28e4a859f79e2896549d0897f5f565772c9843a36c194d6adb6a2cabce8f28a2 +MD5 e922d40761ab608fd3e9ab9119eb58ee files/gputils-0.13.4-mapping.patch 965 +RMD160 a2d8d919a61db02fe1fe696aef6c633abf0a06cb files/gputils-0.13.4-mapping.patch 965 +SHA256 28e4a859f79e2896549d0897f5f565772c9843a36c194d6adb6a2cabce8f28a2 files/gputils-0.13.4-mapping.patch 965 DIST gputils-0.12.4.tar.gz 1434006 RMD160 74da5f9a1729f329949ba22cb3e77c6fe9191514 SHA1 8a995875be0eaf53af064e104771a03cd4d39f87 SHA256 e86084f925f0216d6a7660b879c68b45db49d0799e25537a74af844ee83f61c7 DIST gputils-0.13.3.tar.gz 1604376 RMD160 bca98077f8e7c137b7b10750d129eb8886fc5719 SHA1 50c4750d8c139e5f20438e3bd512ccba74e77b8c SHA256 e633a6db182f7deb8b4f218efc234b13a27230c1141f73af54416033f1930db4 DIST gputils-0.13.4.tar.gz 2052436 RMD160 2e63238d30bbaf0792455c4e3e78af6775b0f6f0 SHA1 eb9a6553bc9814f94d3b8e5af4b0d41565d9a788 SHA256 62a194dce099f35fb03f0aa83aea067fba17ebf5b2aa03dfacb9ae5d3d494c1f @@ -13,14 +21,18 @@ EBUILD gputils-0.13.3.ebuild 746 RMD160 39a4d92c0069f38479ca9ba3b6d8c4c37e87a1fb MD5 97b6af99fafcf39f2d33dbdc4ea4fb8d gputils-0.13.3.ebuild 746 RMD160 39a4d92c0069f38479ca9ba3b6d8c4c37e87a1fb gputils-0.13.3.ebuild 746 SHA256 7f8d7e37d5bd85c0f6760d77a4b2539480d4b907fff9f02eb768cda78fe72183 gputils-0.13.3.ebuild 746 +EBUILD gputils-0.13.4-r1.ebuild 901 RMD160 fd42611f75ac2821218c09d0227f293736c96ea7 SHA1 8153b1ca9c8b9aa27f3a4621cc3181898d0543fa SHA256 f2f72e013d518443c2d9f79e3dc038e568cbc3e5e4be3da746b58674a5bb32c9 +MD5 6021c42d7b49014856c22a09e8605fa8 gputils-0.13.4-r1.ebuild 901 +RMD160 fd42611f75ac2821218c09d0227f293736c96ea7 gputils-0.13.4-r1.ebuild 901 +SHA256 f2f72e013d518443c2d9f79e3dc038e568cbc3e5e4be3da746b58674a5bb32c9 gputils-0.13.4-r1.ebuild 901 EBUILD gputils-0.13.4.ebuild 702 RMD160 a7c74d4cc0fa13225237e8dd868de0369166ac53 SHA1 87523cf1b3d863463f1b42827e6dade446303749 SHA256 dea051751f1f5866562ef5212d246cd1214e950c7822305aa760aa52a3d12929 MD5 74438fc3d55afb8a77895ac3f3dd32b3 gputils-0.13.4.ebuild 702 RMD160 a7c74d4cc0fa13225237e8dd868de0369166ac53 gputils-0.13.4.ebuild 702 SHA256 dea051751f1f5866562ef5212d246cd1214e950c7822305aa760aa52a3d12929 gputils-0.13.4.ebuild 702 -MISC ChangeLog 4737 RMD160 d79e06d2778ad45df30900410d9eb426c5f0b5b8 SHA1 f005b933aba6817202b6102a705bead448c13b9c SHA256 11be00c6c2d03649e3a7b48b158a61e85c7a9bcad09d0fef9a222b6a0e0c67b5 -MD5 2badeb88670a4cf14798d1785a8c8c11 ChangeLog 4737 -RMD160 d79e06d2778ad45df30900410d9eb426c5f0b5b8 ChangeLog 4737 -SHA256 11be00c6c2d03649e3a7b48b158a61e85c7a9bcad09d0fef9a222b6a0e0c67b5 ChangeLog 4737 +MISC ChangeLog 5044 RMD160 2cfc24909500a071ac52a37fb0583a789b72130f SHA1 3dbe09f4b3f9dae60dfdced9b428293fc5c8c66c SHA256 ce06237b17eb9c6f4890d353d29bae2c4bc2cbf875e8e0d2ac2b960357dde78f +MD5 c6feebb50029dbb28cadc1fb107d6a03 ChangeLog 5044 +RMD160 2cfc24909500a071ac52a37fb0583a789b72130f ChangeLog 5044 +SHA256 ce06237b17eb9c6f4890d353d29bae2c4bc2cbf875e8e0d2ac2b960357dde78f ChangeLog 5044 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165 @@ -37,3 +49,6 @@ SHA256 bbdaf888a74c55b854e9b0919647059ff6e1cdca625c0f97ec6398d7574d8224 files/di MD5 ed273e5595088a8d74ef087d1e8b6096 files/digest-gputils-0.13.4 247 RMD160 cbebdfd8309dc7551b18840a4073fabf1b350ded files/digest-gputils-0.13.4 247 SHA256 70403666690c320daa18336f401bbc87ce69cba70b90c08af5b9ba8b34a5c99f files/digest-gputils-0.13.4 247 +MD5 ed273e5595088a8d74ef087d1e8b6096 files/digest-gputils-0.13.4-r1 247 +RMD160 cbebdfd8309dc7551b18840a4073fabf1b350ded files/digest-gputils-0.13.4-r1 247 +SHA256 70403666690c320daa18336f401bbc87ce69cba70b90c08af5b9ba8b34a5c99f files/digest-gputils-0.13.4-r1 247 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 ++ * [gpasm] Patch from David Barnett to fix 'Duplicate Label' bug. ++ + 2006-08-19 Craig Franklin + * 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 +} -- 2.26.2