From 9d4874b1139ca13fe930317456171cc69abc0bfc Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 30 Sep 2016 11:54:20 +0200 Subject: [PATCH 1/2] Bump Mono to mono-4.8.0-branch commit b4b21d081b03318a07e3ae2220b365b79e1fcec8. commit b4b21d081b03318a07e3ae2220b365b79e1fcec8 Author: Martin Baulig Date: Fri Sep 30 11:46:46 2016 +0200 [BTLS]: Add the native BTLS sources. (cherry picked from commit c950be01aca0ecce9b5f68b9f4430e99ecc51037) --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 05b93203a..b4b21d081 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 05b93203a5f9bdc211b75caeaae3527746b7d34f +Subproject commit b4b21d081b03318a07e3ae2220b365b79e1fcec8 From cebc6c8347ac539afde4004e8156f0f48e9d9464 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 30 Sep 2016 14:14:59 +0200 Subject: [PATCH 2/2] [build]: Make it build with the native BTLS sources. We need to pass '--with-btls-android-ndk=$(AndroidToolchainDirectory)\ndk' to Mono's configure to tell cmake where to find the Android NDK. --- build-tools/mono-runtimes/mono-runtimes.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/mono-runtimes/mono-runtimes.props b/build-tools/mono-runtimes/mono-runtimes.props index f4864322e..e8fb2aa03 100644 --- a/build-tools/mono-runtimes/mono-runtimes.props +++ b/build-tools/mono-runtimes/mono-runtimes.props @@ -5,8 +5,9 @@ <_CommonCFlags Condition=" '$(Configuration)' == 'Release' ">-g -O2 <_HostWinCFlags Condition=" '$(Configuration)' == 'Debug' ">-ggdb3 -O0 -DXAMARIN_PRODUCT_VERSION=0 <_HostWinCFlags Condition=" '$(Configuration)' == 'Release' ">-g -O2 -DXAMARIN_PRODUCT_VERSION=0 + <_BtlsConfigureFlags>--with-btls-android-ndk=$(AndroidToolchainDirectory)\ndk <_CommonConfigureFlags>--without-ikvm-native --enable-maintainer-mode --with-profile2=no --with-profile4=no --with-profile4_5=no --with-monodroid --enable-nls=no --with-sigaltstack=yes --with-tls=pthread mono_cv_uscore=yes - <_TargetConfigureFlags>$(_CommonConfigureFlags) --enable-minimal=ssa,portability,attach,verifier,full_messages,sgen_remset,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying,logging,security,shared_handles --disable-mcs-build --disable-executables --disable-iconv + <_TargetConfigureFlags>$(_CommonConfigureFlags) --enable-minimal=ssa,portability,attach,verifier,full_messages,sgen_remset,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying,logging,security,shared_handles --disable-mcs-build --disable-executables --disable-iconv $(_BtlsConfigureFlags) <_SecurityCFlags>-Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -fstack-protector <_TargetCFlags>$(_SecurityCFlags) -DMONODROID=1 <_TargetCxxFlags>$(_SecurityCFlags) -DMONODROID=1