From nobody Tue Aug 08 11:22:37 2023 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 4RKrQ546vlz4mCHr; Tue, 8 Aug 2023 11:22:37 +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 4RKrQ53YDlz4cl0; Tue, 8 Aug 2023 11:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691493757; 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=sqpqHsPbh1IZ8iDzuC8RF33f9U9rmvHUbxp/kynEAxY=; b=B/d+qQq/K0d1f2dDlrEYqyKPOLlpK/nL1yS7hhKqMpZIOjQdhd/NHcVPfxEgSE6Jllsz0c OTmsZak8MPIHvvpCMcClWW9T/NJdDl45CxaLzty9b0TZ554narWSwGM2/+illWjr9YE1wX jrBi1XbnDwisSMTZvCB0oahqy/ySxMx7E47x/SjsuyKCQ9NIJHgi8CZ1B4UJlyU+u+GLNA xCcLhxOoybSP6hlrrNQdQyZHru4hR0uQykkTIp3Qmxn66R4c7wR670/ZyDKwLG2SNX3aww lGnFz//xeTVZinWLnDwwMx3bnHxn8FzHpHfG0GWxsNWURur2mOLvyeIRuQiQkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691493757; 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=sqpqHsPbh1IZ8iDzuC8RF33f9U9rmvHUbxp/kynEAxY=; b=EREFBwo1N66WzEpgMQMoc+Qs1K/7AAV1rideKStdRqddFOfVcQ8lzx9E06fRrEviu/gu0M IogskyEJ5WxAAzkIDlFWXukZ2vp9sopfbSlXLgnHO0QMSBmHmhxtz1ZmlGaLhWkFulqBqs KCEJraPW6r6Yj3ks78yVPen3xhTqXUTsA8V2/zgcB+QX31sqVDRWRM637UT2bsqnDzxgqS JLtJDh65qpSjSHwudsEWK399vKiaZBSHQQl+hidcEwnPow1fYwq7qns2WYLyQ96bfPw7Ln fM637rOJC1/qKTadvydEVJptsyZkEI9IO9Z5PGjdM6q7cFg5ml8X7PGmQJaxSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691493757; a=rsa-sha256; cv=none; b=hVmW7qNdwC8xssiXD/TA7sJ/eLht+iDA3FjuXvLTVrgYPvGCpvTwxFYuDSB5qc0Fk7pGGT fcOtjUVYJw+O2CC8H582uWqb6QRWvqHtJDIKXX05o5/WoXpfNJdpR0KrYvYaMQIlmAWSoX AoLqMRc4Y48G2d3q6DRJsQWU73ZwCiAFRN3aPKcibSd6nFuulahMNY2ZJodtxsPcMDrMgA +8uPaC5F50yDoN1ukaLPUPKM9xgbdmeuXl703Eeuc3ps9fPFFbgCTQFjojAA4ppUd2bCMz 8LSG9CvuP7h2xrXLubwhT4B6NXGZsN2cjupLmKBuyC7733UAjTBzCo9v/dnEzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKrQ52bxPzXsw; Tue, 8 Aug 2023 11:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378BMbhG025367; Tue, 8 Aug 2023 11:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378BMbdX025366; Tue, 8 Aug 2023 11:22:37 GMT (envelope-from git) Date: Tue, 8 Aug 2023 11:22:37 GMT Message-Id: <202308081122.378BMbdX025366@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 47a148ae6aa0 - main - lang/mono5.10: sync with lang/mono 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47a148ae6aa0a0940df0e3308560b1b5dc428eae Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=47a148ae6aa0a0940df0e3308560b1b5dc428eae commit 47a148ae6aa0a0940df0e3308560b1b5dc428eae Author: Jan Beich AuthorDate: 2023-08-08 10:50:35 +0000 Commit: Jan Beich CommitDate: 2023-08-08 11:16:44 +0000 lang/mono5.10: sync with lang/mono --- lang/mono5.10/Makefile | 5 ++++- lang/mono5.10/files/patch-mono_mini_exceptions-ppc.c | 11 +++++++++++ lang/mono5.10/files/patch-mono_mini_mini-x86.h | 11 +++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/lang/mono5.10/Makefile b/lang/mono5.10/Makefile index d3939c92ac63..a06d91cff523 100644 --- a/lang/mono5.10/Makefile +++ b/lang/mono5.10/Makefile @@ -1,6 +1,6 @@ PORTNAME= mono PORTVERSION= 5.10.1.57 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= https://download.mono-project.com/sources/mono/ PKGNAMESUFFIX= 5.10 @@ -14,6 +14,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le +.ifdef QEMU_EMULATING +BROKEN= fails to build +.endif BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \ bash:shells/bash \ diff --git a/lang/mono5.10/files/patch-mono_mini_exceptions-ppc.c b/lang/mono5.10/files/patch-mono_mini_exceptions-ppc.c new file mode 100644 index 000000000000..477ff908793e --- /dev/null +++ b/lang/mono5.10/files/patch-mono_mini_exceptions-ppc.c @@ -0,0 +1,11 @@ +--- mono/mini/exceptions-ppc.c.orig 2023-03-18 12:46:51 UTC ++++ mono/mini/exceptions-ppc.c +@@ -809,7 +809,7 @@ mono_arch_setup_async_callback (MonoContext *ctx, void + { + uintptr_t sp = (uintptr_t) MONO_CONTEXT_GET_SP(ctx); + sp -= PPC_MINIMAL_STACK_SIZE; +- *(unsigned long *)sp = MONO_CONTEXT_GET_SP(ctx); ++ *(unsigned long *)sp = (unsigned long)MONO_CONTEXT_GET_SP(ctx); + MONO_CONTEXT_SET_BP(ctx, sp); + MONO_CONTEXT_SET_IP(ctx, (unsigned long) async_cb); + } diff --git a/lang/mono5.10/files/patch-mono_mini_mini-x86.h b/lang/mono5.10/files/patch-mono_mini_mini-x86.h new file mode 100644 index 000000000000..d804a58edb74 --- /dev/null +++ b/lang/mono5.10/files/patch-mono_mini_mini-x86.h @@ -0,0 +1,11 @@ +--- mono/mini/mini-x86.h.orig 2018-08-24 15:17:13 UTC ++++ mono/mini/mini-x86.h +@@ -139,7 +139,7 @@ struct MonoLMF { + * If the second lowest bit is set to 1, then this is a MonoLMFExt structure, and + * the other fields are not valid. + */ +- guint32 previous_lmf; ++ gpointer previous_lmf; + gpointer lmf_addr; + /* Only set in trampoline LMF frames */ + MonoMethod *method;