summaryrefslogtreecommitdiffstats
path: root/package/mono
diff options
context:
space:
mode:
Diffstat (limited to 'package/mono')
-rw-r--r--package/mono/0007-config.in-fixing-wrong-MonoPosixHelper-location.patch28
-rw-r--r--package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch29
2 files changed, 57 insertions, 0 deletions
diff --git a/package/mono/0007-config.in-fixing-wrong-MonoPosixHelper-location.patch b/package/mono/0007-config.in-fixing-wrong-MonoPosixHelper-location.patch
new file mode 100644
index 0000000000..6ebb802adf
--- /dev/null
+++ b/package/mono/0007-config.in-fixing-wrong-MonoPosixHelper-location.patch
@@ -0,0 +1,28 @@
+From 76aa4fb62a433e61dc35eefcc3077f0463182d2f Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+Date: Tue, 23 Feb 2016 22:43:39 +0100
+Subject: [PATCH] config.in: fixing wrong MonoPosixHelper location
+
+This patch remove a wrong prefix for libMonoPosixHelper
+
+Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+---
+ data/config.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/config.in b/data/config.in
+index b760176..41495b9 100644
+--- a/data/config.in
++++ b/data/config.in
+@@ -10,7 +10,7 @@
+ <dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
+ <dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
+ <dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
+- <dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
++ <dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
+ <dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
+ <dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
+ <dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
+--
+1.9.1
+
diff --git a/package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch b/package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch
new file mode 100644
index 0000000000..58fa3238d3
--- /dev/null
+++ b/package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch
@@ -0,0 +1,29 @@
+From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+Date: Thu, 25 Feb 2016 22:19:31 +0100
+Subject: [PATCH] mcs/class/monodoc/Makefile: Fixing wrong monodoc search path
+
+mono_libdir actually leaks host compiler path, fixing
+by hardcoding correct path for our usecase.
+
+Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+---
+ mcs/class/monodoc/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
+index 3ebba80..ddc2098 100644
+--- a/mcs/class/monodoc/Makefile
++++ b/mcs/class/monodoc/Makefile
+@@ -135,7 +135,7 @@ test-local: setup-doc-sources
+ dist-local: Monodoc.Ecma/EcmaUrlParser.cs
+
+ $(the_lib).config: Makefile monodoc.dll.config.in
+- sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
++ sed 's,@monodoc_refdir@,/usr/lib/monodoc,g' monodoc.dll.config.in > $@
+
+ Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs jay.sh
+ $(topdir)/$(thisdir)/jay.sh $(topdir) $< $@ $(JAY_FLAGS)
+--
+1.9.1
+
OpenPOWER on IntegriCloud