Fix building with newer glibcs #149945 by Alexander Jenisch.

Package-Manager: portage-2.1.2_pre2

4 files changed, 52 insertions, 17 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index 4d8e45a3e977..cf970e388906 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/strace
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.90 2006/07/12 20:06:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.91 2006/10/05 02:05:21 vapier Exp $
+
+  05 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/strace-4.5.14-PT_GETSIGINFO.patch, strace-4.5.14.ebuild:
+  Fix building with newer glibcs #149945 by Alexander Jenisch.
 
   12 Jul 2006; Aron Griffis <agriffis@gentoo.org> strace-4.5.14.ebuild:
   Mark 4.5.14 stable on ia64. #137914
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 73dec01ab93f..7a070d2debce 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX strace-4.5.11-alpha-stat64.patch 1418 RMD160 a136a80eac15bca87fe6b2d39d65949fc2249d0a SHA1 09bfdf92442b9ac694b98c3c8710af9947f49521 SHA256 33ce8bf0b266c2741607907460686a82e23df0ac79fdb7fe5b4436d119b101de
 MD5 cbd6857cb3c5b57e1364ca621fb1a5b3 files/strace-4.5.11-alpha-stat64.patch 1418
 RMD160 a136a80eac15bca87fe6b2d39d65949fc2249d0a files/strace-4.5.11-alpha-stat64.patch 1418
@@ -18,6 +21,10 @@ AUX strace-4.5.12-superh-update.patch 540 RMD160 4a021623687f0bbb6dc1e102ab5e304
 MD5 d35971fd734b9597cc50db1060fd2b8f files/strace-4.5.12-superh-update.patch 540
 RMD160 4a021623687f0bbb6dc1e102ab5e304fea123857 files/strace-4.5.12-superh-update.patch 540
 SHA256 267d553bec04725e3d723b3afe825c8307774d75c9f9424c6801048fc85712b9 files/strace-4.5.12-superh-update.patch 540
+AUX strace-4.5.14-PT_GETSIGINFO.patch 607 RMD160 fae2f625c1cf071324cd02e97b88879d973e5c1e SHA1 c9a5902adeaf6d58ca5dd3e91f0ee60823532e39 SHA256 92ebb64a491dc1788300391c517f9e15abe2d346c24c7ceca1b8eb57b40e7ace
+MD5 054b98bfa95f919fa0221f1b0d83345c files/strace-4.5.14-PT_GETSIGINFO.patch 607
+RMD160 fae2f625c1cf071324cd02e97b88879d973e5c1e files/strace-4.5.14-PT_GETSIGINFO.patch 607
+SHA256 92ebb64a491dc1788300391c517f9e15abe2d346c24c7ceca1b8eb57b40e7ace files/strace-4.5.14-PT_GETSIGINFO.patch 607
 AUX strace-4.5.8-ia64.patch 2271 RMD160 8a26565e9286deb508a2b1626b41e9856d81c385 SHA1 848a4f32b9b6f75fdebfae4de0e907221022354b SHA256 7882ae9504c1ff1446d7b0df3a27642a8703b3065adf2df1e66b83dd9a13b0f3
 MD5 335622a1648a690be4e5eddba97f3034 files/strace-4.5.8-ia64.patch 2271
 RMD160 8a26565e9286deb508a2b1626b41e9856d81c385 files/strace-4.5.8-ia64.patch 2271
@@ -49,14 +56,14 @@ EBUILD strace-4.5.12.ebuild 2112 RMD160 b7ac0c3ffbf7d87c790c295651167214e13287c7
 MD5 57477518cfaec5dfa5beff57a2398631 strace-4.5.12.ebuild 2112
 RMD160 b7ac0c3ffbf7d87c790c295651167214e13287c7 strace-4.5.12.ebuild 2112
 SHA256 4fdbbd42beec0a7629b84d94439ddf593fdb6a03c44ba04335fbf65dd4d4cec2 strace-4.5.12.ebuild 2112
