| 1 |
pacho 11/02/27 12:52:41 |
| 2 |
|
| 3 |
Added: mono-2.10.1-libdir.patch |
| 4 |
Log: |
| 5 |
Version bump to 2.10, build against system boehm (bug #252547 by Diego Elio Pettenò), drop some no longer needed changes at src_install. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.41/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-lang/mono/files/mono-2.10.1-libdir.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/files/mono-2.10.1-libdir.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/files/mono-2.10.1-libdir.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mono-2.10.1-libdir.patch |
| 16 |
=================================================================== |
| 17 |
--- mcs/tools/gacutil/driver.cs~ 2011-02-23 20:21:01.000000000 +0100 |
| 18 |
+++ mcs/tools/gacutil/driver.cs 2011-02-27 11:46:39.000000000 +0100 |
| 19 |
@@ -808,7 +808,7 @@ |
| 20 |
private static string EnsureLib (string dir) |
| 21 |
{ |
| 22 |
DirectoryInfo d = new DirectoryInfo (dir); |
| 23 |
- if (d.Name == "lib") |
| 24 |
+ if (d.Name == "lib" || d.Name == "@MONOLIBDIR@") |
| 25 |
return dir; |
| 26 |
return Path.Combine (dir, "lib"); |
| 27 |
} |
| 28 |
--- mono/metadata/assembly.c~ 2011-02-23 20:21:01.000000000 +0100 |
| 29 |
+++ mono/metadata/assembly.c 2011-02-27 11:49:38.000000000 +0100 |
| 30 |
@@ -597,7 +597,7 @@ |
| 31 |
} |
| 32 |
|
| 33 |
config = g_build_filename (base, "etc", NULL); |
| 34 |
- lib = g_build_filename (base, "lib", NULL); |
| 35 |
+ lib = g_build_filename (base, "@MONOLIBDIR@", NULL); |
| 36 |
mono = g_build_filename (lib, "mono/2.0", NULL); |
| 37 |
if (stat (mono, &buf) == -1) |
| 38 |
fallback (); |
| 39 |
@@ -652,7 +652,7 @@ |
| 40 |
|
| 41 |
bindir = g_path_get_dirname (resolvedname); |
| 42 |
installdir = g_path_get_dirname (bindir); |
| 43 |
- root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL); |
| 44 |
+ root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL); |
| 45 |
|
| 46 |
config = g_build_filename (root, "..", "etc", NULL); |
| 47 |
#ifdef HOST_WIN32 |
| 48 |
@@ -2155,7 +2155,7 @@ |
| 49 |
if (extra_gac_paths) { |
| 50 |
paths = extra_gac_paths; |
| 51 |
while (!res && *paths) { |
| 52 |
- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL); |
| 53 |
+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL); |
| 54 |
res = probe_for_partial_name (gacpath, fullname, aname, status); |
| 55 |
g_free (gacpath); |
| 56 |
paths++; |
| 57 |
@@ -2206,7 +2206,7 @@ |
| 58 |
if (*gp != G_DIR_SEPARATOR) |
| 59 |
continue; |
| 60 |
gp++; |
| 61 |
- if (strncmp (gp, "lib", 3)) |
| 62 |
+ if (strncmp (gp, "@MONOLIBDIR@", 3)) |
| 63 |
continue; |
| 64 |
gp += 3; |
| 65 |
if (*gp != G_DIR_SEPARATOR) |
| 66 |
@@ -2285,7 +2285,7 @@ |
| 67 |
paths = extra_gac_paths; |
| 68 |
while (!image && *paths) { |
| 69 |
fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, |
| 70 |
- "lib", "mono", "gac", subpath, NULL); |
| 71 |
+ "@MONOLIBDIR@", "mono", "gac", subpath, NULL); |
| 72 |
image = mono_image_open (fullpath, NULL); |
| 73 |
g_free (fullpath); |
| 74 |
paths++; |
| 75 |
@@ -2591,7 +2591,7 @@ |
| 76 |
if (extra_gac_paths) { |
| 77 |
paths = extra_gac_paths; |
| 78 |
while (!result && *paths) { |
| 79 |
- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL); |
| 80 |
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL); |
| 81 |
result = mono_assembly_open_full (fullpath, status, refonly); |
| 82 |
g_free (fullpath); |
| 83 |
paths++; |
Archives