summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-05-30 00:17:44 +0000
committerMike Frysinger <vapier@gentoo.org>2009-05-30 00:17:44 +0000
commit39c141cb33221317fa792248d2716d1517e35555 (patch)
tree3750c04a58fed5f035cd4750c352e50ab2becfe5 /dev-util
parentVersion bump (bug #254438). Fix building with >=net-libs/gnutls-2.7.1 (bug #2... (diff)
downloadgentoo-2-39c141cb33221317fa792248d2716d1517e35555.tar.gz
gentoo-2-39c141cb33221317fa792248d2716d1517e35555.tar.bz2
gentoo-2-39c141cb33221317fa792248d2716d1517e35555.zip
Fix build failure on arm due to missing cachectl.h #266014 by Pinky.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/strace/ChangeLog6
-rw-r--r--dev-util/strace/files/strace-4.5.18-arm-cache.patch15
-rw-r--r--dev-util/strace/strace-4.5.18.ebuild3
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index 55865be8df30..12338d150575 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/strace
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.131 2009/02/14 17:53:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.132 2009/05/30 00:17:44 vapier Exp $
+
+ 30 May 2009; Mike Frysinger <vapier@gentoo.org> strace-4.5.18.ebuild,
+ +files/strace-4.5.18-arm-cache.patch:
+ Fix build failure on arm due to missing cachectl.h #266014 by Pinky.
14 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+files/strace-4.5.18-arm-syscalls.patch, strace-4.5.18.ebuild:
diff --git a/dev-util/strace/files/strace-4.5.18-arm-cache.patch b/dev-util/strace/files/strace-4.5.18-arm-cache.patch
new file mode 100644
index 000000000000..9aed43c554fd
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.18-arm-cache.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/266014
+
+ARM defines SYS_cacheflush but does not have asm/cachectl.h
+
+--- a/system.c
++++ b/system.c
+@@ -70,7 +70,7 @@
+ #include <linux/capability.h>
+ #endif
+
+-#ifdef SYS_cacheflush
++#if defined(SYS_cacheflush) && !defined(ARM)
+ #include <asm/cachectl.h>
+ #endif
+
diff --git a/dev-util/strace/strace-4.5.18.ebuild b/dev-util/strace/strace-4.5.18.ebuild
index 98a0175c0642..ac1183a488ff 100644
--- a/dev-util/strace/strace-4.5.18.ebuild
+++ b/dev-util/strace/strace-4.5.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.18.ebuild,v 1.13 2009/02/14 17:53:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.18.ebuild,v 1.14 2009/05/30 00:17:44 vapier Exp $
inherit flag-o-matic
@@ -23,6 +23,7 @@ src_unpack() {
epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch
epatch "${FILESDIR}"/${PN}-4.5.18-arm-syscalls.patch #241168
+ epatch "${FILESDIR}"/${PN}-4.5.18-arm-cache.patch #266014
}
src_compile() {