From 5679b87ca8b315eaa3656a0acb2f3ff72496b1f2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 30 Sep 2007 03:43:52 +0000 Subject: Fix building on SuperH due to new ipc syscall check. (Portage version: 2.1.3.9) --- dev-util/strace/ChangeLog | 7 ++++++- .../strace/files/strace-4.5.15-sh-SYS_ipc_subcall.patch | 15 +++++++++++++++ dev-util/strace/strace-4.5.15-r1.ebuild | 3 ++- dev-util/strace/strace-4.5.15.ebuild | 3 ++- dev-util/strace/strace-4.5.16.ebuild | 3 ++- 5 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 dev-util/strace/files/strace-4.5.15-sh-SYS_ipc_subcall.patch (limited to 'dev-util/strace') diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog index 09364927d147..874b9f8e355a 100644 --- a/dev-util/strace/ChangeLog +++ b/dev-util/strace/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/strace # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.101 2007/08/04 12:39:27 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.102 2007/09/30 03:43:51 vapier Exp $ + + 30 Sep 2007; Mike Frysinger + +files/strace-4.5.15-sh-SYS_ipc_subcall.patch, strace-4.5.15.ebuild, + strace-4.5.15-r1.ebuild, strace-4.5.16.ebuild: + Fix building on SuperH due to new ipc syscall check. 04 Aug 2007; Tobias Scherbaum strace-4.5.15.ebuild: diff --git a/dev-util/strace/files/strace-4.5.15-sh-SYS_ipc_subcall.patch b/dev-util/strace/files/strace-4.5.15-sh-SYS_ipc_subcall.patch new file mode 100644 index 000000000000..f6f84178f0c2 --- /dev/null +++ b/dev-util/strace/files/strace-4.5.15-sh-SYS_ipc_subcall.patch @@ -0,0 +1,15 @@ +remove duplicated SYS_ipc_subcall check ... further in the file, there +is another #if check to make sure the value is 418 + +--- linux/sh/syscallent.h ++++ linux/sh/syscallent.h +@@ -435,9 +435,6 @@ + { 5, 0, printargs, "SYS_398" }, /* 398 */ + { 5, 0, printargs, "SYS_399" }, /* 399 */ + +-#if SYS_ipc_subcall != 400 +- #error fix me +-#endif + { 8, 0, printargs, "socket_subcall"}, /* 400 */ + { 3, TN, sys_socket, "socket" }, /* 401 */ + { 3, TN, sys_bind, "bind" }, /* 402 */ diff --git a/dev-util/strace/strace-4.5.15-r1.ebuild b/dev-util/strace/strace-4.5.15-r1.ebuild index 0735f90d9bed..16412ab0e942 100644 --- a/dev-util/strace/strace-4.5.15-r1.ebuild +++ b/dev-util/strace/strace-4.5.15-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15-r1.ebuild,v 1.1 2007/07/30 10:03:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15-r1.ebuild,v 1.2 2007/09/30 03:43:51 vapier Exp $ inherit flag-o-matic autotools @@ -24,6 +24,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-4.5.15-invalid-time.patch #186369 epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch epatch "${FILESDIR}"/${PN}-4.5.12-superh-update.patch + epatch "${FILESDIR}"/${PN}-4.5.15-sh-SYS_ipc_subcall.patch epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch epatch "${FILESDIR}"/${PN}-4.5.15-mips-sprintsigmask.patch epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch #103427 diff --git a/dev-util/strace/strace-4.5.15.ebuild b/dev-util/strace/strace-4.5.15.ebuild index 19ffa58afd8d..586407794759 100644 --- a/dev-util/strace/strace-4.5.15.ebuild +++ b/dev-util/strace/strace-4.5.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15.ebuild,v 1.8 2007/08/04 12:39:27 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15.ebuild,v 1.9 2007/09/30 03:43:51 vapier Exp $ inherit flag-o-matic autotools @@ -23,6 +23,7 @@ src_unpack() { epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch epatch "${FILESDIR}"/${PN}-4.5.12-superh-update.patch + epatch "${FILESDIR}"/${PN}-4.5.15-sh-SYS_ipc_subcall.patch epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch epatch "${FILESDIR}"/${PN}-4.5.15-mips-sprintsigmask.patch epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch #103427 diff --git a/dev-util/strace/strace-4.5.16.ebuild b/dev-util/strace/strace-4.5.16.ebuild index 2b806ac29508..e6c3fbef53ed 100644 --- a/dev-util/strace/strace-4.5.16.ebuild +++ b/dev-util/strace/strace-4.5.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.16.ebuild,v 1.1 2007/08/03 15:29:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.16.ebuild,v 1.2 2007/09/30 03:43:51 vapier Exp $ inherit flag-o-matic autotools @@ -24,6 +24,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-4.5.15-invalid-time.patch #186369 epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch epatch "${FILESDIR}"/${PN}-4.5.12-superh-update.patch + epatch "${FILESDIR}"/${PN}-4.5.15-sh-SYS_ipc_subcall.patch epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch #103427 -- cgit v1.2.3-65-gdbad