Add patch to work with binaries built with -O0, bug #198327

Package-Manager: portage-2.1.3.16

6 files changed, 98 insertions, 21 deletions

diff --git a/dev-util/debugedit/ChangeLog b/dev-util/debugedit/ChangeLog
index 729c99808e29..880ccc468abf 100644
--- a/dev-util/debugedit/ChangeLog
+++ b/dev-util/debugedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/debugedit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debugedit/ChangeLog,v 1.11 2007/02/22 01:59:21 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debugedit/ChangeLog,v 1.12 2007/11/07 15:04:18 tester Exp $
+
+*debugedit-4.4.6-r1 (07 Nov 2007)
+
+  07 Nov 2007; Olivier Crête <tester@gentoo.org>
+  +files/debugedit-4.4.6-busted-paths-with-O0.patch,
+  -debugedit-4.4.3.ebuild, +debugedit-4.4.6-r1.ebuild:
+  Add patch to work with binaries built with -O0, bug #198327
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index bfc599a10230..ee67280b585b 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,24 +1,37 @@
-DIST debugedit-4.4.3.tar.bz2 12942 RMD160 b4dadb3976d43ae1a0f264a461da93d6daf1c459 SHA1 a6e23c3d02748a4bb536a4b18a9a0b0f419a6369 SHA256 c313405f02ce932dddb5bd49b4920aa4b9cc68499549d795aca51685ae23b42f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX debugedit-4.4.6-busted-paths-with-O0.patch 1218 RMD160 603fdb3c1c29330cc48b62a6f9fe43a43883e1ff SHA1 6dc49656a7256ec379aa78f2a344c6ba37b95991 SHA256 c531944294a74cd9cca78c1373344d94cc060b144f61569a09b614c158449226
+MD5 7ff91cb8a98bbc37c2b32f1f01db248a files/debugedit-4.4.6-busted-paths-with-O0.patch 1218
+RMD160 603fdb3c1c29330cc48b62a6f9fe43a43883e1ff files/debugedit-4.4.6-busted-paths-with-O0.patch 1218
+SHA256 c531944294a74cd9cca78c1373344d94cc060b144f61569a09b614c158449226 files/debugedit-4.4.6-busted-paths-with-O0.patch 1218
 DIST debugedit-4.4.6.tar.bz2 12924 RMD160 9007f16ed6a0052b5d2b29869a5ba1284f0e8520 SHA1 2700cd510b3a662e57b8ab15514cd63deeea1aa0 SHA256 33700d88de1dce201bcded9b43789bc352b9edce1c020ada0ac417bf88c3acb4
-EBUILD debugedit-4.4.3.ebuild 585 RMD160 3bc2cef69c9cf2a40850a6d586386d1056b350b2 SHA1 4b8904cd89a24816401ab89283e89d8cec49350c SHA256 f85542afd6a520ae5e3915382153749db4236328e0453bb61f9a523cd2102f11
-MD5 7cd65930d351378c1a346ecc88a87c7b debugedit-4.4.3.ebuild 585
-RMD160 3bc2cef69c9cf2a40850a6d586386d1056b350b2 debugedit-4.4.3.ebuild 585
-SHA256 f85542afd6a520ae5e3915382153749db4236328e0453bb61f9a523cd2102f11 debugedit-4.4.3.ebuild 585
+EBUILD debugedit-4.4.6-r1.ebuild 716 RMD160 34f581e7c12c50015a174bca2844cb3e6057e54d SHA1 611427825218fbf1762e6371020f5680e154bbdd SHA256 831b13ddaac253c56209f8f2f4235befab5deb4fd53bc27ad4ba9b2d5f172a51
+MD5 b6cc0144a8b42c4fbf2c2786befa6cb0 debugedit-4.4.6-r1.ebuild 716
+RMD160 34f581e7c12c50015a174bca2844cb3e6057e54d debugedit-4.4.6-r1.ebuild 716
+SHA256 831b13ddaac253c56209f8f2f4235befab5deb4fd53bc27ad4ba9b2d5f172a51 debugedit-4.4.6-r1.ebuild 716
 EBUILD debugedit-4.4.6.ebuild 614 RMD160 6a4bedeca8b83d7d25f1f6a8c35abfdc9b325535 SHA1 74b700ba0e88037b8daf6e4c012931f2e34b3099 SHA256 0ccd415632c9dee64e8013a68817c56f717b09ff75e3bb0355057ea3ff66d7f0
 MD5 d720ed199f14f0e1bbc0539ffaad1136 debugedit-4.4.6.ebuild 614
 RMD160 6a4bedeca8b83d7d25f1f6a8c35abfdc9b325535 debugedit-4.4.6.ebuild 614
 SHA256 0ccd415632c9dee64e8013a68817c56f717b09ff75e3bb0355057ea3ff66d7f0 debugedit-4.4.6.ebuild 614
