godotengine/build-containers
1
0
Fork 0
mirror of https://github.com/godotengine/build-containers.git synced 2025-12-31 21:48:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

OSX: Fix config file for mono 6.0+

Browse Source 
This effectively means that we can't use the current Dockerfile.osx
to build mono < 6.0, as the DLL path changed.
This commit is contained in:
Rémi Verschelde
2019-11-23 11:09:19 +01:00
parent 8208704ccb
commit 5d8005ab41
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile.osx
View File

@@ -38,8 +38,10 @@ RUN git clone https://github.com/mono/mono --branch ${mono_version} --single-bra
ln -s /usr/bin/mono /root/dependencies/mono/bin/mono && \
ln -s /usr/bin/mono-sgen /root/dependencies/mono/bin/mono-sgen && \
ln -sf /usr/lib/mono/* /root/dependencies/mono/lib/mono && \
cp -rvp /etc/mono /root/dependencies/mono/etc && \
cp /root/files/mono-config-macosx /root/dependencies/mono/etc/config && \
mkdir -p /root/dependencies/mono/etc && \
cp -rvp /etc/mono /root/dependencies/mono/etc/ && \
cp /root/dependencies/mono/etc/mono/config{,.bak} && \
cp /root/files/mono-config-macosx /root/dependencies/mono/etc/mono/config && \
rm -rf /root/mono
ENV MONO64_PREFIX=/root/dependencies/mono

4
files/mono-config-macosx
View File

@@ -11,7 +11,9 @@
<dllmap dll="oci" target="libclntsh.dylib" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36.dylib" os="!windows"/>
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper.dylib" os="!windows" />
<dllmap dll="System.Native" target="$mono_libdir/libmono-system-native.dylib" os="!windows" />
<dllmap dll="System.Native" target="$mono_libdir/libmono-native.dylib" os="!windows" />
<dllmap dll="System.Net.Security.Native" target="$mono_libdir/libmono-native.dylib" os="!windows" />
<dllmap dll="System.Security.Cryptography.Native.Apple" target="$mono_libdir/libmono-native.dylib" os="osx" />
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared.dylib" os="!windows" />
<dllmap dll="i:msvcrt" target="libc.dylib" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="libc.dylib" os="!windows"/>