diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2005-01-04 15:58:39 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2005-01-04 15:58:39 +0000 |
| commit | 3fe1e144c881488d5c0c144a543e73d5863224e3 (patch) | |
| tree | f1eef304414ebd7db20828feb4d9269a85b56a36 /dev-dotnet/mono | |
| parent | Fixed no-fixpath (Manifest recommit) (diff) | |
| download | gentoo-2-3fe1e144c881488d5c0c144a543e73d5863224e3.tar.gz gentoo-2-3fe1e144c881488d5c0c144a543e73d5863224e3.tar.bz2 gentoo-2-3fe1e144c881488d5c0c144a543e73d5863224e3.zip | |
Fixes for installations on systems without mono already installed. See bug #75560
Diffstat (limited to 'dev-dotnet/mono')
| -rw-r--r-- | dev-dotnet/mono/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-dotnet/mono/mono-1.0.5-r2.ebuild | 12 | ||||
| -rw-r--r-- | dev-dotnet/mono/mono-1.0.5-r3.ebuild | 12 |
3 files changed, 26 insertions, 5 deletions
diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog index 11c9b779d791..f7be05aeabf7 100644 --- a/dev-dotnet/mono/ChangeLog +++ b/dev-dotnet/mono/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-dotnet/mono # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.43 2005/01/03 04:18:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.44 2005/01/04 15:58:39 latexer Exp $ + + 04 Jan 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild, + mono-1.0.5-r3.ebuild: + Fixes for installations on systems without mono already installed. See bug + #75560 02 Jan 2005; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild, mono-1.0.5-r3.ebuild: diff --git a/dev-dotnet/mono/mono-1.0.5-r2.ebuild b/dev-dotnet/mono/mono-1.0.5-r2.ebuild index a0854ebb964e..8d22e991eeff 100644 --- a/dev-dotnet/mono/mono-1.0.5-r2.ebuild +++ b/dev-dotnet/mono/mono-1.0.5-r2.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-dotnet/mono/mono-1.0.5-r2.ebuild,v 1.6 2005/01/03 04:18:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r2.ebuild,v 1.7 2005/01/04 15:58:39 latexer Exp $ inherit eutils mono flag-o-matic debug @@ -47,7 +47,7 @@ src_unpack() { # Fix MONO_CFG_DIR for signing sed -i \ - "s:^\t\(MONO.*SNK)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ + "s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ ${MCS_S}/build/library.make # add our own little in-place mcs script @@ -58,7 +58,9 @@ src_unpack() { chmod +x ${S}/runtime/monoresgen PATH="${S}/runtime:${PATH}" + MONO_CFG_DIR='${D}/etc/' export PATH + export MONO_CFG_DIR } src_compile() { @@ -77,6 +79,12 @@ src_compile() { cd ${S} ln -s ../runtime ${WORKDIR}/${P}/runtime/lib + # Now that we have a valid config for lib mappings, put them + # in our temporary config directory. + + dodir /etc/mono + cp ${S}/data/{config,machine.config} ${D}/etc/mono/ + cd ${MCS_S} echo "prefix=${S}/runtime" > build/config.make echo "MONO_PATH=${S}/runtime/net_1_1" >> build/config.make diff --git a/dev-dotnet/mono/mono-1.0.5-r3.ebuild b/dev-dotnet/mono/mono-1.0.5-r3.ebuild index d811daea2741..4f056dfd4a33 100644 --- a/dev-dotnet/mono/mono-1.0.5-r3.ebuild +++ b/dev-dotnet/mono/mono-1.0.5-r3.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-dotnet/mono/mono-1.0.5-r3.ebuild,v 1.6 2005/01/03 04:18:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r3.ebuild,v 1.7 2005/01/04 15:58:39 latexer Exp $ inherit eutils mono flag-o-matic debug gcc @@ -49,7 +49,7 @@ src_unpack() { # Fix MONO_CFG_DIR for signing sed -i \ - "s:^\t\(MONO.*SNK)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ + "s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ ${MCS_S}/build/library.make # add our own little in-place mcs script @@ -60,7 +60,9 @@ src_unpack() { chmod +x ${S}/runtime/monoresgen PATH="${S}/runtime:${PATH}" + MONO_CFG_DIR='${D}/etc/' export PATH + export MONO_CFG_DIR } src_compile() { @@ -97,6 +99,12 @@ src_compile() { cd ${S} ln -s ../runtime ${WORKDIR}/${P}/runtime/lib + # Now that we have a valid config for lib mappings, put them + # in our temporary config directory. + + dodir /etc/mono + cp ${S}/data/{config,machine.config} ${D}/etc/mono/ + cd ${MCS_S} echo "prefix=${S}/runtime" > build/config.make echo "MONO_PATH=${S}/runtime/net_1_1" >> build/config.make |