Relintai/godot-mono-builds
1
0
Fork 0
mirror of https://github.com/Relintai/godot-mono-builds.git synced 2024-11-20 10:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

CI: Mono 6.12.0.198, Python 3.11, use ubuntu-latest

Browse Source 
- Rediff patches against Mono 6.12.0.198.
- Drop `xcode_13_14_fix.diff` which is included upstream in 6.12.0.198.
This commit is contained in:
Rémi Verschelde 2023-05-26 11:36:48 +02:00
parent d496154ab1
commit 6236e2ee74
No known key found for this signature in database
GPG Key ID: C3336907360768E1
14 changed files with 38 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View File

@ -23,8 +23,8 @@ on:
env: env:
# Use SHA or tag instead of the branch for caching purposes. # Use SHA or tag instead of the branch for caching purposes.
MONO_TAG: mono-6.12.0.182 MONO_TAG: mono-6.12.0.198
PYTHON_VERSION: '3.10' PYTHON_VERSION: '3.11'
# Should match the version that Mono supports. # Should match the version that Mono supports.
EMSDK_VERSION: 1.39.9 EMSDK_VERSION: 1.39.9
# platform/iphone/detect.py # platform/iphone/detect.py
@ -523,7 +523,7 @@ jobs:
with: with:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
- name: Setup Emscripten SDK - name: Setup Emscripten SDK
uses: mymindstorm/setup-emsdk@v11 uses: mymindstorm/setup-emsdk@v12
with: with:
version: ${{ env.EMSDK_VERSION }} version: ${{ env.EMSDK_VERSION }}
- name: Patch Mono - name: Patch Mono
@ -733,7 +733,7 @@ jobs:
if: success() && github.event_name == 'create' && startsWith(github.ref, 'refs/heads/release/') if: success() && github.event_name == 'create' && startsWith(github.ref, 'refs/heads/release/')
needs: [linux, windows, osx, ios, ios-cross, android, wasm, bcl] needs: [linux, windows, osx, ios, ios-cross, android, wasm, bcl]
name: Create Release name: Create Release
runs-on: ubuntu-18.04 runs-on: ubuntu-latest
outputs: outputs:
release_upload_url: ${{ steps.create_release.outputs.upload_url }} release_upload_url: ${{ steps.create_release.outputs.upload_url }}
steps: steps:
@ -760,7 +760,7 @@ jobs:
if: success() && github.event_name == 'create' && startsWith(github.ref, 'refs/heads/release/') if: success() && github.event_name == 'create' && startsWith(github.ref, 'refs/heads/release/')
needs: create-release needs: create-release
name: Upload Release Artifacts name: Upload Release Artifacts
runs-on: ubuntu-18.04 runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
artifact_name: [linux-x86, linux-x86_64, windows-x86, windows-x86_64, osx-arm64, osx-x86_64, artifact_name: [linux-x86, linux-x86_64, windows-x86, windows-x86_64, osx-arm64, osx-x86_64,

2
.github/workflows/static_checks.yml vendored
View File

@ -3,7 +3,7 @@ on: [push, pull_request]
jobs: jobs:
build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2

2
README.md
View File

@ -9,7 +9,7 @@ This repository contains scripts for building the Mono runtime to use with Godot
The scripts are tested against specific versions of the toolchains used by Godot. The scripts are tested against specific versions of the toolchains used by Godot.
While they may work with other versions, you might have issues applying patches or compiling, so we recommend using the versions below. While they may work with other versions, you might have issues applying patches or compiling, so we recommend using the versions below.
- Mono: 6.12.0.182. - Mono: 6.12.0.198.
- Emscripten: 1.39.9. - Emscripten: 1.39.9.
- Android NDK: 23.2.8568313 - Android NDK: 23.2.8568313

6
files/patches/bcl-profile-platform-override.diff
View File

@ -3,11 +3,11 @@ index e57a636ef4d..60c60a8fc17 100644
--- a/mcs/build/rules.make --- a/mcs/build/rules.make
+++ b/mcs/build/rules.make +++ b/mcs/build/rules.make
@@ -94,7 +94,7 @@ include $(topdir)/build/config-default.make @@ -94,7 +94,7 @@ include $(topdir)/build/config-default.make
include $(topdir)/build/platforms/$(BUILD_PLATFORM).make include $(topdir)/build/platforms/$(BUILD_PLATFORM).make
-PROFILE_PLATFORM = $(if $(PLATFORMS),$(if $(filter $(PLATFORMS),$(HOST_PLATFORM)),$(HOST_PLATFORM),$(error Unknown platform "$(HOST_PLATFORM)" for profile "$(PROFILE)"))) -PROFILE_PLATFORM = $(if $(PLATFORMS),$(if $(filter $(PLATFORMS),$(HOST_PLATFORM)),$(HOST_PLATFORM),$(error Unknown platform "$(HOST_PLATFORM)" for profile "$(PROFILE)")))
+PROFILE_PLATFORM ?= $(if $(PLATFORMS),$(if $(filter $(PLATFORMS),$(HOST_PLATFORM)),$(HOST_PLATFORM),$(error Unknown platform "$(HOST_PLATFORM)" for profile "$(PROFILE)"))) +PROFILE_PLATFORM ?= $(if $(PLATFORMS),$(if $(filter $(PLATFORMS),$(HOST_PLATFORM)),$(HOST_PLATFORM),$(error Unknown platform "$(HOST_PLATFORM)" for profile "$(PROFILE)")))
PROFILE_DIRECTORY = $(PROFILE)$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM)) PROFILE_DIRECTORY = $(PROFILE)$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))
# Useful # Useful

