From nobody Tue Oct 12 19:07:00 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 BF25C12DB986; Tue, 12 Oct 2021 19:07:00 +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 4HTQBr3Flhz4Wn0; Tue, 12 Oct 2021 19:07:00 +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 4985619A6E; Tue, 12 Oct 2021 19:07:00 +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 19CJ70Z4020105; Tue, 12 Oct 2021 19:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19CJ70Ku020104; Tue, 12 Oct 2021 19:07:00 GMT (envelope-from git) Date: Tue, 12 Oct 2021 19:07:00 GMT Message-Id: <202110121907.19CJ70Ku020104@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: 06f9c78487fc - main - misc/xplr: fix build on powerpc64* 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: 06f9c78487fc70bb9eb877890f936e03112d33d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=06f9c78487fc70bb9eb877890f936e03112d33d3 commit 06f9c78487fc70bb9eb877890f936e03112d33d3 Author: Piotr Kubaj AuthorDate: 2021-10-12 18:37:09 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-12 18:37:09 +0000 misc/xplr: fix build on powerpc64* Since luajit doesn't work on powerpc64*, use system luajit-openresty. --- misc/xplr/Makefile | 7 +++++++ misc/xplr/files/extra-patch-Cargo.toml | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/misc/xplr/Makefile b/misc/xplr/Makefile index ef098e3f0f02..ef3b819b919f 100644 --- a/misc/xplr/Makefile +++ b/misc/xplr/Makefile @@ -145,6 +145,13 @@ OPTIONS_DEFINE= DOCS EXAMPLES _ASSETS= ${WRKSRC}/assets _ICONS= ${STAGEDIR}${PREFIX}/share/icons/hicolor +.include + +.if ${ARCH:Mpowerpc64*} +EXTRA_PATCHES= ${FILESDIR}/extra-patch-Cargo.toml +LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +.endif + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/misc/xplr/files/extra-patch-Cargo.toml b/misc/xplr/files/extra-patch-Cargo.toml new file mode 100644 index 000000000000..f69fe3c97295 --- /dev/null +++ b/misc/xplr/files/extra-patch-Cargo.toml @@ -0,0 +1,11 @@ +--- Cargo.toml.orig 2021-10-11 23:08:59 UTC ++++ Cargo.toml +@@ -30,7 +30,7 @@ lazy_static = "1.4.0" + indexmap = { version = "1.7.0", features = ["serde"] } + natord = "1.0.9" + humansize = "1.1.1" +-mlua = { version = "0.6.4", features = ["luajit", "vendored", "serialize", "send"] } ++mlua = { version = "0.6.4", features = ["luajit", "serialize", "send"] } + ansi-to-tui = "0.4.1" + libc = "0.2.103" +