1 |
ali_bush 10/10/08 08:29:02 |
2 |
|
3 |
Added: mono-2.8-libdir.patch |
4 |
Log: |
5 |
Version Bump - mono-2.8 :D |
6 |
|
7 |
(Portage version: 2.1.9.13/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-lang/mono/files/mono-2.8-libdir.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/files/mono-2.8-libdir.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/mono/files/mono-2.8-libdir.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: mono-2.8-libdir.patch |
16 |
=================================================================== |
17 |
diff -Naur mono-9999.bak/mono/mcs/tools/gacutil/driver.cs mono-9999/mono/mcs/tools/gacutil/driver.cs |
18 |
--- mono-9999.bak/mono/mcs/tools/gacutil/driver.cs 2010-07-03 04:58:15.000000000 +1200 |
19 |
+++ mono-9999/mono/mcs/tools/gacutil/driver.cs 2010-07-03 05:13:01.000000000 +1200 |
20 |
@@ -808,7 +808,7 @@ |
21 |
private static string EnsureLib (string dir) |
22 |
{ |
23 |
DirectoryInfo d = new DirectoryInfo (dir); |
24 |
- if (d.Name == "lib") |
25 |
+ if (d.Name == "lib" || d.Name == "@MONOLIBDIR@") |
26 |
return dir; |
27 |
return Path.Combine (dir, "lib"); |
28 |
} |
29 |
diff -Naur mono-9999.bak/mono/mono/metadata/assembly.c mono-9999/mono/mono/metadata/assembly.c |
30 |
--- mono-9999.bak/mono/mono/metadata/assembly.c 2010-07-03 04:58:14.000000000 +1200 |
31 |
+++ mono-9999/mono/mono/metadata/assembly.c 2010-07-03 05:11:47.000000000 +1200 |
32 |
@@ -542,7 +542,7 @@ |
33 |
} |
34 |
|
35 |
config = g_build_filename (base, "etc", NULL); |
36 |
- lib = g_build_filename (base, "lib", NULL); |
37 |
+ lib = g_build_filename (base, "@MONOLIBDIR@", NULL); |
38 |
mono = g_build_filename (lib, "mono/1.0", NULL); |
39 |
if (stat (mono, &buf) == -1) |
40 |
fallback (); |
41 |
@@ -595,7 +595,7 @@ |
42 |
|
43 |
bindir = g_path_get_dirname (name); |
44 |
installdir = g_path_get_dirname (bindir); |
45 |
- root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL); |
46 |
+ root = g_build_path (G_DIR_SEPARATOR_S, installdir, "@MONOLIBDIR@", NULL); |
47 |
|
48 |
config = g_build_filename (root, "..", "etc", NULL); |
49 |
#ifdef HOST_WIN32 |
50 |
@@ -2066,7 +2066,7 @@ |
51 |
if (extra_gac_paths) { |
52 |
paths = extra_gac_paths; |
53 |
while (!res && *paths) { |
54 |
- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL); |
55 |
+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL); |
56 |
res = probe_for_partial_name (gacpath, fullname, aname, status); |
57 |
g_free (gacpath); |
58 |
paths++; |
59 |
@@ -2117,7 +2117,7 @@ |
60 |
if (*gp != G_DIR_SEPARATOR) |
61 |
continue; |
62 |
gp++; |
63 |
- if (strncmp (gp, "lib", 3)) |
64 |
+ if (strncmp (gp, "@MONOLIBDIR@", 3)) |
65 |
continue; |
66 |
gp += 3; |
67 |
if (*gp != G_DIR_SEPARATOR) |
68 |
@@ -2196,7 +2196,7 @@ |
69 |
paths = extra_gac_paths; |
70 |
while (!image && *paths) { |
71 |
fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, |
72 |
- "lib", "mono", "gac", subpath, NULL); |
73 |
+ "@MONOLIBDIR@", "mono", "gac", subpath, NULL); |
74 |
image = mono_image_open (fullpath, NULL); |
75 |
g_free (fullpath); |
76 |
paths++; |
77 |
@@ -2488,7 +2488,7 @@ |
78 |
if (extra_gac_paths) { |
79 |
paths = extra_gac_paths; |
80 |
while (!result && *paths) { |
81 |
- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL); |
82 |
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL); |
83 |
result = mono_assembly_open_full (fullpath, status, refonly); |
84 |
g_free (fullpath); |
85 |
paths++; |