diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2014-05-27 14:57:38 +0400 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2014-07-01 16:25:12 +0400 |
| commit | 3408b8e5f194774e529e223173d68a1a8f880ea5 (patch) | |
| tree | 62403324b5d8acad488d0f5f2494ea678ebce4f0 | |
| parent | 8f961e65609574d51800a2f6844fa4786c08164c (diff) | |
Use Mono prefix for libMonoPosixHelper
The libMonoPosixHelper is installed together with Mono, hence its path
in the configuration should be relative to the Mono prefix.
It was previously assumed to reside in a system path, so the the
dynamic linker would find it anyway.
This patch is based on the one included in bug #18555 (by Gaëtan
Lehmann <gaetan.lehmann@gmail.com>), but it also updates
runtime/Makefile.am to keep runtime/etc/mono/config consistent.
Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=18555
| -rw-r--r-- | data/config.in | 2 | ||||
| -rw-r--r-- | runtime/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/config.in b/data/config.in index 3cc39732e1c..fc764c7a029 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="libMonoPosixHelper@libsuffix@" os="!windows" /> + <dllmap dll="MonoPosixHelper" target="@prefix@/lib/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"/> diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 6b784a3d6e8..7c9b6006673 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -168,7 +168,7 @@ CLEANFILES = etc/mono/config # depend on $(symlinks) to ensure 'etc/mono' directory exists etc/mono/config: ../data/config Makefile $(symlinks) d=`cd ../support && pwd`; \ - sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t + sed 's,target="$(prefix)/lib/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t if test -z "$(libgdiplus_loc)"; then :; else \ sed 's,target="[^"]*libgdiplus[^"]*",target="$(libgdiplus_loc)",' $@t > $@tt; \ mv -f $@tt $@t; fi |