From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 19 Feb 2007 04:12:57 +0000 (+0000)
Subject: Fix building on mips due to updated sprintsigmask().
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75a2df7f55a4fae991a4973a219d577630ab1610;p=gentoo.git

Fix building on mips due to updated sprintsigmask().
Package-Manager: portage-2.1.2-r9
---

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index 9269b41f824b..b9e7b7f7cca8 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/strace
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.93 2007/01/17 06:45:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.94 2007/02/19 04:12:57 vapier Exp $
+
+  19 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/strace-4.5.15-mips-sprintsigmask.patch, strace-4.5.15.ebuild:
+  Fix building on mips due to updated sprintsigmask().
 
 *strace-4.5.15 (17 Jan 2007)
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index de73b6fba51f..63206d2c3297 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -29,6 +29,10 @@ AUX strace-4.5.14-PT_GETSIGINFO.patch 766 RMD160 c44f89db60f0eaf8c9f37f2579dfc82
 MD5 f3397466058b002f3641219f3fad9b60 files/strace-4.5.14-PT_GETSIGINFO.patch 766
 RMD160 c44f89db60f0eaf8c9f37f2579dfc82cc0aff1ff files/strace-4.5.14-PT_GETSIGINFO.patch 766
 SHA256 8b58a9ba6e917e4f6bf3f3821271364511d3dfaa2e6cdd96d461da9c63af2b8a files/strace-4.5.14-PT_GETSIGINFO.patch 766
+AUX strace-4.5.15-mips-sprintsigmask.patch 375 RMD160 574513146fc496056bfab38b885c2e03bc6f0f66 SHA1 1ad6d61c6655a92e8e19d83b56f1cf01cfcc4b69 SHA256 a91ded61685b74b05fbd1716ead449810552508d7c7377e14929c362fa2f6e21
+MD5 2601f6f425544219ea603773650272cb files/strace-4.5.15-mips-sprintsigmask.patch 375
+RMD160 574513146fc496056bfab38b885c2e03bc6f0f66 files/strace-4.5.15-mips-sprintsigmask.patch 375
+SHA256 a91ded61685b74b05fbd1716ead449810552508d7c7377e14929c362fa2f6e21 files/strace-4.5.15-mips-sprintsigmask.patch 375
 AUX strace-4.5.8-ia64.patch 2271 RMD160 8a26565e9286deb508a2b1626b41e9856d81c385 SHA1 848a4f32b9b6f75fdebfae4de0e907221022354b SHA256 7882ae9504c1ff1446d7b0df3a27642a8703b3065adf2df1e66b83dd9a13b0f3
 MD5 335622a1648a690be4e5eddba97f3034 files/strace-4.5.8-ia64.patch 2271
 RMD160 8a26565e9286deb508a2b1626b41e9856d81c385 files/strace-4.5.8-ia64.patch 2271
@@ -60,14 +64,14 @@ EBUILD strace-4.5.14.ebuild 1912 RMD160 8eee62624924512046dc0b8c75736575a763b628
 MD5 966f06f52d7137aee79a68f4834ff2fc strace-4.5.14.ebuild 1912
 RMD160 8eee62624924512046dc0b8c75736575a763b628 strace-4.5.14.ebuild 1912
 SHA256 534e6831b0267660165143e07e2b8213289da3102fd8cabc8811e7c96a2834c2 strace-4.5.14.ebuild 1912
