Skip to contentSkip to conversation

package/mono: fixing monodoc leaking path

PATCH New Angelo Compagnucci 3 participants 3 messages Feb 25, 2016 – Feb 27, 2016

lore
Share & tools
lore

Angelo Compagnucci

author
#0 lore raw

PATCH 1/1 package/mono: fixing monodoc leaking path

This patch fixes a leak in host compiler path for monodoc. This bug is solved upstream but the fix is not included in the latest stable release.

Signed-off-by Angelo Compagnucci <[email protected]>
---
 ...-monodoc-Fixing-wrong-monodoc-search-path.patch | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch
package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch new file +29 -0
new file mode 100644
index 0000000..58fa323
@@ -0,0 +1,29 @@
+From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <[email protected]>
+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 <[email protected]>
+---
+ 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, at monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
++	sed 's, at 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
+
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 package/mono: fixing monodoc leaking path

Quoted 5 lines · Angelo Compagnucci

This patch fixes a leak in host compiler path for monodoc. This bug is solved upstream but the fix is not included in the latest stable release.

Signed-off-by Angelo Compagnucci <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Tested-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 41 lines
---
 ...-monodoc-Fixing-wrong-monodoc-search-path.patch | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch
package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch new file +29 -0
new file mode 100644
index 0000000..58fa323
@@ -0,0 +1,29 @@
+From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <[email protected]>
+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 <[email protected]>
+---
+ 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, at monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
++	sed 's, at 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
+
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#2 lore raw

PATCH 1/1 package/mono: fixing monodoc leaking path

In reply to Angelo Compagnucci
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Angelo" == Angelo Compagnucci <[email protected]> writes:

This patch fixes a leak in host compiler path for monodoc. This bug is solved upstream but the fix is not included in the latest stable release.

Signed-off-by Angelo Compagnucci <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard