From a3599db79295e9294720ec19d7d8f762978acb6f Mon Sep 17 00:00:00 2001 From: Paul F. Johnson Date: Dec 19 2008 10:55:23 +0000 Subject: Pile more fixes from the goodness that is svn Re-enable PPC build --- diff --git a/.cvsignore b/.cvsignore index ecb4b04..f91078f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mono-121664.tar.bz2 +mono-121833.tar.bz2 diff --git a/import.log b/import.log index 84fc3ce..e2549a5 100644 --- a/import.log +++ b/import.log @@ -23,3 +23,4 @@ mono-2_2-10_pre2_20081215svn121507_fc11:HEAD:mono-2.2-10.pre2.20081215svn121507. mono-2_2-11_pre3_20081215svn121536_fc11:HEAD:mono-2.2-11.pre3.20081215svn121536.fc11.src.rpm:1229380660 mono-2_2-11_pre3_20081216svn121605_fc11:HEAD:mono-2.2-11.pre3.20081216svn121605.fc11.src.rpm:1229509237 mono-2_2-12_pre3_20081217svn121664_fc11:HEAD:mono-2.2-12.pre3.20081217svn121664.fc11.src.rpm:1229517354 +mono-2_2-13_pre3_20081219svn121833_fc11:HEAD:mono-2.2-13.pre3.20081219svn121833.fc11.src.rpm:1229684067 diff --git a/mono-svn-ppcreordering.patch b/mono-svn-ppcreordering.patch new file mode 100644 index 0000000..6fe96d2 --- /dev/null +++ b/mono-svn-ppcreordering.patch @@ -0,0 +1,11 @@ +--- mono-121833/mono/arch/ppc/ppc-codegen.h 2008-12-19 05:57:19.000000000 +0000 ++++ mono-121833/mono/arch/ppc/ppc-codegen-new.h 2008-12-19 09:15:41.000000000 +0000 +@@ -150,7 +150,7 @@ + #define ppc_load_func(c,D,V) ppc_load_sequence ((c), (D), (V)) + + #define ppc_load_reg(c,D,d,A) ppc_lwz ((c), (D), (d), (A)) +-#define ppc_load_reg_update(c,D,d,A) ppc_lwzu ((c), (D), (d), (A)) ++#define ppc_load_reg_update(c,D,d,A) ppc_lwzu ((c), (D), (A), (d)) + #define ppc_load_reg_indexed(c,D,A,B) ppc_lwzx ((c), (D), (A), (B)) + #define ppc_load_reg_update_indexed(c,D,A,B) ppc_lwzux ((c), (D), (A), (B)) + #define ppc_load_multiple_regs(c,D,A,d) ppc_lmw ((c), (D), (A), (d)) diff --git a/mono.spec b/mono.spec index c6662f9..b17d882 100644 --- a/mono.spec +++ b/mono.spec @@ -1,8 +1,8 @@ -%define svnver 121664 +%define svnver 121833 Name: mono Version: 2.2 -Release: 12.pre3.20081217svn%{svnver}%{?dist} +Release: 13.pre3.20081219svn%{svnver}%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -33,7 +33,7 @@ Obsoletes: monodoc, monodoc-devel 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 Patch0: mono-2.2-ppc-threading.patch Patch1: mono-libdir-126.patch @@ -43,7 +43,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-svn-ppcreordering.patch %description The Mono runtime implements a JIT engine for the ECMA CLI @@ -285,6 +285,7 @@ Development file for monodoc sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7} %patch7 -p1 -b .libdir-22 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7} +%patch8 -p1 -b .ppc-reorder sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in} @@ -695,6 +696,11 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog +* Fri Dec 19 2008 Paul F. Johnson 2.2-13.pre3.20081219svn121833 +- Lots more fixes +- New patch for ppc archs +- Re-enable ppc build + * Wed Dec 17 2008 Paul F. Johnson 2.2-12.pre3.20081217svn121664 - Fix libdir issue with monodoc diff --git a/sources b/sources index c7ef950..cb699cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb038c4b7f0cd5da9711693b58d8018b mono-121664.tar.bz2 +cad97fa3052e20c735982efbc90ece5a mono-121833.tar.bz2