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