Readd old mono for iFolder System
Package-Manager: portage-2.2.0_alpha166 RepoMan-Options: --force
This commit is contained in:
Mario Fetka
68
dev-lang/mono/files/mono-2.2-libdir126.patch
Normal file
68
dev-lang/mono/files/mono-2.2-libdir126.patch
Normal file
@@ -0,0 +1,68 @@
|
||||
# Allows us to use lib64/lib32 as path for GAC. Snatched from Fedora,
|
||||
# altered to be easily sedded.
|
||||
# Sed this file to have the proper libdir:
|
||||
# sed -i -e "s:@MONOLIBDIR@:$(get_libdir):" FILENAME
|
||||
# http://cvs.fedoraproject.org/viewvc/rpms/mono/devel/mono-libdir-126.patch?view=log
|
||||
|
||||
Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
|
||||
===================================================================
|
||||
--- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile
|
||||
+++ mono-1.1.16/mcs/tools/cilc/res-Makefile
|
||||
@@ -2,7 +2,7 @@ include defs.mk
|
||||
|
||||
LIBNAME = $(shell echo $(basename $(SONAME)) | sed -e 's/^lib//')
|
||||
HTARGET = $(prefix)/include/$(LIBNAME)/
|
||||
-LIBTARGET = $(prefix)/lib/
|
||||
+LIBTARGET = $(libdir)
|
||||
|
||||
CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
|
||||
|
||||
--- mono-1.1.16.1/mono/metadata/assembly.c.libdir 2006-08-17 17:52:42.000000000 +0200
|
||||
+++ mono-1.1.16.1/mono/metadata/assembly.c 2006-08-17 17:56:21.000000000 +0200
|
||||
@@ -521,7 +521,7 @@
|
||||
}
|
||||
|
||||
config = g_build_filename (base, "etc", NULL);
|
||||
- lib = g_build_filename (base, "lib", NULL);
|
||||
+ lib = g_build_filename (base, "@MONOLIBDIR@", NULL);
|
||||
mono = g_build_filename (lib, "mono/1.0", NULL);
|
||||
if (stat (mono, &buf) == -1)
|
||||
fallback ();
|
||||
@@ -1844,7 +1844,7 @@
|
||||
if (extra_gac_paths) {
|
||||
paths = extra_gac_paths;
|
||||
while (!res && *paths) {
|
||||
- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
|
||||
+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", aname->name, NULL);
|
||||
res = probe_for_partial_name (gacpath, fullname, aname, status);
|
||||
g_free (gacpath);
|
||||
paths++;
|
||||
@@ -1908,7 +1908,7 @@
|
||||
paths = extra_gac_paths;
|
||||
while (!image && *paths) {
|
||||
fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
|
||||
- "lib", "mono", "gac", subpath, NULL);
|
||||
+ "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
|
||||
image = mono_image_open (fullpath, NULL);
|
||||
g_free (fullpath);
|
||||
paths++;
|
||||
@@ -2058,7 +2058,7 @@
|
||||
if (extra_gac_paths) {
|
||||
paths = extra_gac_paths;
|
||||
while (!result && *paths) {
|
||||
- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
|
||||
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "@MONOLIBDIR@", "mono", "gac", subpath, NULL);
|
||||
result = mono_assembly_open_full (fullpath, status, refonly);
|
||||
g_free (fullpath);
|
||||
paths++;
|
||||
--- mono-1.1.16.1/mcs/tools/gacutil/driver.cs.libdir 2006-08-17 15:40:14.000000000 +0200
|
||||
+++ mono-1.1.16.1/mcs/tools/gacutil/driver.cs 2006-08-17 15:40:19.000000000 +0200
|
||||
@@ -667,7 +667,7 @@
|
||||
private static string EnsureLib (string dir)
|
||||
{
|
||||
DirectoryInfo d = new DirectoryInfo (dir);
|
||||
- if (d.Name == "lib")
|
||||
+ if (d.Name == "lib" || d.Name == "@MONOLIBDIR@")
|
||||
return dir;
|
||||
return Path.Combine (dir, "lib");
|
||||
}
|
||||
21
dev-lang/mono/files/mono-2.2-ppc-threading.patch
Normal file
21
dev-lang/mono/files/mono-2.2-ppc-threading.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
#Binds ppc to use only one core to workaround threading problems for ppc.
|
||||
http://cvs.fedoraproject.org/viewvc/rpms/mono/devel/mono-2.2-ppc-threading.patch?view=log
|
||||
|
||||
--- mono-2.2/mono/mini/main.c 2008-11-18 19:00:26.000000000 +0000
|
||||
+++ mono-2.2/mono/mini/main-new.c 2008-11-18 19:16:11.000000000 +0000
|
||||
@@ -26,10 +26,14 @@
|
||||
}
|
||||
|
||||
#else
|
||||
-
|
||||
+#include <sched.h>
|
||||
int
|
||||
main (int argc, char* argv[])
|
||||
{
|
||||
+#ifdef __powerpc__
|
||||
+ unsigned long mask = 1;
|
||||
+ sched_setaffinity(0, sizeof(mask), &mask);
|
||||
+#endif
|
||||
mono_build_date = build_date;
|
||||
return mono_main (argc, argv);
|
||||
}
|
||||
18
dev-lang/mono/files/mono-2.2-uselibdir.patch
Normal file
18
dev-lang/mono/files/mono-2.2-uselibdir.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
#Fixes problem with monodoc and libdir
|
||||
http://cvs.fedoraproject.org/viewvc/rpms/mono/devel/mono-2.2-uselibdir.patch?view=log
|
||||
|
||||
--- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs 2008-08-03 07:58:47.000000000 +0100
|
||||
+++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs 2008-08-03 08:06:47.000000000 +0100
|
||||
@@ -53,10 +53,10 @@
|
||||
//xbuildDir = Path.Combine (t2.FullName, "xbuild");
|
||||
// /usr/local/lib
|
||||
t3 = t2.Parent;
|
||||
+ libDir = t3.FullName;
|
||||
// /usr/local
|
||||
t4 = t3.Parent;
|
||||
binDir = Path.Combine (t4.FullName, "bin");
|
||||
- libDir = Path.Combine (t4.FullName, "lib");
|
||||
}
|
||||
|
||||
internal static string GetBinDir ()
|
||||
|
||||
12
dev-lang/mono/files/mono-2.6.4-require-glib.patch
Normal file
12
dev-lang/mono/files/mono-2.6.4-require-glib.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
--- data/mono.pc.in 2010-04-22 09:37:47.000000000 -0600
|
||||
+++ data/mono.pc.in 2010-05-10 09:30:04.000000000 -0600
|
||||
@@ -7,8 +7,6 @@
|
||||
Name: Mono
|
||||
Description: Mono Runtime
|
||||
Version: @VERSION@
|
||||
-## Commented out because SLE hides devel files in the SLE SDK,
|
||||
-## which not all customers will have.
|
||||
-#Requires: glib-2.0 gthread-2.0
|
||||
+Requires: glib-2.0 gthread-2.0
|
||||
Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@
|
||||
Cflags: -I${includedir} @libmono_cflags@
|
||||
Reference in New Issue
Block a user