diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2009-04-10 23:11:08 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-04-10 23:11:08 +0000 |
| commit | 79c10eb6ecc6c608c69b00efb6642b11f3394a2b (patch) | |
| tree | 243232f0add78db85664e3b790846c1fa7c0f226 /dev-lang | |
| parent | Version bump. Remove pkgconfig file relocation - /usr/share/pkgconfig is the ... (diff) | |
| download | gentoo-2-79c10eb6ecc6c608c69b00efb6642b11f3394a2b.tar.gz gentoo-2-79c10eb6ecc6c608c69b00efb6642b11f3394a2b.tar.bz2 gentoo-2-79c10eb6ecc6c608c69b00efb6642b11f3394a2b.zip | |
Add fix for build on ppc/ppc64 from upstream CVS
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mono/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mono/files/mono-2.4-ppcbuild-fix.patch | 23 | ||||
| -rw-r--r-- | dev-lang/mono/mono-2.4.ebuild | 3 |
3 files changed, 30 insertions, 2 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/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() { |