diff options
| author | Romain Tartière <romain@FreeBSD.org> | 2014-04-08 10:39:41 +0000 |
|---|---|---|
| committer | Romain Tartière <romain@FreeBSD.org> | 2014-04-08 10:39:41 +0000 |
| commit | c9e31077ea9d68af4656ecf70d5534b011f8133f (patch) | |
| tree | 0b2d61a0973cf1a22f82f01aebbf35617ebdcc1e /lang/mono/files | |
| parent | Stagify, define LICENSE (LGPL21), and generally cleanup the port while here. (diff) | |
Update to 3.4.0.
Diffstat (limited to 'lang/mono/files')
| -rw-r--r-- | lang/mono/files/patch-mcs_tools_xbuild_targets_Microsoft.Portable.Common.targets | 10 | ||||
| -rw-r--r-- | lang/mono/files/patch-mono_tests_Makefile.in | 16 |
2 files changed, 18 insertions, 8 deletions
diff --git a/lang/mono/files/patch-mcs_tools_xbuild_targets_Microsoft.Portable.Common.targets b/lang/mono/files/patch-mcs_tools_xbuild_targets_Microsoft.Portable.Common.targets new file mode 100644 index 000000000000..15aef1ea95fc --- /dev/null +++ b/lang/mono/files/patch-mcs_tools_xbuild_targets_Microsoft.Portable.Common.targets @@ -0,0 +1,10 @@ + +$FreeBSD$ + +--- /dev/null ++++ mcs/tools/xbuild/targets/Microsoft.Portable.Common.targets +@@ -0,0 +1,4 @@ ++<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> ++ <Import Project="..\Microsoft.Portable.Core.props" /> ++ <Import Project="..\Microsoft.Portable.Core.targets" /> ++</Project> diff --git a/lang/mono/files/patch-mono_tests_Makefile.in b/lang/mono/files/patch-mono_tests_Makefile.in index d3154ad6c9b2..d8ff7672fc87 100644 --- a/lang/mono/files/patch-mono_tests_Makefile.in +++ b/lang/mono/files/patch-mono_tests_Makefile.in @@ -3,12 +3,12 @@ $FreeBSD$ --- mono/tests/Makefile.in.orig +++ mono/tests/Makefile.in -@@ -1511,7 +1511,7 @@ - @NACL_CODEGEN_TRUE@test-messages: - @NACL_CODEGEN_FALSE@test-messages: w32message.exe - @NACL_CODEGEN_FALSE@ > test_messages.zero --@NACL_CODEGEN_FALSE@ $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe >& w32message.allout && cmp test_messages.zero w32message.allout -+@NACL_CODEGEN_FALSE@ $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe > w32message.allout 2>&1 && cmp test_messages.zero w32message.allout +@@ -1509,7 +1509,7 @@ + @HOST_WIN32_TRUE@@NACL_CODEGEN_FALSE@test-messages: + @HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@test-messages: w32message.exe + @HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@ > test_messages.zero +-@HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@ $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe >& w32message.allout && cmp test_messages.zero w32message.allout ++@HOST_WIN32_FALSE@@NACL_CODEGEN_FALSE@ $(with_mono_path) $(JITTEST_PROG_RUN) w32message.exe > w32message.allout 2>&1 && cmp test_messages.zero w32message.allout - @MOONLIGHT_TRUE@test_2_1 : test-coreclr-security - @MOONLIGHT_FALSE@test_2_1 : + @AMD64_TRUE@test-sgen : sgen-tests + @AMD64_FALSE@@HOST_WIN32_TRUE@@X86_TRUE@test-sgen : |