diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/mono/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/mono/files/digest-mono-1.2.5-r1 | 3 | ||||
| -rw-r--r-- | dev-lang/mono/files/mono-1.2.5-remoting.patch | 48 | ||||
| -rw-r--r-- | dev-lang/mono/mono-1.2.5-r1.ebuild | 125 |
4 files changed, 183 insertions, 1 deletions
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog index df7247903701..ccbbe1e4e211 100644 --- a/dev-lang/mono/ChangeLog +++ b/dev-lang/mono/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/mono # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.125 2007/09/11 08:10:20 jurek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.126 2007/09/11 13:49:23 jurek Exp $ + +*mono-1.2.5-r1 (11 Sep 2007) + + 11 Sep 2007; Jurek Bartuszek <jurek@gentoo.org> + +files/mono-1.2.5-remoting.patch, +mono-1.2.5-r1.ebuild: + Fixed issues with remoting (bug #192120) 11 Sep 2007; Jurek Bartuszek <jurek@gentoo.org> mono-1.2.5.ebuild: Added -j1 to MAKEOPTS (bug #192059) diff --git a/dev-lang/mono/files/digest-mono-1.2.5-r1 b/dev-lang/mono/files/digest-mono-1.2.5-r1 new file mode 100644 index 000000000000..77e998b4c7a1 --- /dev/null +++ b/dev-lang/mono/files/digest-mono-1.2.5-r1 @@ -0,0 +1,3 @@ +MD5 03a6d15fbf447a7807cc402dc8f64036 mono-1.2.5.tar.bz2 17503807 +RMD160 aaef7d2d8940b917369eabe205c118d887e7ae32 mono-1.2.5.tar.bz2 17503807 +SHA256 2eedf307600e057776cfc2801ac54cded4d5d595d32b549f3b781cc762ade1c6 mono-1.2.5.tar.bz2 17503807 diff --git a/dev-lang/mono/files/mono-1.2.5-remoting.patch b/dev-lang/mono/files/mono-1.2.5-remoting.patch new file mode 100644 index 000000000000..6dce6e6d8baf --- /dev/null +++ b/dev-lang/mono/files/mono-1.2.5-remoting.patch @@ -0,0 +1,48 @@ +--- trunk/mono/mono/metadata/object.c 2007/08/28 12:48:36 84948 ++++ trunk/mono/mono/metadata/object.c 2007/09/08 22:36:32 85526 +@@ -1560,7 +1560,8 @@ + MonoMethod *cm; + + if ((cm = class->vtable [i])) +- pvt->vtable [i] = arch_create_remoting_trampoline (cm, target_type); ++ pvt->vtable [i] = mono_method_signature (cm)->generic_param_count ++ ? cm : arch_create_remoting_trampoline (cm, target_type); + } + + if (class->flags & TYPE_ATTRIBUTE_ABSTRACT) { +@@ -1570,7 +1571,7 @@ + gpointer iter = NULL; + while ((m = mono_class_get_methods (k, &iter))) + if (!pvt->vtable [m->slot]) +- pvt->vtable [m->slot] = arch_create_remoting_trampoline (m, target_type); ++ pvt->vtable [m->slot] = mono_method_signature (m)->generic_param_count ? m : arch_create_remoting_trampoline (m, target_type); + } + } + +@@ -1609,7 +1610,7 @@ + iter = NULL; + j = 0; + while ((cm = mono_class_get_methods (interf, &iter))) +- pvt->vtable [slot + j++] = arch_create_remoting_trampoline (cm, target_type); ++ pvt->vtable [slot + j++] = mono_method_signature (cm)->generic_param_count ? cm : arch_create_remoting_trampoline (cm, target_type); + + slot += mono_class_num_methods (interf); + } +@@ -1933,8 +1934,15 @@ + } + + if (is_proxy) { +- if (!res) res = method; /* It may be an interface or abstract class method */ +- res = mono_marshal_get_remoting_invoke (res); ++ /* It may be an interface, abstract class method or generic method */ ++ if (!res || mono_method_signature (res)->generic_param_count) ++ res = method; ++ ++ /* generic methods demand invoke_with_check */ ++ if (mono_method_signature (res)->generic_param_count) ++ res = mono_marshal_get_remoting_invoke_with_check (res); ++ else ++ res = mono_marshal_get_remoting_invoke (res); + } + + g_assert (res); diff --git a/dev-lang/mono/mono-1.2.5-r1.ebuild b/dev-lang/mono/mono-1.2.5-r1.ebuild new file mode 100644 index 000000000000..ff6d0ca730da --- /dev/null +++ b/dev-lang/mono/mono-1.2.5-r1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.5-r1.ebuild,v 1.1 2007/09/11 13:49:23 jurek Exp $ + +inherit eutils flag-o-matic multilib autotools + +DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter" +HOMEPAGE="http://www.go-mono.com" +SRC_URI="http://www.go-mono.com/sources/mono/${P}.tar.bz2" + +LICENSE="|| ( GPL-2 LGPL-2 X11 )" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="X nptl" + +RDEPEND="!<dev-dotnet/pnet-0.6.12 + >=dev-libs/glib-2.6 + nptl? ( >=sys-devel/gcc-3.3.5-r1 ) + ppc? ( + >=sys-devel/gcc-3.2.3-r4 + >=sys-libs/glibc-2.3.3_pre20040420 + ) + X? ( >=dev-dotnet/libgdiplus-1.2.4 )" +DEPEND="${RDEPEND} + sys-devel/bc + >=dev-util/pkgconfig-0.19" +PDEPEND="dev-dotnet/pe-format" + +# Parallel build unfriendly +MAKEOPTS="${MAKEOPTS} -j1" + +RESTRICT="test" + +function get-memory-total() { + cat /proc/meminfo | grep MemTotal | sed -r "s/[^0-9]*([[0-9]+).*/\1/" +} + +src_unpack() { + unpack ${A} + cd ${S} + + # Fix the install path, install into $(libdir) + sed -i -e 's:$(prefix)/lib:$(libdir):' \ + -i -e 's:$(exec_prefix)/lib:$(libdir):' \ + -i -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \ + ${S}/{scripts,mono/metadata}/Makefile.am ${S}/configure.in \ + || die "sed failed" + + sed -i -e 's:^libdir.*:libdir=@libdir@:' \ + -i -e 's:${prefix}/lib/:${libdir}/:g' \ + ${S}/{scripts,}/*.pc.in \ + || die "sed failed" + + epatch ${FILESDIR}/${P}-make-check.patch || die "patch failed" + epatch ${FILESDIR}/${P}-remoting.patch || die "patch failed" + epatch ${FILESDIR}/${PN}-1.2.4-pic.patch || die "patch failed" + + # Remove dummy ltconfig and let libtool handle it + rm -f ${S}/libgc/ltconfig + + einfo "Regenerating the build files, this will take some time..." + eautoreconf +} + +src_compile() { + # mono's build system is finiky, strip the flags + strip-flags + + # Enable the 2.0 FX, use the system glib and the gc + local myconf="--with-preview=yes --with-glib=system --with-gc=included" + + # Threading support + if use amd64 || use nptl ; then + # force __thread on amd64 (bug #83770) + myconf="${myconf} --with-tls=__thread" + else + myconf="${myconf} --with-tls=pthread" + fi + + # Enable large heaps if memory is more than >=3GB + if [[ $(get-memory-total) -ge 3145728 ]] ; then + myconf="${myconf} --with-large-heap=yes" + fi + + # Force the use of monolite mcs to prevent issues with classlibs (bug #118062) + touch ${S}/mcs/build/deps/use-monolite + + econf ${myconf} || die "configure failed" + emake EXTERNAL_MCS=false EXTERNAL_MONO=false + + if [[ "$?" -ne "0" ]]; then + ewarn "If you are using any hardening features such as" + ewarn "PIE+SSP/SELinux/grsec/PAX then most probably this is the reason" + ewarn "why build has failed. In this case turn any active security" + ewarn "enhancements off and try emerging the package again" + die + fi +} + +src_test() { + vecho ">>> Test phase [check]: ${CATEGORY}/${PF}" + + mkdir -p "${T}/home/mono" || die "mkdir home failed" + + export HOME="${T}/home/mono" + export XDG_CONFIG_HOME="${T}/home/mono" + export XDG_DATA_HOME="${T}/home/mono" + + if ! LC_ALL=C emake -j1 check; then + hasq test $FEATURES && die "Make check failed. See above for details." + hasq test $FEATURES || eerror "Make check failed. See above for details." + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + + dodoc AUTHORS ChangeLog NEWS README + + docinto docs + dodoc docs/* + + docinto libgc + dodoc libgc/ChangeLog +} |