6
files/patches/btls-cmake-args-linux-mingw.diff
View File

@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 088128e5e74..54693aace64 100644 index 19b20127ca2..d07afde5e05 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -5918,6 +5918,8 @@ if test "x$enable_btls" = "xyes"; then @@ -5924,6 +5924,8 @@ if test "x$enable_btls" = "xyes"; then
if test "x$HAVE_YASM" != "xyes"; then if test "x$HAVE_YASM" != "xyes"; then
BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1" BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
fi fi
@ -11,7 +11,7 @@ index 088128e5e74..54693aace64 100644
;; ;;
esac esac
;; ;;
@@ -5929,6 +5931,8 @@ if test "x$enable_btls" = "xyes"; then @@ -5935,6 +5937,8 @@ if test "x$enable_btls" = "xyes"; then
if test "x$HAVE_YASM" != "xyes"; then if test "x$HAVE_YASM" != "xyes"; then
BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1" BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
fi fi

8
files/patches/btls-cmake-arm64.diff
View File

@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 088128e5e74..235acfe9181 100644 index d07afde5e05..2c052530f2c 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -4921,9 +4921,6 @@ if test "x$target_mach" = "xyes"; then @@ -4927,9 +4927,6 @@ if test "x$target_mach" = "xyes"; then
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_OSX" CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_OSX"
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_OSX" CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_OSX"
target_osx=yes target_osx=yes
@ -12,7 +12,7 @@ index 088128e5e74..235acfe9181 100644
], [ ], [
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS]) AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS" CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
@@ -5942,7 +5939,11 @@ if test "x$enable_btls" = "xyes"; then @@ -5952,7 +5949,11 @@ if test "x$enable_btls" = "xyes"; then
;; ;;
aarch64) aarch64)
btls_arch=aarch64 btls_arch=aarch64
@ -26,7 +26,7 @@ index 088128e5e74..235acfe9181 100644
s390x) s390x)
btls_arch=s390x btls_arch=s390x
diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
index 992f41e4c7f..ee3e956c5b0 100644 index 9946f5d21a4..a8aa3d07b0e 100644
--- a/mono/btls/CMakeLists.txt --- a/mono/btls/CMakeLists.txt
+++ b/mono/btls/CMakeLists.txt +++ b/mono/btls/CMakeLists.txt
@@ -21,6 +21,15 @@ if (MSVC OR CYGWIN) @@ -21,6 +21,15 @@ if (MSVC OR CYGWIN)

