rpms/mono/devel mono-24-ppc-glocks.patch, NONE, 1.1 import.log, 1.45, 1.46 mono.spec, 1.122, 1.123

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7083/devel

Modified Files:
	import.log mono.spec 
Added Files:
	mono-24-ppc-glocks.patch 
Log Message:

Add ppc patch
Add ppc64 arch
Rebuild 


mono-24-ppc-glocks.patch:

--- NEW FILE mono-24-ppc-glocks.patch ---
--- 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;
         }


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- import.log	7 Apr 2009 09:41:39 -0000	1.45
+++ import.log	11 Apr 2009 13:25:46 -0000	1.46
@@ -43,3 +43,4 @@
 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


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- mono.spec	7 Apr 2009 09:41:39 -0000	1.122
+++ mono.spec	11 Apr 2009 13:25:46 -0000	1.123
@@ -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 @@
 # 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 @@
 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 @@
 %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 @@
 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 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Apr 10 2009 Paul F. Johnson <paul at 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 at all-the-johnsons.co.uk> - 2.4-13.1
 - Remove ppc support
 - moonlight parts are now in their own subpackage