From e9de6c86d54bb4ee13b5728a3ec6a070b9ded40e Mon Sep 17 00:00:00 2001
From: Paul F. Johnson <pfj@fedoraproject.org>
Date: Apr 11 2009 13:25:46 +0000
Subject: Add ppc patch Add ppc64 arch Rebuild


---

diff --git a/import.log b/import.log
index aaf98aa..ebee66c 100644
--- a/import.log
+++ b/import.log
@@ -43,3 +43,4 @@ mono-2_4-11_RC3_fc11:HEAD:mono-2.4-11.RC3.fc11.src.rpm:1237420759
 mono-2_4-12_fc11:HEAD:mono-2.4-12.fc11.src.rpm:1238109092
 mono-2_4-12_1_fc11:HEAD:mono-2.4-12.1.fc11.src.rpm:1239049596
 mono-2_4-13_1_fc11:HEAD:mono-2.4-13.1.fc11.src.rpm:1239097233
+mono-2_4-13_2_fc11:HEAD:mono-2.4-13.2.fc11.src.rpm:1239456192
diff --git a/mono-24-ppc-glocks.patch b/mono-24-ppc-glocks.patch
new file mode 100644
index 0000000..47b5175
--- /dev/null
+++ b/mono-24-ppc-glocks.patch
@@ -0,0 +1,21 @@
+--- mono-131222-orig/libgc/include/private/gc_locks.h	2009-02-03 19:00:12.000000000 -0500
++++ mono-131222-patched/libgc/include/private/gc_locks.h	2009-04-09 15:20:11.000000000 -0400
+@@ -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/mono.spec b/mono.spec
index be2099c..45342d2 100644
--- a/mono.spec
+++ b/mono.spec
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.4
-Release:        13.1%{?dist}
+Release:        13.2%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -29,10 +29,10 @@ Obsoletes:     monodoc, monodoc-devel
 # need to bootstrap mono, comment out this BuildRequires
 # and don't delete the binaries in %%prep.
 
-BuildRequires: mono-core
+#BuildRequires: mono-core
 
 # JIT only availible on these:
-ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x
+ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha s390 s390x ppc ppc64
 
 Patch0: mono-2.2-ppc-threading.patch
 Patch1: mono-libdir-126.patch
@@ -42,6 +42,7 @@ Patch4: mono-2.0-monoservice.patch
 Patch5: mono-2.0-metadata-makefile.patch
 Patch6: mono-22-libgdiwinform.patch
 Patch7: mono-22-libdir.patch
+Patch8: mono-24-ppc-glocks.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -287,6 +288,7 @@ mono-moonlight are all the parts required for moonlight compilation
 %patch4 -p1 -b .monoservice
 %patch5 -p1 -b .metadata-makefile
 %patch6 -p1 -b .libgdiplus
+%patch8 -p1 -b .glocks-ppc
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7}
 %patch7 -p1 -b .libdir-22
 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7}
@@ -301,7 +303,7 @@ autoreconf -f -i -s
 sed -i "61a #define ARG_MAX	_POSIX_ARG_MAX" mono/io-layer/wapi_glob.h
 
 # Remove prebuilt binaries
-rm -rf mcs/class/lib/monolite/*
+#rm -rf mcs/class/lib/monolite/*
 
 %build
 %ifarch ia64 s390 s390x
@@ -707,6 +709,10 @@ install monodir %{buildroot}%{_bindir}
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Apr 10 2009 Paul F. Johnson <paul@all-the-johnsons.co.uk> - 2.4-13.2
+- Re-enable PPC and PPC64
+- sub point build for scratch build and bootstrap
+
 * Mon Apr 06 2009 Paul F. Johnson <paul@all-the-johnsons.co.uk> - 2.4-13.1
 - Remove ppc support
 - moonlight parts are now in their own subpackage