-EBUILD strace-4.5.14.ebuild 2051 RMD160 c3c84f5eb78140ff40a57ee89008294d608e8be8 SHA1 37f3e5d72c7458d4497813fe918e51465ca87a64 SHA256 327ec78cf1e30831ec38afb16d1e040626df95c31035882f324b9b904366e1b3
-MD5 1895e2cee764814c56de11daa1ac7d23 strace-4.5.14.ebuild 2051
-RMD160 c3c84f5eb78140ff40a57ee89008294d608e8be8 strace-4.5.14.ebuild 2051
-SHA256 327ec78cf1e30831ec38afb16d1e040626df95c31035882f324b9b904366e1b3 strace-4.5.14.ebuild 2051
-MISC ChangeLog 10635 RMD160 6df1f4df53ea58b3d9445ad878bd82c33ba6817b SHA1 a7da7217d1efcc741f546eb8469ddc007fa6fa3b SHA256 aa1dfa0450dfc52a648ab6e66d6dae261a65f8a023ca314309bdca0e9e4491da
-MD5 272d541b026d8a379bfe7d61180cafee ChangeLog 10635
-RMD160 6df1f4df53ea58b3d9445ad878bd82c33ba6817b ChangeLog 10635
-SHA256 aa1dfa0450dfc52a648ab6e66d6dae261a65f8a023ca314309bdca0e9e4491da ChangeLog 10635
+EBUILD strace-4.5.14.ebuild 1861 RMD160 6be5d9cd782fcce8eed8338b34bf6e793834363b SHA1 3da4fad7e623e9766b22083377f04a239cb0d14f SHA256 d8b0d05f21cfb1a10659c7c728b93ad726e79775d567c99ee07b50c52547d68f
+MD5 684bfb5a3c0e019e764db3ef205f69fd strace-4.5.14.ebuild 1861
+RMD160 6be5d9cd782fcce8eed8338b34bf6e793834363b strace-4.5.14.ebuild 1861
+SHA256 d8b0d05f21cfb1a10659c7c728b93ad726e79775d567c99ee07b50c52547d68f strace-4.5.14.ebuild 1861
+MISC ChangeLog 10813 RMD160 54462c8ef8088d7405db2e1d940fb8224b8bfb3a SHA1 14a09c52cc32410878922a849ae7cc9760976cab SHA256 0513717027e9e88e625d3b01a63d156dc864e3d8a406cf547d23697fb673a2be
+MD5 c5d09f9553a8b74ffc06af1b0226fbea ChangeLog 10813
+RMD160 54462c8ef8088d7405db2e1d940fb8224b8bfb3a ChangeLog 10813
+SHA256 0513717027e9e88e625d3b01a63d156dc864e3d8a406cf547d23697fb673a2be ChangeLog 10813
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -70,3 +77,10 @@ SHA256 796b8ccab880098bf5f8534a7f263ed641b07d15ea3b2ca0d736ada2ea72abf1 files/di
 MD5 d66df1bc2038e58ef304221027cbf316 files/digest-strace-4.5.14 244
 RMD160 af08ece4ca7efb28491d068135b5ebe4f9abe7ee files/digest-strace-4.5.14 244
 SHA256 5cb98f7afe26e3f97f31d956155dce922df6334d7ce8f6d4c09c176dd1faeec0 files/digest-strace-4.5.14 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJGhramhnQswr0vIRAuQSAJwK5et7xbXtPHkXIu0r8/siG3MyyQCfWhWI
+1fRFg9vPp0n/Hh8Z8B4RNx0=
+=m2Uq
+-----END PGP SIGNATURE-----
diff --git a/dev-util/strace/files/strace-4.5.14-PT_GETSIGINFO.patch b/dev-util/strace/files/strace-4.5.14-PT_GETSIGINFO.patch
new file mode 100644
index 000000000000..194b9d1ff540
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.14-PT_GETSIGINFO.patch
@@ -0,0 +1,18 @@
+strace assumes that if PT_GETSIGINFO is defined, you're building for ia64 as
+this was the only architecture that exported PT_GETSIGINFO via glibc userspace
+headers.  with newer glibc's, support for PT_GETSIGINFO has been added to all
+linux architectures so we can no longer assume PT_GETSIGINFO == ia64.
+
+http://bugs.gentoo.org/149945
+
+--- strace.c
++++ strace.c
+@@ -2251,7 +2251,7 @@
+ 			if (!cflag
+ 			    && (qual_flags[WSTOPSIG(status)] & QUAL_SIGNAL)) {
+ 				unsigned long addr = 0, pc = 0;
+-#ifdef PT_GETSIGINFO
++#ifdef PT_CR_IPSR
+ #				define PSR_RI	41
+ 				struct siginfo si;
+ 				unsigned long psr;
diff --git a/dev-util/strace/strace-4.5.14.ebuild b/dev-util/strace/strace-4.5.14.ebuild
index 942629a29fb0..81e51cbbd73c 100644
--- a/dev-util/strace/strace-4.5.14.ebuild
+++ b/dev-util/strace/strace-4.5.14.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.14.ebuild,v 1.11 2006/07/12 20:06:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.14.ebuild,v 1.12 2006/10/05 02:05:21 vapier Exp $
 
-inherit flag-o-matic
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit flag-o-matic autotools
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
 HOMEPAGE="http://sourceforge.net/projects/strace/"
@@ -21,6 +23,8 @@ src_unpack() {
 
 	[[ ${CHOST} == *-freebsd* ]] && epatch "${FILESDIR}"/${PN}-4.5.12-fbsd.patch
 
+	epatch "${FILESDIR}"/${P}-PT_GETSIGINFO.patch #149945
+
 	# Fix SuperH support
 	epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch
 	epatch "${FILESDIR}"/${PN}-4.5.12-superh-update.patch
@@ -36,15 +40,10 @@ src_unpack() {
 	# (08 Feb 2005 agriffis)
 	epatch "${FILESDIR}"/strace-4.5.8-ia64.patch
 
-	aclocal && autoheader && autoconf && automake || die "autotools failed"
+	eautoreconf
 }
 
 src_compile() {
-	# This is ugly but linux26-headers-2.6.8.1-r2 (and other versions) has some
-	# issues with definition of s64 and friends.  This seems to solve
-	# compilation in this case (08 Feb 2005 agriffis)
-	use ia64 && append-flags -D_ASM_IA64_PAL_H
-
 	# Compile fails with -O3 on sparc but works on x86
 	use sparc && replace-flags -O3 -O2
 	filter-lfs-flags