-EBUILD strace-4.5.15.ebuild 1237 RMD160 f486e54aec25c4d6da1aec6ffc823e3ab303761c SHA1 2ec1f26425db89edc97afd5e5d5c1c8050ccc4d3 SHA256 1628f5bdbd52b84ac4667f07a008f1ff3aee656d114ba64e6dcb7ad46fccdae8
-MD5 3bb38ce1b29503b82d17a39565901433 strace-4.5.15.ebuild 1237
-RMD160 f486e54aec25c4d6da1aec6ffc823e3ab303761c strace-4.5.15.ebuild 1237
-SHA256 1628f5bdbd52b84ac4667f07a008f1ff3aee656d114ba64e6dcb7ad46fccdae8 strace-4.5.15.ebuild 1237
-MISC ChangeLog 11105 RMD160 e87a5155dfd5c622f913c834145b09d5eb49ff05 SHA1 e725c29a68a3c47644fad2055478ea6725673545 SHA256 c479296be681bfc7db67f9d8785a3b692865e8113a1b3a82cd073674461b087c
-MD5 5d2f5ae3c51ffaa2565339e38882c4f7 ChangeLog 11105
-RMD160 e87a5155dfd5c622f913c834145b09d5eb49ff05 ChangeLog 11105
-SHA256 c479296be681bfc7db67f9d8785a3b692865e8113a1b3a82cd073674461b087c ChangeLog 11105
+EBUILD strace-4.5.15.ebuild 1213 RMD160 105053902847a7da12b8a18530d0b09d642c608c SHA1 2a60e428ccf32eef7214ee61f7f909c6acbaa3a3 SHA256 5490eb19f2dc1dce91af26c8874bc8498a0269bb039b155d46d7b81ae2434601
+MD5 48c46fe235edf8ec4a2005b812e95a4b strace-4.5.15.ebuild 1213
+RMD160 105053902847a7da12b8a18530d0b09d642c608c strace-4.5.15.ebuild 1213
+SHA256 5490eb19f2dc1dce91af26c8874bc8498a0269bb039b155d46d7b81ae2434601 strace-4.5.15.ebuild 1213
+MISC ChangeLog 11282 RMD160 61b83885451b36ae94b1f4a8473c7ad2bf42f57a SHA1 855ecac1a86c30b10b6419653ab9b0488390ef2a SHA256 7cab6fd2d6e8da4cf986ecc76119fc6e521f806a61e506ac89ffd0d866d3fa71
+MD5 cd71078d6bfa3011829c4c8d1daeb86f ChangeLog 11282
+RMD160 61b83885451b36ae94b1f4a8473c7ad2bf42f57a ChangeLog 11282
+SHA256 7cab6fd2d6e8da4cf986ecc76119fc6e521f806a61e506ac89ffd0d866d3fa71 ChangeLog 11282
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -82,9 +86,9 @@ MD5 80c9289783c55e39c2f2468c04315689 files/digest-strace-4.5.15 244
 RMD160 806438be0f55997ed17003e1d55b4c53a83b9ea9 files/digest-strace-4.5.15 244
 SHA256 a03c34145a567f175deabdc589913d8b7ca08e40639dc704071b969ef999f5b4 files/digest-strace-4.5.15 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFrcYt8bi6rjpTunYRAi/pAJ9Ad5nlM1aTpM8/VzlWCz733m0edACg0IiX
-XK0dmzji95Y6HmwhUIkOyfY=
-=phEE
+iD8DBQFF2SP+8bi6rjpTunYRAisGAJ9TIO2Rnnmu+xL98VAJmvzLJuYpIACeJHY0
+yfkTsu6nuHgXZDsqp9ZKU/w=
+=4pRZ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/strace/files/strace-4.5.15-mips-sprintsigmask.patch b/dev-util/strace/files/strace-4.5.15-mips-sprintsigmask.patch
new file mode 100644
index 000000000000..2f7c2ac39bf1
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.15-mips-sprintsigmask.patch
@@ -0,0 +1,13 @@
+local sprintsigmask() now takes three args rather than two
+
+--- signal.c
++++ signal.c
+@@ -1440,7 +1440,7 @@ struct tcb *tcp;
+ 	  	tcp->u_rval = tcp->u_error = 0;
+ 		if(tcp->u_arg[0] == 0)
+ 		  	return 0;
+-		tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1]);
++		tcp->auxstr = sprintsigmask("mask now ", tcp->u_arg[1], 0);
+ 		return RVAL_NONE | RVAL_STR;
+ 	}
+ 	return 0;
diff --git a/dev-util/strace/strace-4.5.15.ebuild b/dev-util/strace/strace-4.5.15.ebuild
index 0f59d2d9f7fa..7cfedf17c418 100644
--- a/dev-util/strace/strace-4.5.15.ebuild
+++ b/dev-util/strace/strace-4.5.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15.ebuild,v 1.1 2007/01/17 06:45:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.15.ebuild,v 1.2 2007/02/19 04:12:57 vapier Exp $
 
 inherit flag-o-matic autotools
 
@@ -21,15 +21,11 @@ src_unpack() {
 
 	#epatch "${FILESDIR}"/${PN}-4.5.11-fbsd.patch
 
-	# Fix SuperH support
 	epatch "${FILESDIR}"/strace-dont-use-REG_SYSCALL-for-sh.patch
 	epatch "${FILESDIR}"/${PN}-4.5.12-superh-update.patch
-
-	# Fix building on older ARM machines
 	epatch "${FILESDIR}"/strace-fix-arm-bad-syscall.patch
-
-	# Fix libaio support #103427
-	epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch
+	epatch "${FILESDIR}"/${PN}-4.5.15-mips-sprintsigmask.patch
+	epatch "${FILESDIR}"/${PN}-4.5.12-libaio.patch #103427
 
 	eautoreconf
 }