Add fix for build on ppc/ppc64 from upstream CVS

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

4 files changed, 33 insertions, 4 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 69fefd22668d..505c413e80f3 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.161 2009/04/06 15:12:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.162 2009/04/10 23:11:08 loki_val Exp $
+
+  10 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/mono-2.4-ppcbuild-fix.patch, mono-2.4.ebuild:
+  Add fix for build on ppc/ppc64 from upstream CVS
 
   06 Apr 2009; Brent Baude <ranger@gentoo.org> mono-2.2-r5.ebuild:
   Marking mono-2.2-r5 ~ppc for bug 255410
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 6b13ddf6040b..3aded774010f 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -13,6 +13,7 @@ AUX mono-2.2-ppc-threading.patch 563 RMD160 2ed9822034a966e31cc90312c09e4fec7095
 AUX mono-2.2-r121596-work-around-runtime-crash.patch 767 RMD160 a1b7ef12e28a3c14f1beff5f490523efbc474d26 SHA1 be9eb136478b61ff0f365fc9c6f51f082df50c61 SHA256 302df7e285fdc6dc44729d85b6784c3a2abd365b6915f8e00323b611fd12c5b1
 AUX mono-2.2-r123987-bless-crash.patch 1543 RMD160 5c56cc0b69e09c2dee150bd6c34d0e1abbe3c82c SHA1 81709d2196530b7e15f96aa6ec325510bff7cda2 SHA256 3125ecbe26798ad4e009b04845e3eb8895d537bd8e1a7fd67267491403c8010e
 AUX mono-2.2-uselibdir.patch 714 RMD160 fb0478a9923c5de30b6f71fa1c1cad9703e3dc8c SHA1 790e357aaccb87cb76f08a1c12e16a8804e23b58 SHA256 0d97639d48e9a40847f1053799d00827323df0af615fdf26254a03f069123b03
+AUX mono-2.4-ppcbuild-fix.patch 1141 RMD160 3519c930ac57317aa473593ed0962c90c7dea900 SHA1 d86b76af7b246ebefd209e26368a89460d31be67 SHA256 d6ddde4185f8c459a8953cc8a7bd5a1ea5d1eecb7ea4c5cb0c404462ab1ba3ee
 AUX mono-biginteger_overflow.diff 848 RMD160 1f2cb38e577102943399459e2ef0f511dcad5209 SHA1 15203be56015aed4a9b63ca3ade01d3a22f4bae3 SHA256 adc10b8a97cbcb6b4758f7de041eee757259d55e1e2cbaf84a89e5ef83e46806
 DIST mono-1.2.5.1.tar.bz2 17492757 RMD160 8000374d9aaa3149599ba83079959303a6bae014 SHA1 c5f843cfdbb1d0114059c7d2d9ba2477529d22a8 SHA256 434f91032e48c03e1202ba3cef1648e2708eeefcf51143d3547e34acc9c68a96
 DIST mono-1.2.6.tar.bz2 18163130 RMD160 c6536b008cb73845943956c9ab365589a28c013c SHA1 f51f2e14d05313dba4b2d3fd5a47a9a3361ebeae SHA256 24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f
@@ -23,6 +24,6 @@ EBUILD mono-1.2.5.1-r1.ebuild 3683 RMD160 401b51ae78003a32d05e9ff1a80d13c798e07f
 EBUILD mono-1.2.6-r3.ebuild 3917 RMD160 6c680c414a4741fbfe2e20dd5b6120561de8c46d SHA1 8b32f6ca403becc675713fe84fad202255988e24 SHA256 915c05b51344c249c821191adb48568d4516689eff4937e4b4992088f8dfc0eb
 EBUILD mono-2.0.1-r1.ebuild 2670 RMD160 b34cdb5ab08d5e8d405206662fb2b129f912ff4c SHA1 70366acbd64ed07ccc946fe0a564041b9ef05135 SHA256 bd4bb3c7c0282b90ca42a6f105eafae8db1298f241e2383fcbd2b40397313f5f
 EBUILD mono-2.2-r5.ebuild 6474 RMD160 265df3709a856cbebe1ae74db7d914b913cf24a4 SHA1 e921763ced40afb4d56b56e61dbb56483c2552dc SHA256 314e92052224846a7e5ad4ac22d4856ab927e2910229fa47e9cd632a80029ecc
