diff mbox

[v2] package/mono: Fixing wrong MonoPosixHelper location

Message ID 1456209431-19667-1-git-send-email-angelo.compagnucci@gmail.com
State Superseded
Headers show

Commit Message

Angelo Compagnucci Feb. 23, 2016, 6:37 a.m. UTC
* This patch solves installation problems with monoposixhelper
* Submitted upstream for inclusion
* Fixes https://bugs.busybox.net/show_bug.cgi?id=8651

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
Changelog:

v1 -> v2:

* Added SoB and description to patch


 ...007-fixing-wrong-MonoPosixHelper-location.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch

Comments

Arnout Vandecappelle Feb. 23, 2016, 9:10 p.m. UTC | #1
On 02/23/16 07:37, Angelo Compagnucci wrote:
> * This patch solves installation problems with monoposixhelper
> * Submitted upstream for inclusion

 You sent us the upstream patch, which doesn't apply to our 4.2.2.30 (next) and
4.2.1.102 (master) versions.

> * Fixes https://bugs.busybox.net/show_bug.cgi?id=8651

 I doubt that this is the correct solution, since this $mono_libdir construct
was just introduced upstream in commit 6b5f6dd0434b66062110cf764688975ecfed646f.
Heck, maybe that commit even fixes the issue? At least the commit log seems a
bit related.

 Regards,
 Arnout

> 
> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
> ---
> Changelog:
> 
> v1 -> v2:
> 
> * Added SoB and description to patch
> 
> 
>  ...007-fixing-wrong-MonoPosixHelper-location.patch | 28 ++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>  create mode 100644 package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
> 
> diff --git a/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch b/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
> new file mode 100644
> index 0000000..fb77c6f
> --- /dev/null
> +++ b/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
> @@ -0,0 +1,28 @@
> +From b56f7f940f804cdda4216b841f2ba83475a5b19d Mon Sep 17 00:00:00 2001
> +From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
> +Date: Sun, 14 Feb 2016 22:32:25 +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 b4b7243..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="$mono_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
> +
>
Angelo Compagnucci Feb. 23, 2016, 9:19 p.m. UTC | #2
Dear Arnout Vandecappelle

2016-02-23 22:10 GMT+01:00 Arnout Vandecappelle <arnout@mind.be>:
> On 02/23/16 07:37, Angelo Compagnucci wrote:
>> * This patch solves installation problems with monoposixhelper
>> * Submitted upstream for inclusion
>
>  You sent us the upstream patch, which doesn't apply to our 4.2.2.30 (next) and
> 4.2.1.102 (master) versions.
>
>> * Fixes https://bugs.busybox.net/show_bug.cgi?id=8651
>
>  I doubt that this is the correct solution, since this $mono_libdir construct
> was just introduced upstream in commit 6b5f6dd0434b66062110cf764688975ecfed646f.
> Heck, maybe that commit even fixes the issue? At least the commit log seems a
> bit related.

You are probably right, I'm reconsidering all the facts right now ad
probably I resend a new patch.

Sincerely, Angelo

>
>  Regards,
>  Arnout
>
>>
>> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
>> ---
>> Changelog:
>>
>> v1 -> v2:
>>
>> * Added SoB and description to patch
>>
>>
>>  ...007-fixing-wrong-MonoPosixHelper-location.patch | 28 ++++++++++++++++++++++
>>  1 file changed, 28 insertions(+)
>>  create mode 100644 package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
>>
>> diff --git a/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch b/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
>> new file mode 100644
>> index 0000000..fb77c6f
>> --- /dev/null
>> +++ b/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
>> @@ -0,0 +1,28 @@
>> +From b56f7f940f804cdda4216b841f2ba83475a5b19d Mon Sep 17 00:00:00 2001
>> +From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
>> +Date: Sun, 14 Feb 2016 22:32:25 +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 b4b7243..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="$mono_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
>> +
>>
>
>
> --
> 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
diff mbox

Patch

diff --git a/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch b/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
new file mode 100644
index 0000000..fb77c6f
--- /dev/null
+++ b/package/mono/0007-fixing-wrong-MonoPosixHelper-location.patch
@@ -0,0 +1,28 @@ 
+From b56f7f940f804cdda4216b841f2ba83475a5b19d Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
+Date: Sun, 14 Feb 2016 22:32:25 +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 b4b7243..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="$mono_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
+