Fix building on sparc with -O3 #204457.

Package-Manager: portage-2.2_pre2

4 files changed, 55 insertions, 4 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index 4f8972bc57c4..5706749f4783 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/strace
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.116 2008/02/05 10:39:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.117 2008/02/22 03:44:11 vapier Exp $
+
+  22 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/strace-4.5.16-sparc-times.patch, strace-4.5.16-r1.ebuild:
+  Fix building on sparc with -O3 #204457.
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> strace-4.5.16-r1.ebuild:
   Stable on ppc64
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 00abf74c2b2c..7eb1c84d4bb8 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX strace-4.5.11-alpha-stat64.patch 1418 RMD160 a136a80eac15bca87fe6b2d39d65949fc2249d0a SHA1 09bfdf92442b9ac694b98c3c8710af9947f49521 SHA256 33ce8bf0b266c2741607907460686a82e23df0ac79fdb7fe5b4436d119b101de
 AUX strace-4.5.11-fbsd.patch 4767 RMD160 aa04c24f5dc8dd6baee0286e1901f31aee54f10a SHA1 9f97462ca68cf73cbf21c78a702c1d47525d73b5 SHA256 15e78c360ab72210b2e168d50e80b88e0188c149364545c9ff3f06d6b3b6f1fb
 AUX strace-4.5.12-libaio.patch 1552 RMD160 d4084416ed298ae07ea672569d04a22feb2f9188 SHA1 eec055eacba686d98bd36556be28eca96596b995 SHA256 6ea8fe265b9161ca708aa3b5fd31eee4584b9c7fcf829dcd8624a965fb048a78
@@ -11,6 +14,7 @@ AUX strace-4.5.15-sh-SYS_ipc_subcall.patch 479 RMD160 ffc4c527752a39bdbdbbcf6cc6
 AUX strace-4.5.16-getdents-infinite-loop.patch 532 RMD160 c11ee44dfe3ffec644a274d9a6987edee5f68307 SHA1 cd7b9ed62c45a9fd10681daec1b2ad5467d28ea6 SHA256 de23eaf0b19f84187576135066365abee2fda81eb78d94ca49afd4a5fb0f8e93
 AUX strace-4.5.16-mips-syscallent.patch 1228 RMD160 5c394a686b7056c73a067f7bad5a3b364d46eb00 SHA1 3b7966c47c07670d675a9f7dd6021d300cd5e50a SHA256 759ab03adf5ff56260255733e863a9211634d8476f68ce679f70928215258c3f
 AUX strace-4.5.16-sh-updates.patch 12817 RMD160 e017dac383315c3d7d86f7644900d9598388bd9e SHA1 366669000fe348c77154bf609dc31b22718b056c SHA256 e9af8c2432472d90a4773cf021e13bdfc35cdc73d524dbb32fec967c55cc82bc
+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.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
@@ -25,7 +29,14 @@ EBUILD strace-4.5.12.ebuild 2129 RMD160 ce141933138f18d0f56ad8ea657a5f0786179cb9
 EBUILD strace-4.5.14.ebuild 1910 RMD160 8cec166a25f56914f84bbe180dd195c3ba0fef0c SHA1 e7ca46a4b293dee555d71bec7acaa718df8508df SHA256 da5f32472343bc93c1c5c24e817b2cf72aff24529d7b81acd67d7a09de0ff07c
 EBUILD strace-4.5.15-r1.ebuild 1336 RMD160 cdb0df3e5695dfb7532a81c77d332166c88146dd SHA1 40e9981025ac9964f033376629474246e3e38d74 SHA256 b4d93851e6fdaa864431908907fbebe58f0cfbd21a2949fb4bcbeab837ed04db
 EBUILD strace-4.5.15.ebuild 1262 RMD160 f28806295cb2dff5d04b1ba9f42b50d416910249 SHA1 c23a18b1dbfe626df941dc551db3e3c5a58065bd SHA256 62fbd7ed76ed62cddaddeb861994097efb59ffea981cb25fdc6677e57b60c19d
