From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 2 Dec 2006 20:35:58 +0000 (+0000)
Subject: Fix building with 2.6.18+ headers #150907 by Mario Fetka.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e2af92734641bb4c510cbdddd05da38171e60cf;p=gentoo.git

Fix building with 2.6.18+ headers #150907 by Mario Fetka.
Package-Manager: portage-2.1.2_rc2-r3
---

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index cf970e388906..13f09f829cd8 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.91 2006/10/05 02:05:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.92 2006/12/02 20:35:58 vapier Exp $
+
+  02 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/strace-4.5.14-CTL_PROC.patch, strace-4.5.14.ebuild:
+  Fix building with 2.6.18+ headers #150907 by Mario Fetka.
 
   05 Oct 2006; Mike Frysinger <vapier@gentoo.org>
   +files/strace-4.5.14-PT_GETSIGINFO.patch, strace-4.5.14.ebuild:
diff --git a/dev-util/strace/files/strace-4.5.14-CTL_PROC.patch b/dev-util/strace/files/strace-4.5.14-CTL_PROC.patch
new file mode 100644
index 000000000000..f172917d5ac0
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.14-CTL_PROC.patch
@@ -0,0 +1,17 @@
+fix building with 2.6.18+ headers
+
+http://bugs.gentoo.org/150907
+
+--- strace-4.5.14/system.c
++++ strace-4.5.14/system.c
+@@ -1591,6 +1591,10 @@
+ #endif
+ 
+ #ifdef LINUX
++/* linux-2.6.18+ has dropped this enum */
++#ifndef CTL_PROC
++# define CTL_PROC 4
++#endif
+ static const struct xlat sysctl_root[] = {
+ 	{ CTL_KERN, "CTL_KERN" },
+ 	{ CTL_VM, "CTL_VM" },
diff --git a/dev-util/strace/strace-4.5.14.ebuild b/dev-util/strace/strace-4.5.14.ebuild
index 81e51cbbd73c..855b1848412d 100644
--- a/dev-util/strace/strace-4.5.14.ebuild
+++ b/dev-util/strace/strace-4.5.14.ebuild
@@ -1,6 +1,6 @@
 # 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.12 2006/10/05 02:05:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.14.ebuild,v 1.13 2006/12/02 20:35:58 vapier Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -40,6 +40,8 @@ src_unpack() {
 	# (08 Feb 2005 agriffis)
 	epatch "${FILESDIR}"/strace-4.5.8-ia64.patch
 
+	epatch "${FILESDIR}"/${P}-CTL_PROC.patch #150907
+
 	eautoreconf
 }