Attachment 231381 Details for Bug 261332 – git diff from mikael@ originally from PR 229710

[patch] git diff from mikael@ originally from PR 229710

file_261332.txt (text/plain), 2.34 KB, created by Dave Cottlehuber on 2022-01-27 10:16:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2022-01-27 10:16:45 UTC

Size: 2.34 KB

patch

obsolete

>commit 0666d08da704bd782a5347e03db90aa4d981c5c8
>Author: Dave Cottlehuber <dch@FreeBSD.org>
>Date:   Thu Jan 27 08:40:09 2022 +0000
>
>    lang/mono: fix build on aarch64
>
>diff --git lang/mono/Makefile lang/mono/Makefile
>index 7003f645a52a..7c8fe62872de 100644
>--- lang/mono/Makefile
>+++ lang/mono/Makefile
>@@ -66,6 +66,7 @@ OPTIONS_SLAVE=	MONOLITE
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == aarch64
>+EXTRA_PATCHES= ${FILESDIR}/extra-patch-aarch64-race-workaround
> PLIST=	${.CURDIR}/pkg-plist.aarch64
> .endif
> 
>diff --git lang/mono/files/extra-patch-aarch64-race-workaround lang/mono/files/extra-patch-aarch64-race-workaround
>new file mode 100644
>index 000000000000..d7dd165bd609
>--- /dev/null
>+++ lang/mono/files/extra-patch-aarch64-race-workaround
>@@ -0,0 +1,26 @@
>+https://bugs.freebsd.org/bugzilla/attachment.cgi?id=195063&action=diff#i/lang/mono/files/extra-patch-aarch64-race-workaround_sec1
>+
>+Workaround for Roslyn crash: https://github.com/mono/mono/issues/7017
>+
>+--- mcs/build/profiles/basic.make.orig	2021-11-08 19:42:34.845483000 +0100
>++++ mcs/build/profiles/basic.make	2021-11-08 19:43:00.996003000 +0100
>+@@ -47,7 +47,7 @@ LIBRARY_COMPILE = $(BOOT_COMPILE)
>+ #
>+ # Copy from rules.make because I don't know how to unset MCS_FLAGS
>+ #
>+-USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
>++USE_MCS_FLAGS = /codepage:$(CODEPAGE) /parallel- /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
>+ 
>+ .PHONY: profile-check do-profile-check
>+ profile-check:
>+--- mcs/build/rules.make.orig	2021-11-08 19:43:05.777570000 +0100
>++++ mcs/build/rules.make	2021-11-08 19:43:20.886314000 +0100
>+@@ -34,7 +34,7 @@ BUILD_TOOLS_PROFILE = build
>+ endif
>+ endif
>+ 
>+-USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
>++USE_MCS_FLAGS = /codepage:$(CODEPAGE) /parallel- /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
>+ USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
>+ USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
>+ CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)

Actions: View | Diff

Attachments on bug 261332: 231381