-EBUILD mono-2.4.ebuild 6305 RMD160 84e931f3a27b48ffd7dbe060a1c8b608869f9195 SHA1 a57613faa86cabccbdc2710a80dbecdf8e7c518b SHA256 dcddc465cb528bf07fe5a603cd7633a5bc0e36dd704c9b3ef9c0b38d320729c8
-MISC ChangeLog 35784 RMD160 5bc0fd5b91e118ce35351a6675c337dd74b3e9aa SHA1 0925baeeae01eb7f6d7b1c4a1f92fa86f015b58a SHA256 c66570bb90231a420824021fbaea552839f4f61452d3efcfb37626a09f7bbdce
+EBUILD mono-2.4.ebuild 6348 RMD160 762e5069b1c2d0e91137f6f08ec14ed16471d4cc SHA1 2a1fb67068ff449f7f0143e2ceed89f2f4b0332c SHA256 38eaf152f3e82642f537d767a5ade38d4ce9d06687e08865aa292b6a4c2ac1d0
+MISC ChangeLog 35946 RMD160 e8e99a324e4670f8c02f95b01f44874bc89bf023 SHA1 8bf23fe9bd13b352aea2d9fb2eb01f7840ea53b1 SHA256 cf8f95ec396a5889877a4aae3bc22c86df5b0f9d0a151e2dbc02a09d6a58e0c1
 MISC metadata.xml 372 RMD160 163faef818f92e85913da4add580c9b534fcc1f4 SHA1 af2ccd5f8de56a233139452e6c7ec9cf3c4a749e SHA256 05441e51cf289ea8e4039500f8b4cece85ead51bb46f8ea9588bd6d831239315
diff --git a/dev-lang/mono/files/mono-2.4-ppcbuild-fix.patch b/dev-lang/mono/files/mono-2.4-ppcbuild-fix.patch
new file mode 100644
index 000000000000..0668d55d4032
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.4-ppcbuild-fix.patch
@@ -0,0 +1,23 @@
+# From upstream CVS, fixes build on PPC/PPC64
+
+--- mono-2-4/mono/libgc/include/private/gc_locks.h	2009/04/10 14:32:31	131471
++++ mono-2-4/mono/libgc/include/private/gc_locks.h	2009/04/10 14:34:27	131472
+@@ -160,15 +160,15 @@
+           int temp = 1; /* locked value */
+ 
+           __asm__ __volatile__(
+-               "1:\tlwarx %0,0,%3\n"   /* load and reserve               */
++               "1:\tlwarx %0,0,%1\n"   /* load and reserve               */
+                "\tcmpwi %0, 0\n"       /* if load is                     */
+                "\tbne 2f\n"            /*   non-zero, return already set */
+                "\tstwcx. %2,0,%1\n"    /* else store conditional         */
+                "\tbne- 1b\n"           /* retry if lost reservation      */
+                "\tsync\n"              /* import barrier                 */
+                "2:\t\n"                /* oldval is zero if we set       */
+-              : "=&r"(oldval), "=p"(addr)
+-              : "r"(temp), "1"(addr)
++              : "=&r"(oldval)
++              : "r"(addr), "r"(temp)
+               : "cr0","memory");
+           return oldval;
+         }
diff --git a/dev-lang/mono/mono-2.4.ebuild b/dev-lang/mono/mono-2.4.ebuild
index 6f68ee40fd8b..c0ca10ab1f1d 100644
--- a/dev-lang/mono/mono-2.4.ebuild
+++ b/dev-lang/mono/mono-2.4.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-lang/mono/mono-2.4.ebuild,v 1.2 2009/04/04 23:26:03 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.4.ebuild,v 1.3 2009/04/10 23:11:08 loki_val Exp $
 
 EAPI=2
 
@@ -38,6 +38,7 @@ PATCHES=(
 	"${WORKDIR}/mono-2.2-libdir126.patch"
 	"${FILESDIR}/mono-2.2-ppc-threading.patch"
 	"${FILESDIR}/mono-2.2-uselibdir.patch"
+	"${FILESDIR}/mono-2.4-ppcbuild-fix.patch"
 )
 
 src_prepare() {