files/elfutils-0.89-alpha-mips-atime.diff: \ Fix 0.89 compilation on mips

4 files changed, 31 insertions, 6 deletions

diff --git a/dev-libs/elfutils/ChangeLog b/dev-libs/elfutils/ChangeLog
index 4bfa9b185ca3..31deb35fa17c 100644
--- a/dev-libs/elfutils/ChangeLog
+++ b/dev-libs/elfutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/elfutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.28 2004/02/22 19:13:21 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/ChangeLog,v 1.29 2004/02/22 22:32:05 tuxus Exp $
+
+  22 Feb 2004; <tuxus@gentoo.org> elfutils-0.89.ebuild:
+  files/elfutils-0.89-alpha-mips-atime.diff:  Fix 0.89 compilation on mips
 
   22 Feb 2004; <tuxus@gentoo.org> elfutils-0.84.ebuild:
   Fix 0.84 compilation on mips
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 921a2accddbb..668b64bad005 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,8 +1,8 @@
-MD5 8bf17402022396f6dfe3fb1132a700e9 ChangeLog 3401
+MD5 7299fc6963479de12a2e528aceea07e7 ChangeLog 3533
 MD5 d694148781b9529f1fa2f404363efa87 elfutils-0.76-r1.ebuild 1220
 MD5 e8ea583da0f09ddc20ee9c1d23cae45d elfutils-0.76-r2.ebuild 1276
 MD5 7906b4b0c80f17154cff7bc88803bd14 elfutils-0.84.ebuild 1379
-MD5 266e1ce76ff3c53d72c9a9f0f2427470 elfutils-0.89.ebuild 1331
+MD5 57aa7d0b13c94ee27283eb4e8370635c elfutils-0.89.ebuild 1340
 MD5 6cbd1797e98b78a920f6c33f1f2f3d57 files/digest-elfutils-0.76-r1 65
 MD5 6cbd1797e98b78a920f6c33f1f2f3d57 files/digest-elfutils-0.76-r2 65
 MD5 a882fca2671d8e3e7b6b7c04ca71180d files/digest-elfutils-0.84 65
@@ -10,3 +10,4 @@ MD5 cd4ce360acc3c3980ce4f4ee83f2ecc4 files/digest-elfutils-0.89 65
 MD5 6cf1b4c89c8668b6f6ac5713b8b496c7 files/elfutils-0.76-hidden.diff 789
 MD5 047333404e596c3ff55996698cf0c7ec files/elfutils-0.84-atime.diff 528
 MD5 975360e1dcd01119961071c14dda6896 files/elfutils-0.89-atime.diff 553
+MD5 e77114cc7509f5c182383d04b1715ce4 files/elfutils-0.89-alpha-mips-atime.diff 699
diff --git a/dev-libs/elfutils/elfutils-0.89.ebuild b/dev-libs/elfutils/elfutils-0.89.ebuild
index 452c4f0090b0..d5fc05896f18 100644
--- a/dev-libs/elfutils/elfutils-0.89.ebuild
+++ b/dev-libs/elfutils/elfutils-0.89.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.89.ebuild,v 1.5 2003/12/31 20:19:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.89.ebuild,v 1.6 2004/02/22 22:32:05 tuxus Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ src_unpack() {
 		${x}.orig > ${x}
 	done
 
-	use alpha && epatch ${FILESDIR}/${P}-atime.diff
+	use mips || use alpha && epatch ${FILESDIR}/${P}-atime.diff
 }
 
 src_compile() {
diff --git a/dev-libs/elfutils/files/elfutils-0.89-alpha-mips-atime.diff b/dev-libs/elfutils/files/elfutils-0.89-alpha-mips-atime.diff
new file mode 100644
index 000000000000..0fb2add1e69a
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.89-alpha-mips-atime.diff
@@ -0,0 +1,21 @@
+--- elfutils-0.89/src/strip.c.old	2003-09-26 08:01:49.000000000 +0200
++++ elfutils-0.89/src/strip.c	2004-02-22 22:20:42.000000000 +0100
+@@ -265,8 +265,16 @@
+ 
+       /* If we have to preserve the timestamp, we need it in the
+ 	 format utimes() understands.  */
+-      TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
+-      TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
++
++#if defined ( __alpha ) || defined ( __mips)
++	tv[0].tv_sec = pre_st.st_atime;
++        tv[0].tv_usec = 0;
++        tv[1].tv_sec = pre_st.st_mtime;
++        tv[1].tv_usec = 0;
++#else
++	TIMESPEC_TO_TIMEVAL (&tv[0], &pre_st.st_atim);
++    	TIMESPEC_TO_TIMEVAL (&tv[1], &pre_st.st_mtim);
++#endif
+     }
+ 
+   /* Open the file.  */