Fix build failure on arm due to missing cachectl.h #266014 by Pinky.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 29 insertions, 8 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/Manifest b/dev-util/strace/Manifest
index 13f1cee88fdb..d6e10f1d4ff0 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -15,6 +15,7 @@ AUX strace-4.5.16-sparc-fix.patch 7060 RMD160 25b696d52cda491616e89319b767f0445c
 AUX strace-4.5.16-sparc-socketipc.patch 7361 RMD160 dc4e777eb0f8587fe92aaa1437f99ad38dee30f6 SHA1 83dd4967b28707500c4ac7f13f522aa453af6d4f SHA256 06cddf176f7688c969bff7d93a167f2d2ff3dd6dfa02ae694d50f01a99be6ea3
 AUX strace-4.5.16-sparc-times.patch 1479 RMD160 0c860369811d7edaad43dab266048d93f678c6f2 SHA1 6ebef31b30059c72686875b18bc95f21a75fccd3 SHA256 d61a7bef36b1be338cc53012856c934014ed6d9fa0f1fce1c4dc94b8fad5be0a
 AUX strace-4.5.16-sparc-updates.patch 1598 RMD160 1995fc8709bef1e957565f109dd5d04eb0d1e7d6 SHA1 48e837785a9c7a90f89603335a93ceb8b0f5f8ad SHA256 3f5dc7985b2f16988d4251421404abc7acb0ecb3d5741a39670a5964468bc2e0
+AUX strace-4.5.18-arm-cache.patch 287 RMD160 fa40d4b52b1e7a78bee7ca89e5a20f986cceb9b7 SHA1 5d00a896da38ae7104e817e87f30a0992cca3754 SHA256 15bbc28919097594c12316a4802123d2456aec29f0372c236820c2309046eaa7
 AUX strace-4.5.18-arm-syscalls.patch 6881 RMD160 e6476e2a98578b78c07ec999f71cf8de63370484 SHA1 8adec60ac5ef57387908d0f8255f97d7143b3f13 SHA256 94986f0ca348e71fc067b2ff71114a1fb70606e22b10427c048ffc04209ef149
 AUX strace-4.5.8-ia64.patch 2271 RMD160 8a26565e9286deb508a2b1626b41e9856d81c385 SHA1 848a4f32b9b6f75fdebfae4de0e907221022354b SHA256 7882ae9504c1ff1446d7b0df3a27642a8703b3065adf2df1e66b83dd9a13b0f3
 AUX strace-dont-use-REG_SYSCALL-for-sh.patch 630 RMD160 77a2ba5b252632970baafdb11ba7841a28b1fbec SHA1 d3cd6b7f22174a25a386deedd1441517106c528e SHA256 5a3f73e6671753d990b0782aa91b8f3204cc2857b9e45e20a2b87471207c17a3
@@ -29,13 +30,13 @@ EBUILD strace-4.5.12.ebuild 2129 RMD160 ce141933138f18d0f56ad8ea657a5f0786179cb9
 EBUILD strace-4.5.16-r1.ebuild 1416 RMD160 897d78201345027203190162318e811cd762d319 SHA1 262338c838ce1c60314f5d29b2f80fac786090ac SHA256 bb6c980485f9bd5187eea2c371e33191fc77f5dcb361d6f1fd1e78f8b134aaf8
 EBUILD strace-4.5.16.ebuild 1263 RMD160 ffb7f2b864b1378ab7f9d85531c883a7ea443c47 SHA1 3ec3bcebc982e1879ee700ed72fb617f15b48d40 SHA256 8c0982b23d8d5f484f64c705a0f0e74a14d8730da7d03fc09ad425c2ebbc4216
 EBUILD strace-4.5.17.ebuild 963 RMD160 4c37228752c19ee8f3af33fc368e38c9acc1376b SHA1 fcbba2672d7c39f2196069b4e97590add6ba6968 SHA256 66c920bbd7a78e4a61679c00af96a2538aa479a29386dca86c692b3f5724bb8c
-EBUILD strace-4.5.18.ebuild 1016 RMD160 f9f067e7cc0c0ff177085bdff4bfc10ffa9e86a2 SHA1 4e457184b7b671090606f273c44b32c8cef5d883 SHA256 5113ea79e1628e426245d395fbea085ef80b8a22aa0ec922bf42e4623885208f
-MISC ChangeLog 15883 RMD160 78bb7d2de3c9c5df6e9dc06fd53794a7c85b68be SHA1 385a13ddb22d5c3916450aff2ccd220a3d4ba4d4 SHA256 14d8a261e866ccfe68cac8a982498f70c33228066ce9d424b25be97fecf86a50
+EBUILD strace-4.5.18.ebuild 1075 RMD160 72fc37f7c32a5357919cbe4df7f7fd587d74bcf7 SHA1 b389df9d3351c593b4bbd06585cc4cb1d4c87570 SHA256 f7cf4b6669bb35b52ba5a746c165d2ca96b330dc2baaf2d9c06470e49c183f84
+MISC ChangeLog 16067 RMD160 875e0cf904acf395ccec052232c83287f4f4a680 SHA1 a2b9a5d29f2074621adfa9a176164dfde4324c20 SHA256 bd96400b1c116da346e0bf11ddca470ae5bea1c90dabfcd44b6614d5eb04d638
 MISC metadata.xml 233 RMD160 a47b790cac786bc2f0113e285624754d993ff24a SHA1 a469acfc84253e985986c68afdc4f041506b8f80 SHA256 19ca9ce37dba257ea5593fe398ccf0c7dfdad973abd549dde5cd2d2d4dff9423
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmXBTAACgkQn/5bYzqsSmGvSwCdHUw9YAs9sF7mVr/rcfan73V3
-N2sAoL68KpOLjwDahqDfIswnVMtTl51j
-=dN2I
+iEYEARECAAYFAkogey0ACgkQn/5bYzqsSmF97wCguilORzfg5SjQq9GwqmH3aQHZ
+wOYAoMAGqGIgb3MWAEkTNlnlh/5yYhXO
+=ShNL
 -----END PGP SIGNATURE-----
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() {