8
files/patches/fix-mono-android-tkill.diff
View File

@ -1,8 +1,8 @@
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index ad9b8823f8f..3542b32b540 100644 index 8d6753f2e01..1c1bd460123 100644
--- a/mono/metadata/threads.c --- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c +++ b/mono/metadata/threads.c
@@ -77,8 +77,12 @@ mono_native_thread_join_handle (HANDLE thread_handle, gboolean close_handle); @@ -78,8 +78,12 @@ mono_native_thread_join_handle (HANDLE thread_handle, gboolean close_handle);
#include <zircon/syscalls.h> #include <zircon/syscalls.h>
#endif #endif
@ -18,10 +18,10 @@ index ad9b8823f8f..3542b32b540 100644
#ifdef HOST_ANDROID #ifdef HOST_ANDROID
diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c
index 3e4bf93de5f..79c9f731fe7 100644 index cd32e6b042d..5e2fd4618b8 100644
--- a/mono/utils/mono-threads-posix.c --- a/mono/utils/mono-threads-posix.c
+++ b/mono/utils/mono-threads-posix.c +++ b/mono/utils/mono-threads-posix.c
@@ -31,8 +31,12 @@ @@ -32,8 +32,12 @@
#include <errno.h> #include <errno.h>

10
files/patches/fix-mono-log-spam.diff
View File

