added s390 specific fix to close #47916 and added s390 keyword

5 files changed, 92 insertions, 3 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index a628f2c86f71..39b6d1143a65 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/strace
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.33 2004/02/17 04:39:04 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.34 2004/04/18 15:01:10 randy Exp $
+
+*strace-4.4.98-r1 (18 Apr 2004)
+
+  18 Apr 2004; Michael McCabe <randy@gentoo.org> +strace-4.4.98-r1.ebuild:
+  Added s390 specific fix to close bug 47916 and added s390 keyword
+
+*strace-4.4.98-r1 18 Apr 2004
+
+  18 Apr 2004;  <> 
+  # INSERT ENTRY HERE
 
   16 Feb 2004; <tgall@gentoo.org> strace-4.5.1.ebuild:
   Move to ppc64 stable
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 61ed7651f14e..7029d1fa833d 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,10 +1,15 @@
-MD5 fa5afb825a85433a3eae269ac9f92e8d ChangeLog 3938
+MD5 97c406ab56b9adf30a687db801754d66 ChangeLog 4012
 MD5 f46df1731edc3f5f30000adeecc9ddc0 strace-4.4.94.ebuild 1224
-MD5 40e581ad5c07c3755d564a9c08506cfd strace-4.4.98.ebuild 1326
+MD5 bd8c6479a5dad7b349eac5bee77775f2 strace-4.4.98.ebuild 1325
 MD5 a62bbacd95ca3f5b04368c34417a64c8 strace-4.5.1.ebuild 1388
 MD5 93c55da4b484956421d06166da9a8d71 strace-4.5.ebuild 1244
+MD5 3cf7140d2a8bbf35c569f5a8984f2dbb strace-4.4.98-r1.ebuild 1465
+MD5 0b5703511e19d5e8420dfe7673e0d82c strace-4.4.98.diff 643
+MD5 bd8c6479a5dad7b349eac5bee77775f2 strace-4.4.98.ebuild.orig 1325
 MD5 1c269bae9f741bbe53fe641a0da876bc files/digest-strace-4.4.94 360
 MD5 45f2fb0d3dc9d9f796448a40d38edc0b files/digest-strace-4.4.98 66
 MD5 5c3b3bb609d3956a94ec20b4a39da546 files/digest-strace-4.5 63
 MD5 38e4a65d3a6a6e39695752ba68b2db78 files/digest-strace-4.5.1 65
 MD5 b7c93d383818fc6aa8ac330514b866e0 files/strace-4.5.1-2.6.patch 5756
+MD5 45f2fb0d3dc9d9f796448a40d38edc0b files/digest-strace-4.4.98-r1 66
+MD5 4fdbcdca139cfe298999551cd9ba97bf files/strace-get_scno.patch 515
diff --git a/dev-util/strace/files/digest-strace-4.4.98-r1 b/dev-util/strace/files/digest-strace-4.4.98-r1
new file mode 100644
index 000000000000..62df5ce787fc
--- /dev/null
+++ b/dev-util/strace/files/digest-strace-4.4.98-r1
@@ -0,0 +1 @@
+MD5 9181e3871c0bf64052bcda51da2928a5 strace-4.4.98.tar.bz2 375679
diff --git a/dev-util/strace/files/strace-get_scno.patch b/dev-util/strace/files/strace-get_scno.patch
new file mode 100644
index 000000000000..4ac29c42e798
--- /dev/null
+++ b/dev-util/strace/files/strace-get_scno.patch
@@ -0,0 +1,21 @@
+--- strace/syscall.c.orig	2003-09-10 21:02:20.000000000 +0200
++++ strace/syscall.c	2003-09-10 21:04:29.000000000 +0200
+@@ -735,6 +735,8 @@
+ 	int pid = tcp->pid;
+ #endif /* !PROCFS */
+ 
++	if (tcp->flags & TCB_INSYSCALL)
++		return 1;
+ #ifdef LINUX
+ #if defined(S390) || defined(S390X)
+ 	if (tcp->flags & TCB_WAITEXECVE) {
+@@ -1197,8 +1199,7 @@
+ #endif /* FREEBSD */
+ #endif /* !HAVE_PR_SYSCALL */
+ #endif /* USE_PROCFS */
+-	if (!(tcp->flags & TCB_INSYSCALL))
+-		tcp->scno = scno;
++	tcp->scno = scno;
+ 	return 1;
+ }
+ 
diff --git a/dev-util/strace/strace-4.4.98-r1.ebuild b/dev-util/strace/strace-4.4.98-r1.ebuild
new file mode 100644
index 000000000000..6a96aa146e73
--- /dev/null
+++ b/dev-util/strace/strace-4.4.98-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.4.98-r1.ebuild,v 1.1 2004/04/18 15:01:10 randy Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="http://www.wi.leidenuniv.nl/~wichert/strace/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 s390"
+IUSE="static"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.54"
+
+src_compile() {
+	# Compile fails with -O3 on sparc but works on x86
+	if [ "${ARCH}" == "sparc" -o "${ARCH}" == "" ]; then
+		replace-flags -O[3-9] -O2
+	fi
+	#s390 Specific fix
+	#See bug 47916
+	if [ "${ARCH}" == "s390" ]; then
+		cd ${S}
+		patch < ${FILESDIR}/strace-get_scno.patch
+	fi
+	# configure is broken by default for sparc and possibly others, regen
+	# from configure.in
+	autoconf
+	if use static; then
+		LDFLAGS="-static" ./configure --prefix=/usr || die
+	else
+		./configure --prefix=/usr || die
+	fi
+	emake || die
+}
+
+src_install() {
+	# Can't use make install because it is stupid and
+	# doesn't make leading directories before trying to
+	# install. Thus, one would have to make /usr/bin
+	# and /usr/man/man1 (at least).
+	# So, we do it by hand.
+	doman strace.1
+	dobin strace
+	dobin strace-graph
+	dodoc ChangeLog COPYRIGHT CREDITS NEWS PORTING README* TODO
+}