Index: lang/mono/Makefile =================================================================== --- lang/mono/Makefile +++ lang/mono/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: head/lang/mono/Makefile 460430 2018-01-30 19:00:27Z dbn $ PORTNAME= mono -PORTVERSION= 5.2.0.215 +PORTVERSION= 5.8.0.108 DISTVERSIONPREFIX= mono- CATEGORIES= lang @@ -13,8 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc -BROKEN_armv6= fails to compile: mono/arch/arm/arm-codegen.h:947:10: fatal error: 'mono/arch/arm/arm_dpimacros.h' file not found -BROKEN_armv7= fails to compile: mono/arch/arm/arm-codegen.h:947:10: fatal error: 'mono/arch/arm/arm_dpimacros.h' file not found BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ bash:shells/bash @@ -24,50 +22,40 @@ CONFLICTS_INSTALL= czmq-3* -OPTIONS_DEFINE= ACCEPTANCE_TESTS MONOLITE +OPTIONS_DEFINE= MONOLITE OPTIONS_DEFAULT= MONOLITE -ACCEPTANCE_TESTS_DESC= Download and run the .Net acceptance tests -ACCEPTANCE_TESTS_DISTFILES=nuget.31.zip:nuget31 -ACCEPTANCE_TESTS_GH_TUPLE=xamarin:benchmarker:97f618c:12/acceptance-tests/external/benchmarker \ - dotnet:coreclr:c7da48a:13/acceptance-tests/external/coreclr \ - dotnet:roslyn:322bd5b:14/acceptance-tests/external/roslyn -ACCEPTANCE_TESTS_MASTER_SITES=https://dotnetci.blob.core.windows.net/roslyn/:nuget31 -ACCEPTANCE_TESTS_TEST_DEPENDS=bash:shells/bash \ - referenceassemblies-pcl>=4.6:lang/referenceassemblies-pcl -ACCEPTANCE_TESTS_VARS= SHEBANG_FILES+=${WRKSRC}/acceptance-tests/external/roslyn/cibuild.sh - MONOLITE_DESC= Use monolite to bootstrap mcs (otherwise use installed mcs) -MONOLITE_DISTFILES= monolite-${MONOLITE_VERSION}-latest.tar.gz:monolite -MONOLITE_MASTER_SITES= http://download.mono-project.com/monolite/:monolite -MONOLITE_VERSION= 1050200001 +MONOLITE_DISTFILES= monolite-linux-${MONOLITE_VERSION}-latest.tar.xz:monolite +MONOLITE_MASTER_SITES= LOCAL/dbn/monolite/:monolite +MONOLITE_VERSION= 1050800000 -USES= autoreconf bison compiler:c11 cpe gettext gmake iconv libtool pathfix \ - perl5 python shebangfix tar:bzip2 +USES= autoreconf bison compiler:c11 cpe display:test gettext gmake iconv libtool \ + pathfix perl5 python shebangfix tar:bzip2 USE_GNOME= glib20 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes -LLD_UNSAFE= yes SHEBANG_FILES= scripts/mono-heapviz USE_GITHUB= yes -GH_TUPLE= mono:Lucene.Net.Light:85978b7:1/external/Lucene.Net.Light \ - mono:NUnitLite:690603b:19/external/nunit-lite \ - mono:Newtonsoft.Json:471c3e0:2/external/Newtonsoft.Json \ - mono:NuGet.BuildTasks:8d30747:3/external/nuget-buildtasks \ +GH_TUPLE= mono:Newtonsoft.Json:471c3e0:1/external/Newtonsoft.Json \ + mono:api-doc-tools:d03e819:2/external/api-doc-tools \ + mono:Lucene.Net.Light:85978b7:2_1/external/api-doc-tools/external/Lucene.Net.Light \ + mono:api-snapshot:57f6b98:3/external/api-snapshot \ mono:aspnetwebstack:e77b12e:4/external/aspnetwebstack \ - mono:buildtools:b5cc6e6:5/external/buildtools \ - mono:cecil:1003fcb:6/external/cecil \ + mono:reference-assemblies:9c5cc7f:5/external/binary-reference-assemblies \ + mono:cecil:76ffcda:6/external/cecil \ mono:cecil:33d50b8:7/external/cecil-legacy \ - mono:corefx:78360b2:17/external/corefx \ - mono:corert:ed6296d:16/external/corert \ - mono:ikdasm:88b67c4:8/external/ikdasm \ - mono:ikvm-fork:7c1e61b:9/external/ikvm \ - mono:linker:c7450ca:18/external/linker \ - mono:reference-assemblies:142cbeb:10/external/binary-reference-assemblies \ - mono:roslyn-binaries:dcb0a05:15/external/roslyn-binaries \ - mono:rx:b29a4b0:11/external/rx + mono:corefx:cb1b049:8/external/corefx \ + mono:corert:48dba73:9/external/corert \ + mono:ikdasm:465c081:10/external/ikdasm \ + mono:ikvm-fork:847e05f:11/external/ikvm \ + mono:linker:404f731:12/external/linker \ + mono:NuGet.BuildTasks:b58ba42:13/external/nuget-buildtasks \ + mono:NUnitLite:764656c:14/external/nunit-lite \ + mono:roslyn-binaries:e484c75:15/external/roslyn-binaries \ + mono:rx:b29a4b0:16/external/rx CONFIGURE_ARGS= --disable-dtrace CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no @@ -106,17 +94,12 @@ ${WRKSRC}/man/mono.1 \ ${WRKSRC}/man/mozroots.1 -post-patch-ACCEPTANCE_TESTS-on: - ${REINPLACE_CMD} -E -e 's!(~/|/tmp/)!${WRKDIR}/!g' -e '/git clean/d' \ - ${WRKSRC}/acceptance-tests/external/roslyn/cibuild.sh - ${TOUCH} ${WRKDIR}/nuget.31.zip - post-configure: ${REINPLACE_CMD} -e 's|share\/man|man|g' \ ${WRKSRC}/mcs/jay/Makefile -do-test-ACCEPTANCE_TESTS-on: - @(cd ${WRKSRC}/acceptance-tests; \ - ${DO_MAKE_TEST} check-full IGNORE_BENCHMARKER_VERSION=1 IGNORE_CORECLR_VERSION=1 IGNORE_ROSLYN_VERSION=1) +createmonolite: + ${MAKE_CMD} -C ${WRKSRC}/mcs/class package-monolite-latest + @${ECHO_CMD} "Monolite tarball at ${WRKSRC}/mcs/class/monolite-freebsd-${MONOLITE_VERSION}-latest.tar.xz" .include Index: lang/mono/distinfo =================================================================== --- lang/mono/distinfo +++ lang/mono/distinfo @@ -1,45 +1,37 @@ -TIMESTAMP = 1516289148 -SHA256 (nuget.31.zip) = 727148dcfffdbb13f237e9b99ca4fee56443c7c0e0552c8f7b162e9f484f1e4b -SIZE (nuget.31.zip) = 315117674 -SHA256 (monolite-1050200001-latest.tar.gz) = 56f313da5f7137fae86db6af1476df0cf6515cedea46369347c4159ed7ce3300 -SIZE (monolite-1050200001-latest.tar.gz) = 4739887 -SHA256 (mono-mono-mono-5.2.0.215_GH0.tar.gz) = 8bb96fa0e97624303d9e4072e1498a2dbb66565cd4775b405311d8cc3cf8a424 -SIZE (mono-mono-mono-5.2.0.215_GH0.tar.gz) = 72029548 -SHA256 (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 6f9cbad4083c8acf214d86a61fd39585f7d82eeec80c96fc696e07c7006e3a4d -SIZE (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 640188 -SHA256 (mono-NUnitLite-690603b_GH0.tar.gz) = 64aca768fbc92efa365f753c9e70e9e31b7fd80f7db7b50169fc2d9261b3d7b6 -SIZE (mono-NUnitLite-690603b_GH0.tar.gz) = 329598 +TIMESTAMP = 1518284711 +SHA256 (mono-mono-mono-5.8.0.108_GH0.tar.gz) = 13b545528d80ac5d3da61f2db0e1e13d7b49a5f50cb620c566f701862afd2f05 +SIZE (mono-mono-mono-5.8.0.108_GH0.tar.gz) = 72729861 SHA256 (mono-Newtonsoft.Json-471c3e0_GH0.tar.gz) = 38b2bc9f2290f780e58fdf1504c0bbdb25a67d7d998c4ec631ecbbf9ddcb3e13 SIZE (mono-Newtonsoft.Json-471c3e0_GH0.tar.gz) = 1528933 -SHA256 (mono-NuGet.BuildTasks-8d30747_GH0.tar.gz) = f1a89e60e083b6a2f7d3c86bff8fc37e32c33b5ae3bf19c874e73f45f03075e0 -SIZE (mono-NuGet.BuildTasks-8d30747_GH0.tar.gz) = 224314 +SHA256 (mono-api-doc-tools-d03e819_GH0.tar.gz) = 220f9a1be13bdf2bc0c3e05c6f5642fa19cb5dd405da976dd1b0cb4ab02e5dfe +SIZE (mono-api-doc-tools-d03e819_GH0.tar.gz) = 17597212 +SHA256 (mono-api-snapshot-57f6b98_GH0.tar.gz) = 1c733b26cc8c8302212acafb659350d66bae6e34c824a740e0b46fe4c728426f +SIZE (mono-api-snapshot-57f6b98_GH0.tar.gz) = 3169774 +SHA256 (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 6f9cbad4083c8acf214d86a61fd39585f7d82eeec80c96fc696e07c7006e3a4d +SIZE (mono-Lucene.Net.Light-85978b7_GH0.tar.gz) = 640188 SHA256 (mono-aspnetwebstack-e77b12e_GH0.tar.gz) = e92c78fa6ceb22547ef4faefdb26a9e3f9e9b43e7b7f63f2e65203657ebde4a4 SIZE (mono-aspnetwebstack-e77b12e_GH0.tar.gz) = 2335011 -SHA256 (mono-buildtools-b5cc6e6_GH0.tar.gz) = 916bf3c2a3f906d6dcd61bb8113f7fdcdc8540d3e63b759d9da4accf5859caa4 -SIZE (mono-buildtools-b5cc6e6_GH0.tar.gz) = 792164 -SHA256 (mono-cecil-1003fcb_GH0.tar.gz) = 32b4452461983f4f05f246d390ef9b8fa4706a0b22f9a08f5a5e3d8ed1707450 -SIZE (mono-cecil-1003fcb_GH0.tar.gz) = 11620856 +SHA256 (mono-reference-assemblies-9c5cc7f_GH0.tar.gz) = ce2f12119c253e900bfd816e05e46f76d2b4f1b1721c05781bd69b23161bf5ab +SIZE (mono-reference-assemblies-9c5cc7f_GH0.tar.gz) = 32637175 +SHA256 (mono-cecil-76ffcda_GH0.tar.gz) = 527700c6c3dc3211c04759fd0a62af072d4302160a846e56cf0bc2f3ca66db56 +SIZE (mono-cecil-76ffcda_GH0.tar.gz) = 12139837 SHA256 (mono-cecil-33d50b8_GH0.tar.gz) = 8c6fc2c915d197df88a0f0bdbf9588b7c8c4d3a695f34053672853d85fcd3b29 SIZE (mono-cecil-33d50b8_GH0.tar.gz) = 440059 -SHA256 (mono-corefx-78360b2_GH0.tar.gz) = e3d5b35eed0f594eeb4c56f64becd49dcc27d487487d134e65ff0565a85fd5e4 -SIZE (mono-corefx-78360b2_GH0.tar.gz) = 19718358 -SHA256 (mono-corert-ed6296d_GH0.tar.gz) = b4eea12e5377d04db120f9aa3fa259d9539f8798e3a6cddfa9325195b6af676c -SIZE (mono-corert-ed6296d_GH0.tar.gz) = 4266745 -SHA256 (mono-ikdasm-88b67c4_GH0.tar.gz) = 8a888d491be1b51e5478d2d75e0b192617443ebd8e5d7ff2b19cceef3dce12e4 -SIZE (mono-ikdasm-88b67c4_GH0.tar.gz) = 228983 -SHA256 (mono-ikvm-fork-7c1e61b_GH0.tar.gz) = 392e1e8ce285c2071473ddfe9d198a69af3c6816a01e0ef9ead6ef4966a67888 -SIZE (mono-ikvm-fork-7c1e61b_GH0.tar.gz) = 250884 -SHA256 (mono-linker-c7450ca_GH0.tar.gz) = 16009fadbf5c07e06c08b723b5eac5c471fa06a73ce2864c81c93e45be838685 -SIZE (mono-linker-c7450ca_GH0.tar.gz) = 174181 -SHA256 (mono-reference-assemblies-142cbeb_GH0.tar.gz) = 002047bedbbdda8529f48f53931024edd9dba277f31c288b6f3c6fbdfeaebc01 -SIZE (mono-reference-assemblies-142cbeb_GH0.tar.gz) = 38860551 -SHA256 (mono-roslyn-binaries-dcb0a05_GH0.tar.gz) = 5fc84e0eafd28f9909b7afd1be85471a645aa414e778f4a567f15e7569119b45 -SIZE (mono-roslyn-binaries-dcb0a05_GH0.tar.gz) = 22466984 +SHA256 (mono-corefx-cb1b049_GH0.tar.gz) = f6ca66319b755c2edb949b4efaec080dbd36a71fd0d085899b22af7bf79bf978 +SIZE (mono-corefx-cb1b049_GH0.tar.gz) = 20824738 +SHA256 (mono-corert-48dba73_GH0.tar.gz) = 843858759a3fa648d3eda985001375fd526332d2bc5bb5641841eaa1f6292aed +SIZE (mono-corert-48dba73_GH0.tar.gz) = 4570344 +SHA256 (mono-ikdasm-465c081_GH0.tar.gz) = b381290cb934015b8769200256e422ac86aa8a0a7729b62817d039f42ebc6959 +SIZE (mono-ikdasm-465c081_GH0.tar.gz) = 230605 +SHA256 (mono-ikvm-fork-847e05f_GH0.tar.gz) = 3ee7d867df63c069b50a939e38c167c651f04ed495f7df772bb685a90a125690 +SIZE (mono-ikvm-fork-847e05f_GH0.tar.gz) = 250866 +SHA256 (mono-linker-404f731_GH0.tar.gz) = e1e568a05a31fbd0acfebed53039615ad18b36d417c283d84ac95e6e00056273 +SIZE (mono-linker-404f731_GH0.tar.gz) = 138499 +SHA256 (mono-NuGet.BuildTasks-b58ba42_GH0.tar.gz) = 9c00266684076e8721c64b4b1bfefdc00a9340e870813d2b187f7cd8d99f5d46 +SIZE (mono-NuGet.BuildTasks-b58ba42_GH0.tar.gz) = 224478 +SHA256 (mono-NUnitLite-764656c_GH0.tar.gz) = 12b879585b69f46cdbec258137fab80eb0b0593607ce48c1c4baaaf887530368 +SIZE (mono-NUnitLite-764656c_GH0.tar.gz) = 330657 +SHA256 (mono-roslyn-binaries-e484c75_GH0.tar.gz) = 5be5520bacc39be6135e8636b8e9105961151c70a09120647182784caad8cccd +SIZE (mono-roslyn-binaries-e484c75_GH0.tar.gz) = 36783191 SHA256 (mono-rx-b29a4b0_GH0.tar.gz) = cff37193f8ab3bad01d9a7d22f29f6decb9a5510d701ded45e23a3ccf42070bf SIZE (mono-rx-b29a4b0_GH0.tar.gz) = 13703571 -SHA256 (xamarin-benchmarker-97f618c_GH0.tar.gz) = b55e76e14768b62b1d7dd306a22ae58361ddd640fed1534d2b99235fdcbb5fc6 -SIZE (xamarin-benchmarker-97f618c_GH0.tar.gz) = 95511421 -SHA256 (dotnet-coreclr-c7da48a_GH0.tar.gz) = 68b16590b4e19a88ca729fec064a83a1f7b0eaf233cb4fae9a1443fd42ccb1cf -SIZE (dotnet-coreclr-c7da48a_GH0.tar.gz) = 31762105 -SHA256 (dotnet-roslyn-322bd5b_GH0.tar.gz) = 52df2e1ebd6d9d5ce881ca2839fa0970498d7b8782225f3ad738487899cbdb05 -SIZE (dotnet-roslyn-322bd5b_GH0.tar.gz) = 22058637 Index: lang/mono/files/patch-configure.ac =================================================================== --- lang/mono/files/patch-configure.ac +++ lang/mono/files/patch-configure.ac @@ -1,19 +1,45 @@ ---- configure.ac.orig 2017-07-20 18:10:59 UTC +--- configure.ac.orig 2018-01-10 08:03:25 UTC +++ configure.ac -@@ -385,6 +385,7 @@ AC_SUBST(extra_runtime_ldflags) +@@ -179,6 +179,7 @@ case "$host" in + with_sgen_default_concurrent=yes + ;; + *-*-*freebsd*) ++ host_freebsd=yes + if test "x$PTHREAD_CFLAGS" = "x"; then + CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" + libmono_cflags= +@@ -397,6 +398,7 @@ AC_SUBST(extra_runtime_ldflags) AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes) AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes) - AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux) -+AM_CONDITIONAL(PLATFORM_FREEBSD, echo x$target_os | grep -q freebsd) - AM_CONDITIONAL(PLATFORM_DARWIN, test x$host_darwin = xyes) - AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes) - AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes) -@@ -393,7 +394,7 @@ if test -z "$PLATFORM_DARWIN_TRUE"; then + AM_CONDITIONAL(HOST_LINUX, echo x$target_os | grep -q linux) ++AM_CONDITIONAL(HOST_FREEBSD, echo x$target_os | grep -q freebsd) + AM_CONDITIONAL(HOST_DARWIN, test x$host_darwin = xyes) + AM_CONDITIONAL(HOST_SIGPOSIX, test x$use_sigposix = xyes) + AM_CONDITIONAL(HOST_ANDROID, test x$platform_android = xyes) +@@ -405,7 +407,7 @@ if test -z "$HOST_DARWIN_TRUE"; then : PLATFORM_AOT_SUFFIX=.dylib fi --if test -z "$PLATFORM_LINUX_TRUE"; then : -+if test -z "$PLATFORM_LINUX_TRUE" -o -z "$PLATFORM_FREEBSD_TRUE"; then : +-if test -z "$HOST_LINUX_TRUE"; then : ++if test -z "$HOST_LINUX_TRUE" -o -z "$HOST_FREEBSD_TRUE"; then : PLATFORM_AOT_SUFFIX=.so fi +@@ -4780,6 +4782,8 @@ fi + echo "BUILD_PLATFORM = darwin" >> $mcs_topdir/build/config.make + elif test x$host_win32 = xyes; then + echo "BUILD_PLATFORM = win32" >> $mcs_topdir/build/config.make ++ elif test x$host_freebsd = xyes; then ++ echo "BUILD_PLATFORM = freebsd" >> $mcs_topdir/build/config.make + else + echo "BUILD_PLATFORM = linux" >> $mcs_topdir/build/config.make + fi +@@ -4788,6 +4792,8 @@ fi + echo "HOST_PLATFORM ?= darwin" >> $mcs_topdir/build/config.make + elif test x$host_win32 = xyes; then + echo "HOST_PLATFORM ?= win32" >> $mcs_topdir/build/config.make ++ elif test x$host_freebsd = xyes; then ++ echo "HOST_PLATFORM ?= freebsd" >> $mcs_topdir/build/config.make + else + echo "HOST_PLATFORM ?= linux" >> $mcs_topdir/build/config.make + fi Index: lang/mono/files/patch-mcs_build_Makefile =================================================================== --- /dev/null +++ lang/mono/files/patch-mcs_build_Makefile @@ -0,0 +1,11 @@ +--- mcs/build/Makefile.orig 2018-02-10 17:42:16 UTC ++++ mcs/build/Makefile +@@ -15,7 +15,7 @@ common/Consts.cs: common/Consts.cs.in $( + test -n '$(MONO_CORLIB_VERSION)' + sed -e 's,@''MONO_VERSION@,$(MONO_VERSION),' -e 's,@''MONO_CORLIB_VERSION@,$(MONO_CORLIB_VERSION),' $< > $@ + +-PLATFORMS = darwin linux win32 ++PLATFORMS = darwin freebsd linux win32 + PROFILES = \ + basic \ + build \ Index: lang/mono/files/patch-mcs_build_platforms_freebsd.make =================================================================== --- /dev/null +++ lang/mono/files/patch-mcs_build_platforms_freebsd.make @@ -0,0 +1,35 @@ +--- mcs/build/platforms/freebsd.make.orig 2018-02-10 17:21:01 UTC ++++ mcs/build/platforms/freebsd.make +@@ -0,0 +1,32 @@ ++# -*- makefile -*- ++# ++# Platform-specific makefile rules. This one's for FreeBSD ++# ++ ++PLATFORM_MCS_FLAGS = ++PLATFORM_RUNTIME = $(RUNTIME) ++PLATFORM_CORLIB = mscorlib.dll ++PLATFORM_TEST_HARNESS_EXCLUDES = ++ ++EXTERNAL_MCS = mcs ++EXTERNAL_MBAS = mbas ++EXTERNAL_RUNTIME = mono ++#ILDISASM = monodis ++ILDISASM = false ++ ++PLATFORM_PATH_SEPARATOR = : ++ ++# Define this if this ever will work on FreeBSD ++# PLATFORM_MAKE_CORLIB_CMP = yes ++ ++# This is for changing / to \ on windows ++PLATFORM_CHANGE_SEPARATOR_CMD = cat ++ ++hidden_prefix = . ++hidden_suffix = ++ ++platform-check: ++ @if [ $(MAKE) != gmake ] ; then \ ++ echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \ ++ exit 1 ; \ ++ fi Index: lang/mono/files/patch-mcs_build_profiles_build.make =================================================================== --- /dev/null +++ lang/mono/files/patch-mcs_build_profiles_build.make @@ -0,0 +1,11 @@ +--- mcs/build/profiles/build.make.orig 2018-02-10 17:42:45 UTC ++++ mcs/build/profiles/build.make +@@ -6,7 +6,7 @@ BUILD_TOOLS_PROFILE = basic + BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC) + MCS = $(BOOTSTRAP_MCS) + +-PLATFORMS = darwin linux win32 ++PLATFORMS = darwin freebsd linux win32 + + # nuttzing! + Index: lang/mono/files/patch-mcs_build_profiles_net__4__x.make =================================================================== --- /dev/null +++ lang/mono/files/patch-mcs_build_profiles_net__4__x.make @@ -0,0 +1,11 @@ +--- mcs/build/profiles/net_4_x.make.orig 2018-02-10 17:42:57 UTC ++++ mcs/build/profiles/net_4_x.make +@@ -5,7 +5,7 @@ BOOTSTRAP_PROFILE = build + BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC) + MCS = $(BOOTSTRAP_MCS) + +-PLATFORMS = darwin linux win32 ++PLATFORMS = darwin freebsd linux win32 + + # nuttzing! + Index: lang/mono/files/patch-mono_eglib_gfile-posix.c =================================================================== --- lang/mono/files/patch-mono_eglib_gfile-posix.c +++ lang/mono/files/patch-mono_eglib_gfile-posix.c @@ -1,6 +1,6 @@ ---- eglib/src/gfile-posix.c.orig 2017-07-20 18:10:59 UTC -+++ eglib/src/gfile-posix.c -@@ -170,7 +170,7 @@ g_get_current_dir (void) +--- mono/eglib/gfile-posix.c.orig 2018-01-10 08:03:25 UTC ++++ mono/eglib/gfile-posix.c +@@ -161,7 +161,7 @@ g_get_current_dir (void) do { buffer = g_realloc (buffer, s); r = getcwd (buffer, s); Index: lang/mono/files/patch-mono_mini_mini-posix.c =================================================================== --- lang/mono/files/patch-mono_mini_mini-posix.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mono/mini/mini-posix.c.orig 2017-07-20 18:10:59 UTC -+++ mono/mini/mini-posix.c -@@ -588,7 +588,7 @@ clock_init (void) - * makes very little sense as we can only use nanosleep () to sleep on - * real time. - */ -- sampling_posix_clock = CLOCK_PROCESS_CPUTIME_ID; -+ sampling_posix_clock = CLOCK_MONOTONIC; - break; - #endif - case MONO_PROFILER_STAT_MODE_REAL: sampling_posix_clock = CLOCK_MONOTONIC; break; Index: lang/mono/files/patch-mono_utils_mono-proclib.c =================================================================== --- lang/mono/files/patch-mono_utils_mono-proclib.c +++ /dev/null @@ -1,16 +0,0 @@ ---- mono/utils/mono-proclib.c.orig 2017-07-20 18:10:59 UTC -+++ mono/utils/mono-proclib.c -@@ -131,11 +131,11 @@ mono_process_list (int *size) - mib [2] = KERN_PROC_ALL; - mib [3] = 0; - -- res = sysctl (mib, 4, NULL, &data_len, NULL, 0); -+ res = sysctl (mib, 3, NULL, &data_len, NULL, 0); - if (res) - return NULL; - processes = (struct kinfo_proc *) g_malloc (data_len); -- res = sysctl (mib, 4, processes, &data_len, NULL, 0); -+ res = sysctl (mib, 3, processes, &data_len, NULL, 0); - if (res < 0) { - g_free (processes); - if (errno != ENOMEM) Index: lang/mono/files/patch-mono_utils_mono-threads.c =================================================================== --- lang/mono/files/patch-mono_utils_mono-threads.c +++ lang/mono/files/patch-mono_utils_mono-threads.c @@ -1,11 +1,20 @@ ---- mono/utils/mono-threads.c.orig 2017-07-20 18:10:59 UTC +--- mono/utils/mono-threads.c.orig 2018-02-09 19:56:13 UTC +++ mono/utils/mono-threads.c -@@ -1243,7 +1243,7 @@ mono_thread_info_sleep (guint32 ms, gboo +@@ -1313,7 +1313,7 @@ mono_thread_info_sleep (guint32 ms, gboo } while (1); } else { int ret; --#if defined (__linux__) && !defined(PLATFORM_ANDROID) -+#if defined(HAVE_CLOCK_NANOSLEEP) && !defined(PLATFORM_ANDROID) +-#if defined (__linux__) && !defined(HOST_ANDROID) ++#if defined (HAVE_CLOCK_NANOSLEEP) && !defined(HOST_ANDROID) struct timespec start, target; /* Use clock_nanosleep () to prevent time drifting problems when nanosleep () is interrupted by signals */ +@@ -1343,7 +1343,7 @@ mono_thread_info_sleep (guint32 ms, gboo + memset (&rem, 0, sizeof (rem)); + ret = nanosleep (&req, &rem); + } while (ret != 0); +-#endif /* __linux__ */ ++#endif /* HAVE_CLOCK_NANOSLEEP */ + } + + MONO_EXIT_GC_SAFE; Index: lang/mono/pkg-plist =================================================================== --- lang/mono/pkg-plist +++ lang/mono/pkg-plist @@ -10,6 +10,7 @@ bin/crlupdate bin/csc bin/csharp +bin/csi bin/disco bin/dmcs bin/dtd2rng @@ -73,7 +74,6 @@ bin/pedump bin/permview bin/peverify -bin/prj2make bin/resgen bin/resgen2 bin/secutil @@ -127,6 +127,7 @@ include/mono-2.0/mono/metadata/mono-gc.h include/mono-2.0/mono/metadata/object.h include/mono-2.0/mono/metadata/opcodes.h +include/mono-2.0/mono/metadata/profiler-events.h include/mono-2.0/mono/metadata/profiler.h include/mono-2.0/mono/metadata/reflection.h include/mono-2.0/mono/metadata/row-indexes.h @@ -154,6 +155,11 @@ lib/libmono-profiler-aot.so lib/libmono-profiler-aot.so.0 lib/libmono-profiler-aot.so.0.0.0 +lib/libmono-profiler-coverage-static.a +lib/libmono-profiler-coverage.a +lib/libmono-profiler-coverage.so +lib/libmono-profiler-coverage.so.0 +lib/libmono-profiler-coverage.so.0.0.0 lib/libmono-profiler-iomap-static.a lib/libmono-profiler-iomap.a lib/libmono-profiler-iomap.so @@ -194,7 +200,7 @@ lib/mono/2.0-api/Mono.C5.dll lib/mono/2.0-api/Mono.CSharp.dll lib/mono/2.0-api/Mono.Cairo.dll -lib/mono/2.0-api/Mono.Cecil.dll +lib/mono/2.0-api/Mono.CodeContracts.dll lib/mono/2.0-api/Mono.CompilerServices.SymbolWriter.dll lib/mono/2.0-api/Mono.Data.Sqlite.dll lib/mono/2.0-api/Mono.Data.Tds.dll @@ -203,13 +209,14 @@ lib/mono/2.0-api/Mono.Management.dll lib/mono/2.0-api/Mono.Messaging.RabbitMQ.dll lib/mono/2.0-api/Mono.Messaging.dll +lib/mono/2.0-api/Mono.Options.dll +lib/mono/2.0-api/Mono.Parallel.dll lib/mono/2.0-api/Mono.Posix.dll lib/mono/2.0-api/Mono.Security.Win32.dll lib/mono/2.0-api/Mono.Security.dll lib/mono/2.0-api/Mono.Simd.dll lib/mono/2.0-api/Mono.Tasklets.dll lib/mono/2.0-api/Mono.WebBrowser.dll -lib/mono/2.0-api/Mono.XBuild.Tasks.dll lib/mono/2.0-api/Novell.Directory.Ldap.dll lib/mono/2.0-api/PEAPI.dll lib/mono/2.0-api/RabbitMQ.Client.dll @@ -255,6 +262,7 @@ lib/mono/2.0-api/System.Xml.Linq.dll lib/mono/2.0-api/System.Xml.dll lib/mono/2.0-api/System.dll +lib/mono/2.0-api/WebMatrix.Data.dll lib/mono/2.0-api/WindowsBase.dll lib/mono/2.0-api/cscompmgd.dll lib/mono/2.0-api/mscorlib.dll @@ -262,7 +270,6 @@ lib/mono/3.5-api/Microsoft.Build.Framework.dll lib/mono/3.5-api/Microsoft.Build.Tasks.v3.5.dll lib/mono/3.5-api/Microsoft.Build.Utilities.v3.5.dll -lib/mono/3.5-api/Mono.XBuild.Tasks.dll lib/mono/4.0-api/Accessibility.dll lib/mono/4.0-api/Commons.Xml.Relaxng.dll lib/mono/4.0-api/CustomMarshalers.dll @@ -286,7 +293,7 @@ lib/mono/4.0-api/Mono.C5.dll lib/mono/4.0-api/Mono.CSharp.dll lib/mono/4.0-api/Mono.Cairo.dll -lib/mono/4.0-api/Mono.Cecil.dll +lib/mono/4.0-api/Mono.CodeContracts.dll lib/mono/4.0-api/Mono.CompilerServices.SymbolWriter.dll lib/mono/4.0-api/Mono.Data.Sqlite.dll lib/mono/4.0-api/Mono.Data.Tds.dll @@ -295,6 +302,8 @@ lib/mono/4.0-api/Mono.Management.dll lib/mono/4.0-api/Mono.Messaging.RabbitMQ.dll lib/mono/4.0-api/Mono.Messaging.dll +lib/mono/4.0-api/Mono.Options.dll +lib/mono/4.0-api/Mono.Parallel.dll lib/mono/4.0-api/Mono.Posix.dll lib/mono/4.0-api/Mono.Security.Win32.dll lib/mono/4.0-api/Mono.Security.dll @@ -360,7 +369,6 @@ lib/mono/4.0-api/WebMatrix.Data.dll lib/mono/4.0-api/WindowsBase.dll lib/mono/4.0-api/cscompmgd.dll -lib/mono/4.0-api/monodoc.dll lib/mono/4.0-api/mscorlib.dll lib/mono/4.0/Mono.Posix.dll lib/mono/4.0/mscorlib.dll @@ -437,7 +445,6 @@ lib/mono/4.5-api/Mono.C5.dll lib/mono/4.5-api/Mono.CSharp.dll lib/mono/4.5-api/Mono.Cairo.dll -lib/mono/4.5-api/Mono.Cecil.dll lib/mono/4.5-api/Mono.CodeContracts.dll lib/mono/4.5-api/Mono.CompilerServices.SymbolWriter.dll lib/mono/4.5-api/Mono.Data.Sqlite.dll @@ -455,7 +462,6 @@ lib/mono/4.5-api/Mono.Simd.dll lib/mono/4.5-api/Mono.Tasklets.dll lib/mono/4.5-api/Mono.WebBrowser.dll -lib/mono/4.5-api/Mono.XBuild.Tasks.dll lib/mono/4.5-api/Novell.Directory.Ldap.dll lib/mono/4.5-api/PEAPI.dll lib/mono/4.5-api/RabbitMQ.Client.dll @@ -545,7 +551,6 @@ lib/mono/4.5-api/WebMatrix.Data.dll lib/mono/4.5-api/WindowsBase.dll lib/mono/4.5-api/cscompmgd.dll -lib/mono/4.5-api/monodoc.dll lib/mono/4.5-api/mscorlib.dll lib/mono/4.5.1-api/Accessibility.dll lib/mono/4.5.1-api/Commons.Xml.Relaxng.dll @@ -620,7 +625,6 @@ lib/mono/4.5.1-api/Mono.C5.dll lib/mono/4.5.1-api/Mono.CSharp.dll lib/mono/4.5.1-api/Mono.Cairo.dll -lib/mono/4.5.1-api/Mono.Cecil.dll lib/mono/4.5.1-api/Mono.CodeContracts.dll lib/mono/4.5.1-api/Mono.CompilerServices.SymbolWriter.dll lib/mono/4.5.1-api/Mono.Data.Sqlite.dll @@ -638,7 +642,6 @@ lib/mono/4.5.1-api/Mono.Simd.dll lib/mono/4.5.1-api/Mono.Tasklets.dll lib/mono/4.5.1-api/Mono.WebBrowser.dll -lib/mono/4.5.1-api/Mono.XBuild.Tasks.dll lib/mono/4.5.1-api/Novell.Directory.Ldap.dll lib/mono/4.5.1-api/PEAPI.dll lib/mono/4.5.1-api/RabbitMQ.Client.dll @@ -728,7 +731,6 @@ lib/mono/4.5.1-api/WebMatrix.Data.dll lib/mono/4.5.1-api/WindowsBase.dll lib/mono/4.5.1-api/cscompmgd.dll -lib/mono/4.5.1-api/monodoc.dll lib/mono/4.5.1-api/mscorlib.dll lib/mono/4.5.2-api/Accessibility.dll lib/mono/4.5.2-api/Commons.Xml.Relaxng.dll @@ -803,7 +805,6 @@ lib/mono/4.5.2-api/Mono.C5.dll lib/mono/4.5.2-api/Mono.CSharp.dll lib/mono/4.5.2-api/Mono.Cairo.dll -lib/mono/4.5.2-api/Mono.Cecil.dll lib/mono/4.5.2-api/Mono.CodeContracts.dll lib/mono/4.5.2-api/Mono.CompilerServices.SymbolWriter.dll lib/mono/4.5.2-api/Mono.Data.Sqlite.dll @@ -821,7 +822,6 @@ lib/mono/4.5.2-api/Mono.Simd.dll lib/mono/4.5.2-api/Mono.Tasklets.dll lib/mono/4.5.2-api/Mono.WebBrowser.dll -lib/mono/4.5.2-api/Mono.XBuild.Tasks.dll lib/mono/4.5.2-api/Novell.Directory.Ldap.dll lib/mono/4.5.2-api/PEAPI.dll lib/mono/4.5.2-api/RabbitMQ.Client.dll @@ -911,7 +911,6 @@ lib/mono/4.5.2-api/WebMatrix.Data.dll lib/mono/4.5.2-api/WindowsBase.dll lib/mono/4.5.2-api/cscompmgd.dll -lib/mono/4.5.2-api/monodoc.dll lib/mono/4.5.2-api/mscorlib.dll lib/mono/4.5/Accessibility.dll lib/mono/4.5/Commons.Xml.Relaxng.dll @@ -1075,7 +1074,10 @@ lib/mono/4.5/Microsoft.Build.xsd lib/mono/4.5/Microsoft.CSharp.dll lib/mono/4.5/Microsoft.CSharp.targets +lib/mono/4.5/Microsoft.CodeAnalysis.CSharp.Scripting.dll lib/mono/4.5/Microsoft.CodeAnalysis.CSharp.dll +lib/mono/4.5/Microsoft.CodeAnalysis.Scripting.dll +lib/mono/4.5/Microsoft.CodeAnalysis.VisualBasic.dll lib/mono/4.5/Microsoft.CodeAnalysis.dll lib/mono/4.5/Microsoft.Common.targets lib/mono/4.5/Microsoft.Common.tasks @@ -1095,6 +1097,7 @@ lib/mono/4.5/Mono.Messaging.dll lib/mono/4.5/Mono.Parallel.dll lib/mono/4.5/Mono.Posix.dll +lib/mono/4.5/Mono.Profiler.Log.dll lib/mono/4.5/Mono.Security.Win32.dll lib/mono/4.5/Mono.Security.dll lib/mono/4.5/Mono.Simd.dll @@ -1199,6 +1202,8 @@ lib/mono/4.5/System.Xml.Serialization.dll lib/mono/4.5/System.Xml.dll lib/mono/4.5/System.dll +lib/mono/4.5/VBCSCompiler.exe +lib/mono/4.5/VBCSCompiler.exe.config lib/mono/4.5/WebMatrix.Data.dll lib/mono/4.5/WindowsBase.dll lib/mono/4.5/al.exe @@ -1227,6 +1232,9 @@ lib/mono/4.5/cscompmgd.dll lib/mono/4.5/csharp.exe lib/mono/4.5/csharp.pdb +lib/mono/4.5/csi.exe +lib/mono/4.5/csi.exe.config +lib/mono/4.5/csi.rsp lib/mono/4.5/culevel.exe lib/mono/4.5/culevel.pdb lib/mono/4.5/disco.exe @@ -1411,6 +1419,7 @@ lib/mono/4.6-api/Microsoft.VisualBasic.dll lib/mono/4.6-api/Microsoft.VisualC.dll lib/mono/4.6-api/Microsoft.Web.Infrastructure.dll +lib/mono/4.6-api/Mono.C5.dll lib/mono/4.6-api/Mono.CSharp.dll lib/mono/4.6-api/Mono.Cairo.dll lib/mono/4.6-api/Mono.CodeContracts.dll @@ -1422,6 +1431,7 @@ lib/mono/4.6-api/Mono.Management.dll lib/mono/4.6-api/Mono.Messaging.RabbitMQ.dll lib/mono/4.6-api/Mono.Messaging.dll +lib/mono/4.6-api/Mono.Options.dll lib/mono/4.6-api/Mono.Parallel.dll lib/mono/4.6-api/Mono.Posix.dll lib/mono/4.6-api/Mono.Security.Win32.dll @@ -1601,6 +1611,7 @@ lib/mono/4.6.1-api/Microsoft.VisualBasic.dll lib/mono/4.6.1-api/Microsoft.VisualC.dll lib/mono/4.6.1-api/Microsoft.Web.Infrastructure.dll +lib/mono/4.6.1-api/Mono.C5.dll lib/mono/4.6.1-api/Mono.CSharp.dll lib/mono/4.6.1-api/Mono.Cairo.dll lib/mono/4.6.1-api/Mono.CodeContracts.dll @@ -1612,6 +1623,7 @@ lib/mono/4.6.1-api/Mono.Management.dll lib/mono/4.6.1-api/Mono.Messaging.RabbitMQ.dll lib/mono/4.6.1-api/Mono.Messaging.dll +lib/mono/4.6.1-api/Mono.Options.dll lib/mono/4.6.1-api/Mono.Parallel.dll lib/mono/4.6.1-api/Mono.Posix.dll lib/mono/4.6.1-api/Mono.Security.Win32.dll @@ -1791,6 +1803,7 @@ lib/mono/4.6.2-api/Microsoft.VisualBasic.dll lib/mono/4.6.2-api/Microsoft.VisualC.dll lib/mono/4.6.2-api/Microsoft.Web.Infrastructure.dll +lib/mono/4.6.2-api/Mono.C5.dll lib/mono/4.6.2-api/Mono.CSharp.dll lib/mono/4.6.2-api/Mono.Cairo.dll lib/mono/4.6.2-api/Mono.CodeContracts.dll @@ -1802,6 +1815,7 @@ lib/mono/4.6.2-api/Mono.Management.dll lib/mono/4.6.2-api/Mono.Messaging.RabbitMQ.dll lib/mono/4.6.2-api/Mono.Messaging.dll +lib/mono/4.6.2-api/Mono.Options.dll lib/mono/4.6.2-api/Mono.Parallel.dll lib/mono/4.6.2-api/Mono.Posix.dll lib/mono/4.6.2-api/Mono.Security.Win32.dll @@ -1981,6 +1995,7 @@ lib/mono/4.7-api/Microsoft.VisualBasic.dll lib/mono/4.7-api/Microsoft.VisualC.dll lib/mono/4.7-api/Microsoft.Web.Infrastructure.dll +lib/mono/4.7-api/Mono.C5.dll lib/mono/4.7-api/Mono.CSharp.dll lib/mono/4.7-api/Mono.Cairo.dll lib/mono/4.7-api/Mono.CodeContracts.dll @@ -1992,6 +2007,7 @@ lib/mono/4.7-api/Mono.Management.dll lib/mono/4.7-api/Mono.Messaging.RabbitMQ.dll lib/mono/4.7-api/Mono.Messaging.dll +lib/mono/4.7-api/Mono.Options.dll lib/mono/4.7-api/Mono.Parallel.dll lib/mono/4.7-api/Mono.Posix.dll lib/mono/4.7-api/Mono.Security.Win32.dll @@ -2186,6 +2202,8 @@ lib/mono/gac/Mono.Parallel/4.0.0.0__0738eb9f132ed756/Mono.Parallel.pdb lib/mono/gac/Mono.Posix/4.0.0.0__0738eb9f132ed756/Mono.Posix.dll lib/mono/gac/Mono.Posix/4.0.0.0__0738eb9f132ed756/Mono.Posix.pdb +lib/mono/gac/Mono.Profiler.Log/4.0.0.0__0738eb9f132ed756/Mono.Profiler.Log.dll +lib/mono/gac/Mono.Profiler.Log/4.0.0.0__0738eb9f132ed756/Mono.Profiler.Log.pdb lib/mono/gac/Mono.Security.Win32/4.0.0.0__0738eb9f132ed756/Mono.Security.Win32.dll lib/mono/gac/Mono.Security.Win32/4.0.0.0__0738eb9f132ed756/Mono.Security.Win32.pdb lib/mono/gac/Mono.Security/4.0.0.0__0738eb9f132ed756/Mono.Security.dll @@ -2421,6 +2439,24 @@ lib/mono/mono-configuration-crypto/4.5/mono-configuration-crypto.exe lib/mono/mono-configuration-crypto/4.5/mono-configuration-crypto.pdb lib/mono/monodoc/monodoc.dll +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CSharp.Core.targets +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.CSharp.dll +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.Scripting.dll +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.VisualBasic.dll +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CodeAnalysis.dll +lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.VisualBasic.Core.targets +lib/mono/msbuild/15.0/bin/Roslyn/System.Collections.Immutable.dll +lib/mono/msbuild/15.0/bin/Roslyn/System.Reflection.Metadata.dll +lib/mono/msbuild/15.0/bin/Roslyn/VBCSCompiler.exe +lib/mono/msbuild/15.0/bin/Roslyn/VBCSCompiler.exe.config +lib/mono/msbuild/15.0/bin/Roslyn/csc.exe +lib/mono/msbuild/15.0/bin/Roslyn/csc.exe.config +lib/mono/msbuild/15.0/bin/Roslyn/csc.rsp +lib/mono/msbuild/15.0/bin/Roslyn/csi.exe +lib/mono/msbuild/15.0/bin/Roslyn/csi.exe.config +lib/mono/msbuild/15.0/bin/Roslyn/csi.rsp lib/mono/xbuild-frameworks/.NETFramework/v2.0/RedistList/FrameworkList.xml lib/mono/xbuild-frameworks/.NETFramework/v3.0/RedistList/FrameworkList.xml lib/mono/xbuild-frameworks/.NETFramework/v3.5/RedistList/FrameworkList.xml @@ -2474,6 +2510,8 @@ lib/mono/xbuild/14.0/bin/xbuild.exe.config lib/mono/xbuild/14.0/bin/xbuild.pdb lib/mono/xbuild/14.0/bin/xbuild.rsp +lib/mono/xbuild/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props +lib/mono/xbuild/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.Build.Tasks.dll lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.Build.Tasks.pdb lib/mono/xbuild/Microsoft/NuGet/Microsoft.NuGet.props @@ -2498,6 +2536,7 @@ lib/mono/xbuild/Microsoft/VisualStudio/v14.0/WebApplications/Microsoft.WebApplication.targets lib/mono/xbuild/Microsoft/VisualStudio/v15.0/WebApplications/Microsoft.WebApplication.targets lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets +lib/mono/xbuild/deniedAssembliesList.txt lib/monodoc/monodoc.xml lib/monodoc/sources/Mono.source lib/monodoc/sources/Mono.tree