<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/7d906401b31c446bf01b1835aefcd32ca33547a2">https://github.com/macports/macports-ports/commit/7d906401b31c446bf01b1835aefcd32ca33547a2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7d906401b31c446bf01b1835aefcd32ca33547a2
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Feb 21 18:34:39 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> mono: update version 3.12.1->5.18.0.240
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53320
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/1936
</span>---
devel/mono/Portfile | 73 ++++++++---------------------
devel/mono/files/patch-3.2.5.diff.bz2 | Bin 11614 -> 0 bytes
devel/mono/files/patch-Makefile.in.diff | 11 -----
devel/mono/files/patch-aot-compiler.c.diff | 68 +++++++++++++++++----------
devel/mono/files/patch-no_ccache.diff | 16 +++++++
devel/mono/files/snowleopard-mutex.patch | 22 ---------
6 files changed, 80 insertions(+), 110 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 cf2b226..d155b5e 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;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name mono
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.12.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.18.0.240
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel lang mono
platforms darwin
license {GPL-2 LGPL-2 MIT}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,54 +18,35 @@ master_sites https://download.mono-project.com/sources/mono/
</span> use_bzip2 yes
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c34cb00ab4cf8cd5e2804bde952b3f5fde3cdc17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d8cf153af2948c06bc9fbf5088f6834868e4db8e5f41c7cff76da173732b60d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1636df0001c157e12cc5110e956269302b374f03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 143e80eb00519ff496742e78ee07403a3c3629437f3a498eee539de8108da895 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 246571697
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:coreutils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gawk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-aot-compiler.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!${configure.ccache}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-no_ccache.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ninja \
</span> port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:zlib \
</span> port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgdiplus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Save value of ${configure.cc} for use in patching files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set configure_cc ${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Do NOT pick up external boehmgc (prefixing CPPFLAGS or CFLAGS does not suffice -- ugly++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cc-append "-I${worksrcpath}/libgc/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-gc=included \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-preview=yes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-sigaltstack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libgdiplus=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dtrace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -lintl -lcharset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --enable-nls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-dtrace=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sigaltstack=no \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libgdiplus=${prefix}/lib/libgdiplus.dylib
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles snowleopard-mutex.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${build_arch} == "i386" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "--host=i686-apple-${os.platform}${os.version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>-patchfiles-append patch-aot-compiler.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
if {${os.major} < 9} {
reinplace "s:MAC_OS_X_VERSION_10_5:1050:g" \
${worksrcpath}/libgc/darwin_stop_world.c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/mono/mini/mini-darwin.c \
</span> ${worksrcpath}/mono/utils/mono-sigcontext.h
reinplace "s/arch_state->__/arch_state->/g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +58,7 @@ post-patch {
</span> }
# Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:__MACPORTS_CC__:${configure_cc}:g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:__MACPORTS_CC__:${configure.cc}:g" \
</span> ${worksrcpath}/mono/mini/aot-compiler.c
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,20 +66,6 @@ post-destroot {
</span> set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING.LIB ChangeLog NEWS README.md \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath}/docs assembly-bundle embedded-api exceptions \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gc-issues jit-thoughts jit-trampolines object-layout stack-alignment unmanaged-calls \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} COPYING.LIB NEWS README.md \
</span> ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libgc_docdir ${prefix}/share/doc/ligbc-mono-6.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/share/libgc-mono \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${libgc_docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${libgc_docdir}/html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${libgc_docdir}/*.html] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${libgc_docdir}/html
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/files/patch-3.2.5.diff.bz2 b/devel/mono/files/patch-3.2.5.diff.bz2
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38fd523..0000000
</span>Binary files a/devel/mono/files/patch-3.2.5.diff.bz2 and /dev/null differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/files/patch-Makefile.in.diff b/devel/mono/files/patch-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a9d2be4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/files/patch-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- .//mono/mini/Makefile.in.orig 2015-03-06 10:48:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ .//mono/mini/Makefile.in 2015-10-03 11:21:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2915,7 +2915,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- iltests.il: iltests.il.in Makefile.am
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo '// DO NOT EDIT: This file has been generated from iltests.il.in' > iltests.il
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cpp -Darch=$(arch_define) < $(srcdir)/iltests.il.in | sed 's/^#.*//' >> iltests.il
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CPP) -Darch=$(arch_define) < $(srcdir)/iltests.il.in - | sed 's/^#.*//' >> iltests.il
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %.exe: %.il
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ILASM) -output=$@ $<
</span><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 248fdd2..a02aca8 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,28 +1,48 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/mini/aot-compiler.c.orig 2015-03-06 10:26:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/mini/aot-compiler.c 2015-10-03 11:19:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8600,7 +8600,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define AS_NAME "nacl-as"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(TARGET_OSX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define AS_NAME "clang -c -x assembler"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define AS_NAME "__MACPORTS_CC__ -c -x assembler"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ensure we are UsingTheRightCompiler (https://trac.macports.org/wiki/UsingTheRightCompiler).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ensure we always use -m32/-m64 and -arch for all architectures.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/mini/aot-compiler.c.orig 2019-01-17 00:45:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/mini/aot-compiler.c 2019-02-18 05:59:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11417,12 +11417,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AS_OPTIONS "-xarch=v9"
</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 AS_OPTIONS "-arch i386"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(TARGET_AMD64) && defined(TARGET_MACH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AS_OPTIONS "-arch x86_64"
</span> #else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define AS_NAME "as"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AS_OPTIONS ""
</span> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8612,13 +8612,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(sparc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LD_NAME "ld -shared -G"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(TARGET_OSX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define AS_NAME "clang"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AS_NAME "__MACPORTS_CC__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(TARGET_WIN32_MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define AS_NAME "clang.exe"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11439,11 +11441,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_NAME "ld"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_OPTIONS "-shared -G"
</span> #elif defined(__ppc__) && defined(TARGET_MACH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#define LD_NAME "gcc -dynamiclib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LD_NAME "__MACPORTS_CC__ -dynamiclib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define LD_NAME "gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define LD_OPTIONS "-dynamiclib"
</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 "-m32 -dynamiclib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__ppc64__) && defined(TARGET_MACH)
</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 "-m64 -dynamiclib"
</span> #elif defined(TARGET_AMD64) && defined(TARGET_MACH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#define LD_NAME "clang --shared"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LD_NAME "__MACPORTS_CC__ --shared"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HOST_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define LD_NAME "gcc -shared --dll"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(TARGET_X86) && defined(TARGET_MACH) && !defined(__native_client_codegen__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define LD_NAME "clang -m32 -dynamiclib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define LD_NAME "__MACPORTS_CC__ -m32 -dynamiclib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (acfg->aot_opts.asm_only) {
</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_OPTIONS "--shared"
</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 "-m64 --shared"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(TARGET_WIN32_MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_NAME "link.exe"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_OPTIONS "/DLL /MACHINE:X64 /NOLOGO /INCREMENTAL:NO"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11452,7 +11457,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_NAME "gcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_OPTIONS "-shared"
</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_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 "-m32 -dynamiclib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(TARGET_ARM) && !defined(TARGET_ANDROID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LD_NAME "gcc"
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bc096c1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ccache: error: Failed to create directory /opt/local/var/macports/build/.ccache/tmp: Operation not permitted
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mono/btls/CMakeLists.txt.orig 2019-01-17 00:45:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mono/btls/CMakeLists.txt 2019-02-17 15:18:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,11 +12,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_language(C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_language(CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_program(CCACHE_PROGRAM ccache)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CCACHE_PROGRAM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FIXME: cmake's asm detection is broken when using xcrun.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (CMAKE_ASM_COMPILER "${CMAKE_C_COMPILER}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (CMAKE_ASM_COMPILER_ARG1 "${CMAKE_C_COMPILER_ARG1}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mono/files/snowleopard-mutex.patch b/devel/mono/files/snowleopard-mutex.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 76b7906..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mono/files/snowleopard-mutex.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mono/utils/mono-mutex.c.orig 2013-11-11 08:51:27.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mono/utils/mono-mutex.c 2013-11-11 08:53:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <pthread_spis.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,7 +136,7 @@ This problem was witnessed on OSX in mon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mono_mutex_init_suspend_safe (mono_mutex_t *mutex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && defined(_PTHREAD_MUTEX_POLICY_FIRSTFIT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_mutexattr_t attr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gboolean inited;
</span></pre><pre style='margin:0'>
</pre>