-MISC ChangeLog 1578 RMD160 c883400bc30e7ae63a3e96da5131e98785a61d9d SHA1 6125e61e2c8e0d35b02c17e87ca0a066977740b2 SHA256 169ab31be684a7edcbe4e5b947a99d7de45cbf8b97b75c82507b51aa311c4692
-MD5 aa45c28fca29da96c829d1be33ab3502 ChangeLog 1578
-RMD160 c883400bc30e7ae63a3e96da5131e98785a61d9d ChangeLog 1578
-SHA256 169ab31be684a7edcbe4e5b947a99d7de45cbf8b97b75c82507b51aa311c4692 ChangeLog 1578
+MISC ChangeLog 1835 RMD160 f5feb9b4cb8b2d82f01923b69e461348ee9f479f SHA1 e4e6d5ec9b45aff296f0b7f2ce8f329a8ebbeeac SHA256 d4860351368e3f9bce7c743ee93e5572a50bbb49e7e71407a31083d9231ebfbd
+MD5 0d1e29b185ce6e2bd4a8335d714a5c9c ChangeLog 1835
+RMD160 f5feb9b4cb8b2d82f01923b69e461348ee9f479f ChangeLog 1835
+SHA256 d4860351368e3f9bce7c743ee93e5572a50bbb49e7e71407a31083d9231ebfbd ChangeLog 1835
 MISC metadata.xml 155 RMD160 297f83476c74b848a24cf8a67b9615ae37b07d29 SHA1 94300d9d5d223657ba97f51d5cf747003ef5e232 SHA256 142bae5e883cc1183dfbb1418643e064c35eea45195cff945d71ad16dc9dbe08
 MD5 d31a65af02ea7e1b7db91c114435fbb2 metadata.xml 155
 RMD160 297f83476c74b848a24cf8a67b9615ae37b07d29 metadata.xml 155
 SHA256 142bae5e883cc1183dfbb1418643e064c35eea45195cff945d71ad16dc9dbe08 metadata.xml 155
-MD5 af0f35d11db28bc45018514df96d4630 files/digest-debugedit-4.4.3 247
-RMD160 9dadceff35c204e70f258938fa45d693e8437a58 files/digest-debugedit-4.4.3 247
-SHA256 dc263fdec23cbb6859b12afa2b423cf6034755d8dd679a4679686b5f9989e4e6 files/digest-debugedit-4.4.3 247
 MD5 95399212c33997ea1428fe50f793b192 files/digest-debugedit-4.4.6 247
 RMD160 647531068ebdec2dd3e0cea025cfdf634dae72e5 files/digest-debugedit-4.4.6 247
 SHA256 2543232e465d0fd2d616482fe3774c33823ebde114e0769974ab34f8b2fd8f47 files/digest-debugedit-4.4.6 247
+MD5 95399212c33997ea1428fe50f793b192 files/digest-debugedit-4.4.6-r1 247
+RMD160 647531068ebdec2dd3e0cea025cfdf634dae72e5 files/digest-debugedit-4.4.6-r1 247
+SHA256 2543232e465d0fd2d616482fe3774c33823ebde114e0769974ab34f8b2fd8f47 files/digest-debugedit-4.4.6-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHMdQ6+IXOQtHLm/gRAmdSAKCHtBjZRzhh9CQdNxs0//nGeeSU3wCfe8sq
+hhBJ5AtoyWH4zTsmN6j3qLA=
+=I65z
+-----END PGP SIGNATURE-----
diff --git a/dev-util/debugedit/debugedit-4.4.3.ebuild b/dev-util/debugedit/debugedit-4.4.6-r1.ebuild
index 229d9e6b304d..aac92253622b 100644
--- a/dev-util/debugedit/debugedit-4.4.3.ebuild
+++ b/dev-util/debugedit/debugedit-4.4.6-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debugedit/debugedit-4.4.3.ebuild,v 1.5 2006/05/25 07:07:25 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debugedit/debugedit-4.4.6-r1.ebuild,v 1.1 2007/11/07 15:04:18 tester Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Standalone debugedit taken from rpm"
 
