summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-01-20 13:51:44 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-01-20 13:51:44 +0000
commit0cfa1f40bfa8422fb192492b349d3da70da86aee (patch)
treeaa6d25e4a4f6bdbbc955de3b09ac9f6bfe2fc3f0 /dev-lang
parentVersion bump. Closes bug #255545 (diff)
downloadgentoo-2-0cfa1f40bfa8422fb192492b349d3da70da86aee.tar.gz
gentoo-2-0cfa1f40bfa8422fb192492b349d3da70da86aee.tar.bz2
gentoo-2-0cfa1f40bfa8422fb192492b349d3da70da86aee.zip
Fix bug 255610, /usr/bin/mod doesn't work. Also include patch for upstream bug 458168, crasher bug that could be triggered during compilation.
(Portage version: 2.2_rc22/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/mono/ChangeLog10
-rw-r--r--dev-lang/mono/files/mono-2.2-r121596-work-around-runtime-crash.patch17
-rw-r--r--dev-lang/mono/mono-2.2-r2.ebuild (renamed from dev-lang/mono/mono-2.2-r1.ebuild)27
3 files changed, 44 insertions, 10 deletions
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 2ab44b4ecfcd..5a64e0f0abcb 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,14 @@
# 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.150 2009/01/19 21:30:19 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.151 2009/01/20 13:51:44 loki_val Exp $
+
+*mono-2.2-r2 (20 Jan 2009)
+
+ 20 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+ +files/mono-2.2-r121596-work-around-runtime-crash.patch,
+ -mono-2.2-r1.ebuild, +mono-2.2-r2.ebuild:
+ Fix bug 255610, /usr/bin/mod doesn't work. Also include patch for upstream
+ bug 458168, crasher bug that could be triggered during compilation.
*mono-2.2-r1 (19 Jan 2009)
diff --git a/dev-lang/mono/files/mono-2.2-r121596-work-around-runtime-crash.patch b/dev-lang/mono/files/mono-2.2-r121596-work-around-runtime-crash.patch
new file mode 100644
index 000000000000..86f7717e1a4c
--- /dev/null
+++ b/dev-lang/mono/files/mono-2.2-r121596-work-around-runtime-crash.patch
@@ -0,0 +1,17 @@
+Index: mono/metadata/metadata.c
+===================================================================
+--- mono/metadata/metadata.c (Revision 121595)
++++ mono/metadata/metadata.c (Revision 121596)
+@@ -2178,9 +2178,11 @@
+ MonoImage *image = data;
+ MonoMethodInflated *method = key;
+
++ // FIXME:
++ // https://bugzilla.novell.com/show_bug.cgi?id=458168
+ return method->declaring->klass->image == image ||
+ (method->context.class_inst && ginst_in_image (method->context.class_inst, image)) ||
+- (method->context.method_inst && ginst_in_image (method->context.method_inst, image));
++ (method->context.method_inst && ginst_in_image (method->context.method_inst, image)) || signature_in_image (mono_method_signature ((MonoMethod*)method), image);
+ }
+
+ static gboolean
diff --git a/dev-lang/mono/mono-2.2-r1.ebuild b/dev-lang/mono/mono-2.2-r2.ebuild
index e377363ec048..86bbced8c9e4 100644
--- a/dev-lang/mono/mono-2.2-r1.ebuild
+++ b/dev-lang/mono/mono-2.2-r2.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.2-r1.ebuild,v 1.2 2009/01/19 23:10:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-2.2-r2.ebuild,v 1.1 2009/01/20 13:51:44 loki_val Exp $
EAPI=2
@@ -15,19 +15,20 @@ KEYWORDS="~x86 ~amd64"
IUSE="xen moonlight minimal"
#Bash requirement is for += operator
-RDEPEND=">=app-shells/bash-3.2
- !<dev-dotnet/pnet-0.6.12
+COMMONDEPEND="!<dev-dotnet/pnet-0.6.12
!dev-util/monodoc
dev-libs/glib:2
- !minimal? (
- =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}*
- =dev-dotnet/gluezilla-${GO_MONO_REL_PV}*
- )
+ !minimal? ( =dev-dotnet/gluezilla-${GO_MONO_REL_PV}* )
ia64? (
sys-libs/libunwind
)"
-DEPEND="${RDEPEND}
- sys-devel/bc"
+RDEPEND="${COMMONDEPEND}
+ !minimal? ( =dev-dotnet/libgdiplus-${GO_MONO_REL_PV}* )
+ || ( www-client/links www-client/lynx )"
+
+DEPEND="${COMMONDEPEND}
+ sys-devel/bc
+ >=app-shells/bash-3.2"
PDEPEND="dev-dotnet/pe-format"
MAKEOPTS="${MAKEOPTS} -j1"
@@ -38,6 +39,7 @@ PATCHES=(
"${WORKDIR}/mono-2.2-libdir126.patch"
"${FILESDIR}/mono-2.2-ppc-threading.patch"
"${FILESDIR}/mono-2.2-uselibdir.patch"
+ "${FILESDIR}/mono-2.2-r121596-work-around-runtime-crash.patch"
)
pkg_setup() {
@@ -45,6 +47,7 @@ pkg_setup() {
NUNIT_DIR="/usr/$(get_libdir)/mono/nunit"
}
+
src_prepare() {
sed -e "s:@MONOLIBDIR@:$(get_libdir):" \
< "${FILESDIR}"/mono-2.2-libdir126.patch \
@@ -53,6 +56,7 @@ src_prepare() {
go-mono_src_prepare
}
+
src_configure() {
# mono's build system is finiky, strip the flags
strip-flags
@@ -86,6 +90,9 @@ src_test() {
src_install() {
go-mono_src_install
+ #Bug 255610
+ sed -i -e "s:mono/2.0/mod.exe:mono/1.0/mod.exe:" \
+ "${D}"/usr/bin/mod || die "Failed to fix mod."
docinto docs
dodoc docs/*
@@ -115,6 +122,7 @@ src_install() {
#pkg_postrm
#pkg_postinst
+
pkg_postrm() {
if [[ "$(readlink "${ROOT}"/${NUNIT_DIR})" == *"mono-nunit" ]]
then
@@ -158,6 +166,7 @@ pkg_postinst() {
fi
}
+
# NOTICE: THE COPYRIGHT FILES IN THE TARBALL ARE UNCLEAR!
# WHENEVER YOU THINK SOMETHING IS GPL-2+, IT'S ONLY GPL-2
# UNLESS MIGUEL DE ICAZA HIMSELF SAYS OTHERWISE.