From nobody Wed Oct 6 21:07:18 2021 X-Original-To: dev-commits-ports-all@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 1FAEA12D201C; Wed, 6 Oct 2021 21:07:21 +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 4HPn8R4jtGz3FWt; Wed, 6 Oct 2021 21:07:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 98746271E5; Wed, 6 Oct 2021 21:07:18 +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 196L7Iiw049776; Wed, 6 Oct 2021 21:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 196L7IFp049775; Wed, 6 Oct 2021 21:07:18 GMT (envelope-from git) Date: Wed, 6 Oct 2021 21:07:18 GMT Message-Id: <202110062107.196L7IFp049775@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 262c35a9e87f - main - lang/mono: fix build on powerpc List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 262c35a9e87fb319c9999554b3edceb0a9e83c36 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=262c35a9e87fb319c9999554b3edceb0a9e83c36 commit 262c35a9e87fb319c9999554b3edceb0a9e83c36 Author: Piotr Kubaj AuthorDate: 2021-10-06 20:52:33 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-06 20:52:33 +0000 lang/mono: fix build on powerpc - BTLS doesn't work on powerpc, - same pkg-plist fix as for lang/mono6.8, - cast ctx (which is void) to ucontext_t - NetBSD does the same. --- lang/mono/Makefile | 10 +++++++++- lang/mono/files/patch-mono_utils_mono-sigcontext.h | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/lang/mono/Makefile b/lang/mono/Makefile index e8094d46e013..541b96c9dd10 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -46,7 +46,7 @@ USE_LDCONFIG= yes SHEBANG_FILES= scripts/mono-heapviz mono/mini/genmdesc.py mono/tests/test_lldb.py BINARY_ALIAS= python=${PYTHON_CMD} -CONFIGURE_ARGS= --disable-dtrace --enable-btls +CONFIGURE_ARGS= --disable-dtrace CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no MAKE_ENV= MONO_SHARED_DIR="${WRKDIR}" \ @@ -63,6 +63,14 @@ LOCALBASE?= /usr/local OPTIONS_SLAVE= MONOLITE .endif +.include + +.if ${ARCH} == powerpc +PLIST+= ${.CURDIR}/pkg-plist.powerpc +.else +CONFIGURE_ARGS+= --enable-btls +.endif + post-extract-MONOLITE-on: ${MKDIR} ${WRKSRC}/mcs/class/lib/monolite-linux ${MV} ${WRKDIR}/monolite-linux-${MONOLITE_VERSION}-latest ${WRKSRC}/mcs/class/lib/monolite-linux/${MONOLITE_VERSION} diff --git a/lang/mono/files/patch-mono_utils_mono-sigcontext.h b/lang/mono/files/patch-mono_utils_mono-sigcontext.h new file mode 100644 index 000000000000..22cf2458435d --- /dev/null +++ b/lang/mono/files/patch-mono_utils_mono-sigcontext.h @@ -0,0 +1,17 @@ +--- mono/utils/mono-sigcontext.h.orig 2021-10-05 20:43:22.170433000 +0200 ++++ mono/utils/mono-sigcontext.h 2021-10-05 20:43:36.848022000 +0200 +@@ -363,10 +363,10 @@ + #elif defined(__FreeBSD__) + typedef ucontext_t os_ucontext; + +- #define UCONTEXT_REG_Rn(ctx, n) ((ctx)->uc_mcontext.mc_gpr [(n)]) +- #define UCONTEXT_REG_FPRn(ctx, n) ((ctx)->uc_mcontext.mc_fpreg [(n)]) +- #define UCONTEXT_REG_NIP(ctx) ((ctx)->uc_mcontext.mc_srr0) +- #define UCONTEXT_REG_LNK(ctx) ((ctx)->uc_mcontext.mc_lr) ++ #define UCONTEXT_REG_Rn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext.mc_gpr [(n)]) ++ #define UCONTEXT_REG_FPRn(ctx, n) (((os_ucontext*)(ctx))->uc_mcontext.mc_fpreg [(n)]) ++ #define UCONTEXT_REG_NIP(ctx) (((os_ucontext*)(ctx))->uc_mcontext.mc_srr0) ++ #define UCONTEXT_REG_LNK(ctx) (((os_ucontext*)(ctx))->uc_mcontext.mc_lr) + #endif + + #elif defined(TARGET_ARM)