diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2005-09-23 15:16:57 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2005-09-23 15:16:57 +0000 |
| commit | d2cbd8cfa13d93386a38e3a84833712ab2d1e9a5 (patch) | |
| tree | 24dcac7f9a8ac0ba37b67be41e2e32ee2e2df88c /dev-util/monodevelop/files | |
| parent | yanked openoffiice.get-software.com , since it's not pointing at any software... (diff) | |
| download | gentoo-2-d2cbd8cfa13d93386a38e3a84833712ab2d1e9a5.tar.gz gentoo-2-d2cbd8cfa13d93386a38e3a84833712ab2d1e9a5.tar.bz2 gentoo-2-d2cbd8cfa13d93386a38e3a84833712ab2d1e9a5.zip | |
Revision bump with fix for mcs path finding on amd64/multilib arches. See bug #106661.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-util/monodevelop/files')
| -rw-r--r-- | dev-util/monodevelop/files/digest-monodevelop-0.7-r2 | 1 | ||||
| -rw-r--r-- | dev-util/monodevelop/files/monodevelop-0.7-mcs-path-fix.diff | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/dev-util/monodevelop/files/digest-monodevelop-0.7-r2 b/dev-util/monodevelop/files/digest-monodevelop-0.7-r2 new file mode 100644 index 000000000000..c965015f597c --- /dev/null +++ b/dev-util/monodevelop/files/digest-monodevelop-0.7-r2 @@ -0,0 +1 @@ +MD5 a62a5e12127ca5dd8c3e4f44dd6ecc4b monodevelop-0.7.tar.gz 1901522 diff --git a/dev-util/monodevelop/files/monodevelop-0.7-mcs-path-fix.diff b/dev-util/monodevelop/files/monodevelop-0.7-mcs-path-fix.diff new file mode 100644 index 000000000000..88a94df0a83b --- /dev/null +++ b/dev-util/monodevelop/files/monodevelop-0.7-mcs-path-fix.diff @@ -0,0 +1,38 @@ +diff -aur monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs +--- monodevelop-0.7-orig/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2005-03-22 13:02:01.000000000 -0500 ++++ monodevelop-0.7/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2005-09-23 00:33:46.000000000 -0400 +@@ -463,20 +463,23 @@ + stream.Close (); + } + ++ string compilerName = String.Empty; + string GetCompilerName() + { +- //return fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()) + +- // "csc.exe"; +- string ret = fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()); +- // Interop between mono 1.0.x and mono 1.1.x +- if (ret.IndexOf("mono/1.0") == -1) { +- ret = ret.Substring(0, ret.Length - 4); +- ret = ret + "bin/mcs"; +- } else { +- ret = ret.Substring(0, ret.Length - 13); +- ret = ret + "bin/mcs"; ++ if (compilerName == String.Empty) ++ { ++ string runtimeDir = fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()); ++ // The following regex foo gets the index of the ++ // last match of lib/lib32/lib64 and uses ++ // the text before that as the 'prefix' in order ++ // to find the right mcs to use. ++ Regex regex = new Regex ("lib[32 64]?"); ++ MatchCollection matches = regex.Matches(runtimeDir); ++ Match match = matches[matches.Count - 1]; ++ compilerName = runtimeDir.Substring(0, match.Index) + Path.Combine("bin", "mcs"); + } +- return ret; ++ ++ return compilerName; + } + + ICompilerResult ParseOutput(TempFileCollection tf, string stdout, string stderr) |