From nobody Mon Mar 28 10:24:43 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3D63B1A54933; Mon, 28 Mar 2022 10:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KRpj807K4z3hcK; Mon, 28 Mar 2022 10:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648463084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tT1kIy3F3Jo7S6MdUCNWz+hJ2DIRmz9bP0wNUfZGsPA=; b=F2lPfvZ9csBZ5dbAdIt2d8bnlm1pk5E5Awkt6wzHgAHwQiJQH49qcvL0BuKYolMEnchEiq caKLq++3THFQoivAvP7FUsy/NPBEL5mA5O3W8GVni4x9O5EOUhnjMoI8MeOIaBENX7s1yN SkG4YxG+5o6EYbGlDmRs9YydHoZUzvnZ9+ZlXBuNcPwDZ0pJTquqyluLo8NUa/KsoI26/y gAbtJ/mFW7gmYRyvWJxaYFFDUhOqkppkIl70jxib29QIuZRyNU+Gl95yPDb/rmKMuKcsxL /Gmei4M6ukcDOd0Vh0C0kvlGykjZxnGIZrNqafGx/B/YSHJnEy7f2V8WRKx2IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA0F629; Mon, 28 Mar 2022 10:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SAOhxv082328; Mon, 28 Mar 2022 10:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SAOhO5082327; Mon, 28 Mar 2022 10:24:43 GMT (envelope-from git) Date: Mon, 28 Mar 2022 10:24:43 GMT Message-Id: <202203281024.22SAOhO5082327@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: b62ec370c8d8 - main - lang/mono5.10,lang/mono: Attempt to fix build on aarch64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b62ec370c8d8289c7fe8892a88c4d65eaab92f5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648463084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tT1kIy3F3Jo7S6MdUCNWz+hJ2DIRmz9bP0wNUfZGsPA=; b=enpFkWfrt13WMIx8PrCoX/vxnijFoL9ruyMenD/oaQ77dw9DOZ3xwnjQWPeom+kd2Z8MSE 8bDZkmimEaROMZ8D+eW3EbKEZNbYtK2Y9+6K3BVjbyzm8UWco82TV64GE/GSFKMYImJDKA 6nMeXqBEDSyJhpheqQsUqJIplfdERgaw9nYi0KXo3gcYdYajdECRLXGhlXCAHa3Ix25ZUo VsEq0DD8l9NgAhupV4mlAL2al8MXEVlWvK3KjMpmw/+nlWOt84Gb/ezDkeBciL3sfNZ0zf FVwHIvAlAmmYkdiatQsvB06lVxkVtyjg4BVeZX8QIYsP0m1VoTNb3OaN6o412w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648463084; a=rsa-sha256; cv=none; b=Nlj9BluO5Ni+4IlGzT5t81V3odE2iu8vB0IcEIlGBhNAFl9AjUXHlmfb9sQ+It3h7+ryDJ JqgMHCQm6ihZi5+M1aa21kqsJ+HpuJiSwN8tWDzdrivPhSTCSqMYJQr+2hib4n8yogfvwE Fl/tR6qXVl4sILxtUlJIOYbKz/4iohZpF7vBeK9WDsJaZIk/JTmkhVQBSOxfiWyf20leK6 YmpKp/NoQvIzB51VmqlMSANIj6kfnTjZMTZpdXqvFkI0tUL8fKlk2sU9PE0vHQEzAFZ13F E+imHnTNJmKSRCOeP1fCWKELDf41vHMEReV32R2M8DAdVO5wn4v82eCb88FpUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=b62ec370c8d8289c7fe8892a88c4d65eaab92f5b commit b62ec370c8d8289c7fe8892a88c4d65eaab92f5b Author: Mikael Urankar AuthorDate: 2022-03-28 09:21:02 +0000 Commit: Mikael Urankar CommitDate: 2022-03-28 10:21:05 +0000 lang/mono5.10,lang/mono: Attempt to fix build on aarch64 The Roslyn C# compiler has a concurrency problem on aarch64: https://github.com/mono/mono/issues/7017 (not FreeBSD specific) so the workaround is to disable parallelism… so the .NET libraries are built very very slowly PR: 229710 Approved by: portmgr (build fix blanket) --- lang/mono/Makefile | 1 + .../mono/files/extra-patch-aarch64-race-workaround | 26 ++++++++++++++++++++++ lang/mono5.10/Makefile | 1 + .../files/extra-patch-aarch64-race-workaround | 26 ++++++++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 7003f645a52a..227a8cf9d404 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -66,6 +66,7 @@ OPTIONS_SLAVE= MONOLITE .include .if ${ARCH} == aarch64 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-aarch64-race-workaround PLIST= ${.CURDIR}/pkg-plist.aarch64 .endif diff --git a/lang/mono/files/extra-patch-aarch64-race-workaround b/lang/mono/files/extra-patch-aarch64-race-workaround new file mode 100644 index 000000000000..d7dd165bd609 --- /dev/null +++ b/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) diff --git a/lang/mono5.10/Makefile b/lang/mono5.10/Makefile index 968a3b9107f0..d17bded46c68 100644 --- a/lang/mono5.10/Makefile +++ b/lang/mono5.10/Makefile @@ -67,6 +67,7 @@ OPTIONS_SLAVE= MONOLITE .include .if ${ARCH} == aarch64 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-aarch64-race-workaround PLIST= ${.CURDIR}/pkg-plist.aarch64 .endif diff --git a/lang/mono5.10/files/extra-patch-aarch64-race-workaround b/lang/mono5.10/files/extra-patch-aarch64-race-workaround new file mode 100644 index 000000000000..d7dd165bd609 --- /dev/null +++ b/lang/mono5.10/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)