diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2005-03-28 02:58:19 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2005-03-28 02:58:19 +0000 |
| commit | 49cb2d95fd242f85e141bcb0268bd665b0210094 (patch) | |
| tree | 61e0716f62c56b302b28e10169a6976a79ed15f2 /dev-lang/mono | |
| parent | New revision, thanks to <brad@gentoo.org>'s work on mozilla-firefox, it's pos... (diff) | |
| download | gentoo-2-49cb2d95fd242f85e141bcb0268bd665b0210094.tar.gz gentoo-2-49cb2d95fd242f85e141bcb0268bd665b0210094.tar.bz2 gentoo-2-49cb2d95fd242f85e141bcb0268bd665b0210094.zip | |
Fix for linking against ICU when USE=icu. See bug #86723.
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-lang/mono')
| -rw-r--r-- | dev-lang/mono/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/mono/files/mono-1.1.5-icu-linking.diff | 11 | ||||
| -rw-r--r-- | dev-lang/mono/mono-1.1.5.ebuild | 10 |
3 files changed, 25 insertions, 2 deletions
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog index 026315b311e5..baff31ec430c 100644 --- a/dev-lang/mono/ChangeLog +++ b/dev-lang/mono/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/mono # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.35 2005/03/25 21:42:47 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.36 2005/03/28 02:58:19 latexer Exp $ + + 27 Mar 2005; Peter Johanson <latexer@gentoo.org> + +files/mono-1.1.5-icu-linking.diff, mono-1.1.5.ebuild: + Fix for linking against ICU when USE=icu. See bug #86723. *mono-1.1.5 (25 Mar 2005) diff --git a/dev-lang/mono/files/mono-1.1.5-icu-linking.diff b/dev-lang/mono/files/mono-1.1.5-icu-linking.diff new file mode 100644 index 000000000000..6ba1b8a89267 --- /dev/null +++ b/dev-lang/mono/files/mono-1.1.5-icu-linking.diff @@ -0,0 +1,11 @@ +diff -aur mono-1.1.5-orig/mono/metadata/Makefile.am mono-1.1.5/mono/metadata/Makefile.am +--- mono-1.1.5-orig/mono/metadata/Makefile.am 2005-03-16 11:18:25.000000000 -0500 ++++ mono-1.1.5/mono/metadata/Makefile.am 2005-03-26 18:08:34.000000000 -0500 +@@ -29,6 +29,7 @@ + + CLEANFILES = mono-bundle.stamp + ++libmonoruntime_la_LIBADD = $(ICU_LIBS) + libmonoruntime_static_la_LIBADD = $(bundle_obj) $(PLATFORM_LIB) $(libmonoruntime_la_LIBADD) + + libmonoruntime_la_SOURCES = \ diff --git a/dev-lang/mono/mono-1.1.5.ebuild b/dev-lang/mono/mono-1.1.5.ebuild index 7cbb0cabbc66..1aab14d7f56a 100644 --- a/dev-lang/mono/mono-1.1.5.ebuild +++ b/dev-lang/mono/mono-1.1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5.ebuild,v 1.1 2005/03/25 21:42:47 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5.ebuild,v 1.2 2005/03/28 02:58:19 latexer Exp $ inherit eutils mono flag-o-matic @@ -34,6 +34,9 @@ src_unpack() { # Fix munging of Unix paths epatch ${FILESDIR}/${P}-pathfix.diff || die + # Fix for linking to ICU + epatch ${FILESDIR}/${P}-icu-linking.diff || die + # Various fixes from SVN. epatch ${FILESDIR}/${P}-r42108.diff || die epatch ${FILESDIR}/${P}-r42122.diff || die @@ -48,6 +51,11 @@ src_unpack() { sed -i \ "s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ ${S}/mcs/build/library.make || die + + libtoolize --copy --force || die "libtoolize failed" + aclocal || die "aclocal failed" + autoconf || die "autoconf failed" + automake || die "automake failed" } src_compile() { |