From nobody Mon Nov 14 00:37:09 2022 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 4N9VkZ057sz4d7cT; Mon, 14 Nov 2022 00:37:10 +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 4N9VkY6g8Yz3scD; Mon, 14 Nov 2022 00:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668386229; 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=3VZeVs58NnHmFsmmNGI8VMxt96x8zUwqRoi2nUTmIzY=; b=BJ2p9trHJKSfI19pnl+9SEYwSWTPbT45z9sPdcYJ9Jw6y+1+0RPje81JyuCQmLOQUYW7iJ 9dK6yN9VRBNqjGWhYh6sgODSOXfraFVM6qoNlA/yr36VRnx9C6IG0D3DfxP8wGtWbSk608 /AG4DiGoLrt1FXnycn8tb0curoxY3WabW9F9g24WxSMpOuJdbD3P4wxL7x4Y79eDvHg79d MhMf8WWDciPy6igLnjWPfSa+Qc88P+WOL5gf7ScPwC2D0tA4+eSU7Ld9zkParF0SwDGM26 SqganBDUd9ax8dRV6w67lurn2D18deMmFko+sEE26o37K/3CL1oH9txmzYSeVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668386229; 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=3VZeVs58NnHmFsmmNGI8VMxt96x8zUwqRoi2nUTmIzY=; b=PHk1g9Dxrug6/QKVN5dq0gZISQRTJF7BeVeFIUo/0mtOsekO0uqjAAFgR2OhwT05QScPE7 q52rcWTdp9SeTdnmmDYZfdYKkDObHy1lqUZzp9RlS123vnXAZun04tbUEP1ykI/1x0sGQg tYn8SddxYaviVJsbYJU0W7tnVFoMhX5nWgHQz769qRZYTG1OOKtAPC2IUU7nZeoJI0Y2OV XKKHapiDsuiBZ+GN0WIYGW2UrWtPb+edI4r1jbL2TfodKc47EUD/5f/QUDl423yXH6Zm2q xcWycrBdBcsBMdtgDuX1NfRMyMyLUakSsQKwS5VGYwTkvQ8an4e8Wjh+vvTzfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668386229; a=rsa-sha256; cv=none; b=f8NxpUuojZ8IThQNQpTlEsxmXlLRlBkmorXL1ne3Wa2hMm96rKRsrdkN+WxCdT6WiptxFw Dm2r48hOcoUQNQ4rwa0PaGjm3FPFBdB1MFd88EZYdPx6tIQ0y+8Vo+lovHVWsInuyv/eLQ wSWka1oWECWe0ytBMyRZ4PrTPOXX2wL3RipGtB9LMeMctDV0qrIOhuiNycK+L2A28L+XRV p3dSrIkcrqPPYG1khE03vjy57Cg9nZ4wxn7sntG99eUcafdbXCIXVwE0oFcopzczBSlT7n YlMfWG2xNm5EdYiDj5jpcnvCQMOJ7esd8N3uxnYKTSBr8bHxZUqingFZ698qIw== 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 4N9VkY5hbPzMpM; Mon, 14 Nov 2022 00:37:09 +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 2AE0b9J8016439; Mon, 14 Nov 2022 00:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AE0b9eb016438; Mon, 14 Nov 2022 00:37:09 GMT (envelope-from git) Date: Mon, 14 Nov 2022 00:37:09 GMT Message-Id: <202211140037.2AE0b9eb016438@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: 5a186662c86e - main - sysutils/mprocs: 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: 5a186662c86e5a319330c7d673e5dddabb7a3a2a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a186662c86e5a319330c7d673e5dddabb7a3a2a commit 5a186662c86e5a319330c7d673e5dddabb7a3a2a Author: Piotr Kubaj AuthorDate: 2022-11-14 00:32:05 +0000 Commit: Piotr Kubaj CommitDate: 2022-11-14 00:35:23 +0000 sysutils/mprocs: fix build on powerpc* Similarly to misc/xplr, use the luajit from ports, since: 1. Only openresty fork supports 64-bit PPC. 2. All the luajit ports need to built with GCC. --- sysutils/mprocs/Makefile | 14 +++++++++++++- sysutils/mprocs/files/extra-patch-src_Cargo.toml | 11 +++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sysutils/mprocs/Makefile b/sysutils/mprocs/Makefile index 2dd9e49bc711..37b38b84d896 100644 --- a/sysutils/mprocs/Makefile +++ b/sysutils/mprocs/Makefile @@ -18,10 +18,22 @@ CARGO_INSTALL_PATH= src PLIST_FILES= bin/mprocs +.include + +.if ${ARCH:Mpowerpc64*} +EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_Cargo.toml +LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +.endif + +.if ${ARCH} == powerpc +EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_Cargo.toml +LIB_DEPENDS= libluajit-5.1.so:lang/luajit +.endif + post-patch: @${REINPLACE_CMD} -Ee 's/new\("make"\)/new("gmake")/' ${WRKSRC}/cargo-crates/luajit-src-*/src/lib.rs post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mprocs -.include +.include diff --git a/sysutils/mprocs/files/extra-patch-src_Cargo.toml b/sysutils/mprocs/files/extra-patch-src_Cargo.toml new file mode 100644 index 000000000000..e7fb6605af26 --- /dev/null +++ b/sysutils/mprocs/files/extra-patch-src_Cargo.toml @@ -0,0 +1,11 @@ +--- src/Cargo.toml.orig 2022-11-12 22:57:03 UTC ++++ src/Cargo.toml +@@ -43,7 +43,7 @@ indexmap = { version = "1.8.0", features = ["serde"] } + lazy_static = "1.4.0" + libc = "0.2.120" + log = "0.4.14" +-mlua = { version = "0.8.3", features = ["luajit52", "vendored", "serialize"] } ++mlua = { version = "0.8.3", features = ["luajit52", "serialize"] } + phf = { version = "0.10.1", features = ["macros"] } + portable-pty = { package = "mprocs-pty", path = "../vendor/pty", version = "0.1.0" } + serde = { version = "1.0.136", features = ["derive"] }