<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cce5626be95c0c2632a9921d47113aa73eedbad5">https://github.com/macports/macports-ports/commit/cce5626be95c0c2632a9921d47113aa73eedbad5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cce5626be95c0c2632a9921d47113aa73eedbad5
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Aug 1 06:50:33 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> mono: update version 5.20.1.19->6.0.0.313
</span>---
devel/mono/Portfile | 15 ++++++++-------
devel/mono/files/patch-aot-compiler.c.diff | 14 ++++++++------
devel/mono/files/patch-no_ccache.diff | 6 +++---
3 files changed, 19 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/Portfile b/devel/mono/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8c7736..924d55e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mono/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup legacysupport 1.0
</span>
name mono
# please update msbuild when updating mono
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.20.1.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0.0.313
</span> revision 0
epoch 1
categories devel lang mono
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,12 +19,12 @@ long_description Mono is an effort to create an open source implementatio
</span>
homepage https://www.mono-project.com/
master_sites https://download.mono-project.com/sources/mono/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tar.xz
</span> universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9df6ec7e93f0c6ac19342b87ba4cd9dc7c676669 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0574b61efb9bfc3364211d03d87a12c91dc7b03e8d6242cd4d8d953ef145d468 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 246790204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 801e5128561d2e95a6736cdfce040d8850be4e2f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a946e91d7da3f90b5e7cbbdf27adfa2f57ddb09b199dfc4d6d3bc05eb0690c50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 218124872
</span>
patchfiles-append patch-aot-compiler.c.diff
if {!${configure.ccache}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,8 @@ depends_build port:cmake \
</span>
depends_lib port:zlib \
port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:kerberos5
</span>
configure.args --enable-nls \
--enable-dtrace=no \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +64,7 @@ post-patch {
</span> ${worksrcpath}/mono/utils/mach-support-x86.c
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
</span> reinplace "s:__MACPORTS_CC__:${configure.cc}:g" \
${worksrcpath}/mono/mini/aot-compiler.c
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/files/patch-aot-compiler.c.diff b/devel/mono/files/patch-aot-compiler.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4aba95c..49d6ef0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/files/patch-aot-compiler.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mono/files/patch-aot-compiler.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,14 +2,16 @@ Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRigh
</span> Ensure we always use -m32/-m64 and -arch for all architectures.
--- mono/mini/aot-compiler.c.orig 2019-01-17 00:45:20.000000000 -0700
+++ mono/mini/aot-compiler.c 2019-02-18 05:59:15.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11420,12 +11420,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11696,6 +11696,8 @@
</span> #define AS_OPTIONS "-xarch=v9"
#elif defined(TARGET_X86) && defined(TARGET_MACH)
#define AS_OPTIONS "-arch i386"
+#elif defined(TARGET_AMD64) && defined(TARGET_MACH)
+#define AS_OPTIONS "-arch x86_64"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(TARGET_X86) && !defined(TARGET_MACH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AS_OPTIONS "--32"
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define AS_OPTIONS ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11703,7 +11705,7 @@
</span> #endif
#if defined(TARGET_OSX)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +20,7 @@ Ensure we always use -m32/-m64 and -arch for all architectures.
</span> #elif defined(TARGET_WIN32_MSVC)
#define AS_NAME "clang.exe"
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11442,11 +11444,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11720,11 +11722,14 @@
</span> #define LD_NAME "ld"
#define LD_OPTIONS "-shared -G"
#elif defined(__ppc__) && defined(TARGET_MACH)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,12 +39,12 @@ Ensure we always use -m32/-m64 and -arch for all architectures.
</span> #elif defined(TARGET_WIN32_MSVC)
#define LD_NAME "link.exe"
#define LD_OPTIONS "/DLL /MACHINE:X64 /NOLOGO /INCREMENTAL:NO"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11455,7 +11460,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11733,7 +11738,7 @@
</span> #define LD_NAME "gcc"
#define LD_OPTIONS "-shared"
#elif defined(TARGET_X86) && defined(TARGET_MACH)
-#define LD_NAME "clang"
+#define LD_NAME "__MACPORTS_CC__"
#define LD_OPTIONS "-m32 -dynamiclib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(TARGET_ARM) && !defined(TARGET_ANDROID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LD_NAME "gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(TARGET_X86) && !defined(TARGET_MACH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_OPTIONS "-m elf_i386"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/files/patch-no_ccache.diff b/devel/mono/files/patch-no_ccache.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bc096c1..68ddde5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/files/patch-no_ccache.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mono/files/patch-no_ccache.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +11,6 @@ Avoid
</span> - set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-endif()
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # FIXME: cmake's asm detection is broken when using xcrun.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set (CMAKE_ASM_COMPILER_ARG1 "${CMAKE_C_COMPILER_ARG1}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (MSVC OR CYGWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BTLS_HOST_WIN32 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span></pre><pre style='margin:0'>
</pre>