-EBUILD strace-4.5.16-r1.ebuild 1298 RMD160 e4d5c0b8783df3a605269163448f804aadaaeee2 SHA1 c0a7aedaf491f552cc33529f0a96c6167edfabca SHA256 d9c0f6a3d3f24774340b3f6ed784385860e4f4762d38a725be99bce20eb1d803
+EBUILD strace-4.5.16-r1.ebuild 1351 RMD160 7e96503a00636c1605f670e034bdf97f60979b9e SHA1 e4b6c484c0205ad1d1da55deb16b7b7aa978646a SHA256 963aa897cc5a739ea0cc3126ba2eefc51fb0a4b44d4f0020e71492bf9fff2891
 EBUILD strace-4.5.16.ebuild 1264 RMD160 e64f0710996197ffd03d4c72f65626c3e4c4e458 SHA1 46597baa608d477db0b6cdc687bd1f380b6af0e5 SHA256 3af3b03cead17f854e7a6f41867e18c897ba498ac6e5a94e86a253b475851533
-MISC ChangeLog 14065 RMD160 fe076468a42cac742b62c2705bc2f66204d55eed SHA1 1a0c4874a5532d9ada0f9aba0e6a2192f0653740 SHA256 6cc7c76ed7a7c0ff2fcd050a2158cf90a2ee275fa43e98ac9b2d1e1a328b10c1
+MISC ChangeLog 14224 RMD160 a4c6b6967ad9f6dc2aeb356b8256261b24bf28e6 SHA1 ff1343faabebcc2006010e15ee1ca23c8c5b1c31 SHA256 f1de66dc9ca4404f37d51798753399abedfb247b0a91b98b9d0563d5c03c3b20
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHvkURj9hvisErhMIRAglVAKDGSMB3h+ML1jYx4R9TyOvDm3BNpQCeIMd8
+589K70iWpyTqb8PXAdmDhcA=
+=HJYk
+-----END PGP SIGNATURE-----
diff --git a/dev-util/strace/files/strace-4.5.16-sparc-times.patch b/dev-util/strace/files/strace-4.5.16-sparc-times.patch
new file mode 100644
index 000000000000..9d1ee76ee9cb
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.16-sparc-times.patch
@@ -0,0 +1,35 @@
+http://bugs.gentoo.org/204457
+
+------- Comment  #5 From SpanKY  2008-01-06 18:08:07 0000  [reply] -------
+
+i dont have any way of actually run time testing this, but the fix is probably:
+-        tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
+-        tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
+-        tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
++        tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
++        tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
++        tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
+
+sprinttime() takes a time_t which represents the time (in seconds).  the time
+members of the solstatbuf are the time (in seconds) as well as nanosecond
+granularity.  since sprinttime() doesnt include nanosecond granularity, we dont
+care about that part of the time.
+
+someone needs to find a sparc system running with the personality required and
+exercise this difference
+
+--- strace-4.5.16/file.c
++++ strace-4.5.16/file.c
+@@ -766,9 +766,9 @@
+ 		break;
+ 	}
+ 	if (!abbrev(tcp)) {
+-		tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime));
+-		tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime));
+-		tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime));
++		tprintf("st_atime=%s, ", sprinttime(statbuf.st_atime.tv_sec));
++		tprintf("st_mtime=%s, ", sprinttime(statbuf.st_mtime.tv_sec));
++		tprintf("st_ctime=%s}", sprinttime(statbuf.st_ctime.tv_sec));
+ 	}
+ 	else
+ 		tprintf("...}");
diff --git a/dev-util/strace/strace-4.5.16-r1.ebuild b/dev-util/strace/strace-4.5.16-r1.ebuild
index 66a6fa7f1bcf..f6e7b5d48240 100644
--- a/dev-util/strace/strace-4.5.16-r1.ebuild
+++ b/dev-util/strace/strace-4.5.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.9 2008/02/05 10:39:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.16-r1.ebuild,v 1.10 2008/02/22 03:44:11 vapier Exp $
 
 inherit flag-o-matic autotools
 
@@ -27,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-mips-syscallent.patch
 	epatch "${FILESDIR}"/${P}-sh-updates.patch
 	epatch "${FILESDIR}"/${P}-sparc-updates.patch #162789
+	epatch "${FILESDIR}"/${P}-sparc-times.patch #204457
 	epatch "${FILESDIR}"/${P}-getdents-infinite-loop.patch
 
 	eautoreconf