@ -1,16 +1,16 @@
diff --git a/mono/metadata/threadpool-io.c b/mono/metadata/threadpool-io.c diff --git a/mono/metadata/threadpool-io.c b/mono/metadata/threadpool-io.c
index fdfef2de91e28..45ac0d84b2429 100644 index a8a947e7dea..b87b59ed5b6 100644
--- a/mono/metadata/threadpool-io.c --- a/mono/metadata/threadpool-io.c
+++ b/mono/metadata/threadpool-io.c +++ b/mono/metadata/threadpool-io.c
@@ -180,6 +180,7 @@ selector_thread_wakeup_drain_pipes (void) @@ -179,6 +179,7 @@ selector_thread_wakeup_drain_pipes (void)
{ {
gchar buffer [128]; gchar buffer [128];
gint received; gint received;
+ static gint warnings_issued = 0; + static gint warnings_issued = 0;
for (;;) { for (;;) {
#if !defined(HOST_WIN32) #if !defined(HOST_WIN32)
@@ -192,11 +193,16 @@ selector_thread_wakeup_drain_pipes (void) @@ -191,11 +192,16 @@ selector_thread_wakeup_drain_pipes (void)
* some unices (like AIX) send ERESTART, which doesn't * some unices (like AIX) send ERESTART, which doesn't
* exist on some other OSes errno * exist on some other OSes errno
*/ */
@ -30,7 +30,7 @@ index fdfef2de91e28..45ac0d84b2429 100644
break; break;
} }
#else #else
@@ -204,8 +210,13 @@ selector_thread_wakeup_drain_pipes (void) @@ -203,8 +209,13 @@ selector_thread_wakeup_drain_pipes (void)
if (received == 0) if (received == 0)
break; break;
if (received == SOCKET_ERROR) { if (received == SOCKET_ERROR) {

6
files/patches/mono-dbg-agent-clear-tls-instead-of-abort.diff
View File

@ -1,10 +1,10 @@
diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index df6329391df..05f30d5b4dc 100644 index 32bfc471ea2..5087405eed5 100644
--- a/mono/mini/debugger-agent.c --- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c +++ b/mono/mini/debugger-agent.c
@@ -4088,8 +4088,12 @@ thread_startup (MonoProfiler *prof, uintptr_t tid) @@ -4172,8 +4172,12 @@ thread_startup (MonoProfiler *prof, uintptr_t tid)
} }
tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id); tls = (DebuggerTlsData *)mono_native_tls_get_value (debugger_tls_id);
- g_assert (!tls); - g_assert (!tls);
- // FIXME: Free this somewhere - // FIXME: Free this somewhere

14
files/patches/mono-linux-disable-mmap-MAP_32BIT.diff
View File

@ -14,17 +14,17 @@ Reference: https://lore.kernel.org/all/20230414185919.4175572-1-Liam.Howlett@ora
2 files changed, 6 deletions(-) 2 files changed, 6 deletions(-)
diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index b321743b67d..0a81bb4bd6b 100644 index a5c03c4877c..536a79ef59d 100644
--- a/mono/mini/mini-amd64.h --- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h +++ b/mono/mini/mini-amd64.h
@@ -390,9 +390,7 @@ typedef struct { @@ -390,9 +390,7 @@ typedef struct {
#endif /* !HOST_WIN32 */ #endif /* !HOST_WIN32 */
-#if !defined(__linux__) -#if !defined(__linux__)
#define MONO_ARCH_NOMAP32BIT 1 #define MONO_ARCH_NOMAP32BIT 1
-#endif -#endif
#ifdef TARGET_WIN32 #ifdef TARGET_WIN32
#define MONO_AMD64_ARG_REG1 AMD64_RCX #define MONO_AMD64_ARG_REG1 AMD64_RCX
diff --git a/mono/utils/mono-codeman.c b/mono/utils/mono-codeman.c diff --git a/mono/utils/mono-codeman.c b/mono/utils/mono-codeman.c
@ -34,14 +34,14 @@ index 234aac4b0ca..5eccda92bd0 100644
@@ -68,11 +68,7 @@ static const MonoCodeManagerCallbacks *code_manager_callbacks; @@ -68,11 +68,7 @@ static const MonoCodeManagerCallbacks *code_manager_callbacks;
#define MAX_WASTAGE 32 #define MAX_WASTAGE 32
#define MIN_BSIZE 32 #define MIN_BSIZE 32
-#ifdef __x86_64__ -#ifdef __x86_64__
-#define ARCH_MAP_FLAGS MONO_MMAP_32BIT -#define ARCH_MAP_FLAGS MONO_MMAP_32BIT
-#else -#else
#define ARCH_MAP_FLAGS 0 #define ARCH_MAP_FLAGS 0
-#endif -#endif
#define MONO_PROT_RWX (MONO_MMAP_READ|MONO_MMAP_WRITE|MONO_MMAP_EXEC|MONO_MMAP_JIT) #define MONO_PROT_RWX (MONO_MMAP_READ|MONO_MMAP_WRITE|MONO_MMAP_EXEC|MONO_MMAP_JIT)
-- --
2.40.1 2.40.1

2
files/patches/mono_ios_asl_log_deprecated.diff
View File

@ -1,5 +1,5 @@
diff --git a/mono/utils/mono-log-darwin.c b/mono/utils/mono-log-darwin.c diff --git a/mono/utils/mono-log-darwin.c b/mono/utils/mono-log-darwin.c
index 3cb127bad59..30ff5edc307 100644 index 2cb41b1481e..4f566ddb90a 100644
--- a/mono/utils/mono-log-darwin.c --- a/mono/utils/mono-log-darwin.c
+++ b/mono/utils/mono-log-darwin.c +++ b/mono/utils/mono-log-darwin.c
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@

2
files/patches/offsets-tool-extra-cflags_new.diff
View File

@ -1,5 +1,5 @@
diff --git a/mono/tools/offsets-tool/offsets-tool.py b/mono/tools/offsets-tool/offsets-tool.py diff --git a/mono/tools/offsets-tool/offsets-tool.py b/mono/tools/offsets-tool/offsets-tool.py
index 35445ba585c..d1586ee5ecd 100644 index f06799cba12..adf7eb4bbd6 100644
--- a/mono/tools/offsets-tool/offsets-tool.py --- a/mono/tools/offsets-tool/offsets-tool.py
+++ b/mono/tools/offsets-tool/offsets-tool.py +++ b/mono/tools/offsets-tool/offsets-tool.py
@@ -54,6 +54,7 @@ class OffsetsTool: @@ -54,6 +54,7 @@ class OffsetsTool:

59
files/patches/xcode_13_14_fix.diff
View File

@ -1,59 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 088128e5e74..19b20127ca2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3308,6 +3308,12 @@ if test x$host_win32 = xno; then
dnl ******************************************
AC_CHECK_HEADERS(CommonCrypto/CommonDigest.h)
+ AC_CHECK_MEMBER(struct objc_super.super_class,
+ [AC_DEFINE(HAVE_OBJC_SUPER_SUPER_CLASS, 1, [struct objc_super.super_class])],
+ [],
+ [#include <objc/runtime.h>
+ #include <objc/message.h>])
+
dnl *********************************
dnl *** Check for Console 2.0 I/O ***
dnl *********************************
diff --git a/mono/metadata/w32process-unix-osx.c b/mono/metadata/w32process-unix-osx.c
index 2568a44223e..f320e270c39 100644
--- a/mono/metadata/w32process-unix-osx.c
+++ b/mono/metadata/w32process-unix-osx.c
@@ -183,12 +183,19 @@ mono_dyld_image_info_free (void *info)
static void
image_added (const struct mach_header *hdr32, intptr_t vmaddr_slide)
{
+#if defined(__APPLE__) && defined(__clang__) // getsectbynamefromheader functions are deprecated as of macOS 13.0
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
#if SIZEOF_VOID_P == 8
const struct mach_header_64 *hdr64 = (const struct mach_header_64 *)hdr32;
const struct section_64 *sec = getsectbynamefromheader_64 (hdr64, SEG_DATA, SECT_DATA);
#else
const struct section *sec = getsectbynamefromheader (hdr32, SEG_DATA, SECT_DATA);
#endif
+#if defined(__APPLE__) && defined(__clang__)
+#pragma clang diagnostic pop
+#endif
Dl_info dlinfo;
if (!dladdr (hdr32, &dlinfo)) return;
if (sec == NULL) return;
diff --git a/mono/utils/mono-threads-mach-helper.c b/mono/utils/mono-threads-mach-helper.c
index 7b4f140b619..0a2ff341fc4 100644
--- a/mono/utils/mono-threads-mach-helper.c
+++ b/mono/utils/mono-threads-mach-helper.c
@@ -59,10 +59,10 @@ mono_dead_letter_dealloc (id self, SEL _cmd)
{
struct objc_super super;
super.receiver = self;
-#if !defined(__cplusplus) && !__OBJC2__
- super.class = nsobject;
-#else
+#if defined(__cplusplus) || defined(HAVE_OBJC_SUPER_SUPER_CLASS)
super.super_class = nsobject;
+#else
+ super.class = nsobject;
#endif
void (*objc_msgSendSuper_op)(struct objc_super *, SEL) = (void (*)(struct objc_super *, SEL)) objc_msgSendSuper;
objc_msgSendSuper_op (&super, dealloc);

1
patch_mono.py
View File

@ -34,7 +34,6 @@ def main(raw_args):
'wasm_m2n_trampolines_hook.diff', 'wasm_m2n_trampolines_hook.diff',
'btls-cmake-args-linux-mingw.diff', 'btls-cmake-args-linux-mingw.diff',
'btls-cmake-arm64.diff', 'btls-cmake-arm64.diff',
'xcode_13_14_fix.diff',
'mono-linux-disable-mmap-MAP_32BIT.diff', 'mono-linux-disable-mmap-MAP_32BIT.diff',
] ]