Date: Fri, 9 Jun 2023 18:44:25 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 051bd1477e29 - main - misc/xplr: again fix build on powerpc* Message-ID: <202306091844.359IiPt4056237@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=051bd1477e296db3279123dea1c69da1b811d6f0 commit 051bd1477e296db3279123dea1c69da1b811d6f0 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2023-06-09 18:42:28 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2023-06-09 18:44:22 +0000 misc/xplr: again fix build on powerpc* Also move the luajit dependency to be global to prevent further breakages, following multiple fixes by improper port updating. Per port tree policy, ports should not bundle their own dependencies anyway. --- misc/xplr/Makefile | 11 ++--------- misc/xplr/files/{extra-patch-Cargo.toml => patch-Cargo.toml} | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/misc/xplr/Makefile b/misc/xplr/Makefile index a292c1f5c565..0ac3577bb650 100644 --- a/misc/xplr/Makefile +++ b/misc/xplr/Makefile @@ -1,7 +1,7 @@ PORTNAME= xplr DISTVERSIONPREFIX= v DISTVERSION= 0.21.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MAINTAINER= lcook@FreeBSD.org @@ -11,7 +11,7 @@ WWW= https://xplr.dev LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cargo compiler desktop-file-utils gmake +USES= cargo compiler desktop-file-utils gmake luajit USE_GITHUB= yes GH_ACCOUNT= sayanarijit @@ -26,13 +26,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES _ASSETS= ${WRKSRC}/assets _ICONS= ${STAGEDIR}${PREFIX}/share/icons/hicolor -.include <bsd.port.options.mk> - -.if ${ARCH:Mpowerpc64*} -EXTRA_PATCHES= ${FILESDIR}/extra-patch-Cargo.toml -LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty -.endif - .include <bsd.port.pre.mk> .if ${ARCH} == powerpc && ${COMPILER_VERSION} < 140 diff --git a/misc/xplr/files/extra-patch-Cargo.toml b/misc/xplr/files/patch-Cargo.toml similarity index 64% rename from misc/xplr/files/extra-patch-Cargo.toml rename to misc/xplr/files/patch-Cargo.toml index 5dcc699179a5..1b6f2ef71c1e 100644 --- a/misc/xplr/files/extra-patch-Cargo.toml +++ b/misc/xplr/files/patch-Cargo.toml @@ -1,9 +1,9 @@ ---- Cargo.toml.orig 2023-03-25 06:02:33 UTC +--- Cargo.toml.orig 2023-05-22 04:45:42 UTC +++ Cargo.toml -@@ -70,7 +70,7 @@ features = ['serde'] +@@ -72,7 +72,7 @@ features = ['serde'] [dependencies.mlua] - version = "0.8.8" + version = "0.8.9" -features = ['luajit', 'vendored', 'serialize', 'send'] +features = ['luajit', 'serialize', 'send']
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306091844.359IiPt4056237>