<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bf03ebc424d7f1991a6321afc4c9ffaa684eeaff">https://github.com/macports/macports-ports/commit/bf03ebc424d7f1991a6321afc4c9ffaa684eeaff</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bf03ebc424d7f1991a6321afc4c9ffaa684eeaff
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Tue May 31 08:01:34 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> mono: update to 6.12.0.179
</span>---
devel/mono/Portfile | 17 ++++++++++-------
devel/mono/files/patch-aot-compiler.c.diff | 19 +++++++++++--------
2 files changed, 21 insertions(+), 15 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 cf04c77e5d0..e9679401f74 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;'>@@ -5,14 +5,12 @@ PortGroup legacysupport 1.0
</span>
name mono
# please update msbuild when updating mono
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.12.0.122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.12.0.179
</span> revision 0
epoch 1
subport mono-devel {
version 6.13.0.1235
<span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf.cmd autoreconf -ivf
</span> }
categories devel lang mono
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +23,14 @@ 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;'>- https://download.mono-project.com/sources/mono/nightly/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://download.mono-project.com/sources/mono/nightly/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://download.mono-project.com/sources/mono/preview/
</span> use_xz yes
if {${subport} eq "mono"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 44e1409c86e3fae3ea808cfd894ce8587b620a70 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 292266176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 453a657fe64558c55d4b46c76fc2ceb8d83ed321 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cbf700a76d96a4980386f39c77ab720bf2fc4331228a23ec842f383b49ed3923 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 304388976
</span>
} else {
checksums rmd160 fc54e89a6ecbe0972f4df508877bfbf651b8ff98 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +47,10 @@ if {${subport} eq "mono-devel"} {
</span> }
patchfiles-append dynamic_lookup-11.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# if arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoconf.cmd autoreconf -ivf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {!${configure.ccache}} {
patchfiles-append patch-no_ccache.diff
}
<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 87c9fe63962..61ab630004d 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;'>@@ -1,8 +1,8 @@
</span> Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler).
Ensure we always use -m32/-m64 and -arch for all architectures.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/mini/aot-compiler.c.orig 2019-01-17 00:45:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/mini/aot-compiler.c 2019-02-18 05:59:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12040,6 +12040,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/mini/aot-compiler.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/mini/aot-compiler.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12171,6 +12171,8 @@ compile_asm (MonoAotCompile *acfg)
</span> #define AS_OPTIONS "-xarch=v9"
#elif defined(TARGET_X86) && defined(TARGET_MACH)
#define AS_OPTIONS "-arch i386"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,8 @@ Ensure we always use -m32/-m64 and -arch for all architectures.
</span> +#define AS_OPTIONS "-arch x86_64"
#elif defined(TARGET_X86) && !defined(TARGET_MACH)
#define AS_OPTIONS "--32"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12047,7 +12049,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(TARGET_AMD64) && defined(TARGET_OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12182,7 +12184,7 @@ compile_asm (MonoAotCompile *acfg)
</span> #endif
#if defined(TARGET_OSX)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,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;'>-@@ -12064,11 +12066,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12199,13 +12201,16 @@ compile_asm (MonoAotCompile *acfg)
</span> #define LD_NAME "ld"
#define LD_OPTIONS "-shared -G -Bsymbolic"
#elif defined(__ppc__) && defined(TARGET_MACH)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +36,13 @@ Ensure we always use -m32/-m64 and -arch for all architectures.
</span> -#define LD_OPTIONS "--shared"
+#define LD_NAME "__MACPORTS_CC__"
+#define LD_OPTIONS "-m64 --shared"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(TARGET_ARM64) && defined(TARGET_OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define LD_NAME "clang"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define LD_NAME "__MACPORTS_CC__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_OPTIONS "--shared -arch arm64"
</span> #elif defined(TARGET_WIN32_MSVC)
#define LD_NAME "link.exe"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LD_OPTIONS "/DLL /MACHINE:X64 /NOLOGO /INCREMENTAL:NO"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12077,7 +12082,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12215,7 +12220,7 @@ compile_asm (MonoAotCompile *acfg)
</span> #define LD_NAME "gcc"
#define LD_OPTIONS "-shared -Wl,-Bsymbolic"
#elif defined(TARGET_X86) && defined(TARGET_MACH)
</pre><pre style='margin:0'>
</pre>