@@ -9,17 +11,23 @@ SRC_URI="http://dev.gentoo.org/~tester/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/popt
 	dev-libs/elfutils"
-#RDEPEND=""
 
 S=${WORKDIR}/${P}
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-busted-paths-with-O0.patch"
+}
+
 src_compile() {
-	emake || die "emake failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
diff --git a/dev-util/debugedit/files/debugedit-4.4.6-busted-paths-with-O0.patch b/dev-util/debugedit/files/debugedit-4.4.6-busted-paths-with-O0.patch
new file mode 100644
index 000000000000..fe2fec6e5553
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-4.4.6-busted-paths-with-O0.patch
@@ -0,0 +1,49 @@
+--- debugedit.c.orig	2007-11-07 05:54:25.093281634 +0000
++++ debugedit.c	2007-11-07 06:23:15.481373200 +0000
+@@ -723,8 +723,31 @@
+ 		}
+ 	    }
+ 
+-	    if (t->attr[i].attr == DW_AT_comp_dir) {
+-		if (form == DW_FORM_strp &&
++	  else if (t->attr[i].attr == DW_AT_comp_dir)
++	    {
++	      if (form == DW_FORM_string)
++	        {
++		  free (comp_dir);
++		  comp_dir = strdup (ptr);
++
++		  if (phase == 1 && dest_dir && has_prefix (ptr, base_dir))
++		    {
++		      base_len = strlen (base_dir);
++		      dest_len = strlen (dest_dir);
++
++		      memcpy (ptr, dest_dir, dest_len);
++		      if (dest_len < base_len)
++		        {
++			  memset (ptr + dest_len, '/',
++				  base_len - dest_len);
++
++		        }
++		      elf_flagdata (debug_sections[DEBUG_INFO].elf_data,
++				    ELF_C_SET, ELF_F_DIRTY);
++		    }
++	       }
++
++	     else if (form == DW_FORM_strp &&
+ 	      debug_sections[DEBUG_STR].data)
+ 	    {
+ 	      char *dir;
+@@ -749,11 +772,8 @@
+ 				ELF_C_SET, ELF_F_DIRTY);
+ 		}
+ 	    }
+-		else if (form == DW_FORM_string) {
+-			free(comp_dir);
+-			comp_dir = strdup (ptr);			
+-		}
+ 	    }
++
+ 	  else if ((t->tag == DW_TAG_compile_unit
+ 		    || t->tag == DW_TAG_partial_unit)
+ 		   && t->attr[i].attr == DW_AT_name
diff --git a/dev-util/debugedit/files/digest-debugedit-4.4.3 b/dev-util/debugedit/files/digest-debugedit-4.4.3
deleted file mode 100644
index 760d2440c423..000000000000
--- a/dev-util/debugedit/files/digest-debugedit-4.4.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 10bdb902299d989bf7cceb9ac7121855 debugedit-4.4.3.tar.bz2 12942
-RMD160 b4dadb3976d43ae1a0f264a461da93d6daf1c459 debugedit-4.4.3.tar.bz2 12942
-SHA256 c313405f02ce932dddb5bd49b4920aa4b9cc68499549d795aca51685ae23b42f debugedit-4.4.3.tar.bz2 12942
diff --git a/dev-util/debugedit/files/digest-debugedit-4.4.6-r1 b/dev-util/debugedit/files/digest-debugedit-4.4.6-r1
new file mode 100644
index 000000000000..a024de306daf
--- /dev/null
+++ b/dev-util/debugedit/files/digest-debugedit-4.4.6-r1
@@ -0,0 +1,3 @@
+MD5 64df315bfdf8b7f1b9a9310585159633 debugedit-4.4.6.tar.bz2 12924
+RMD160 9007f16ed6a0052b5d2b29869a5ba1284f0e8520 debugedit-4.4.6.tar.bz2 12924
+SHA256 33700d88de1dce201bcded9b43789bc352b9edce1c020ada0ac417bf88c3acb4 debugedit-4.4.6.tar.bz2 12924