Date: Thu, 28 Oct 2021 01:12:28 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8823f793732f - main - lang/Makefile: connect lang/luajit-devel to build Message-ID: <202110280112.19S1CS6e070137@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=8823f793732f8c92235a6332417d53ef4cc361b4 commit 8823f793732f8c92235a6332417d53ef4cc361b4 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2021-10-28 01:10:40 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2021-10-28 01:10:40 +0000 lang/Makefile: connect lang/luajit-devel to build Update CONFLICTS for lang/luajit and lang/luajit-openresty. --- lang/Makefile | 1 + lang/luajit-openresty/Makefile | 2 +- lang/luajit/Makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/Makefile b/lang/Makefile index 146f231d0152..2ab54b67d32a 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -169,6 +169,7 @@ SUBDIR += lua53 SUBDIR += lua54 SUBDIR += luajit + SUBDIR += luajit-devel SUBDIR += luajit-openresty SUBDIR += malbolge SUBDIR += maude diff --git a/lang/luajit-openresty/Makefile b/lang/luajit-openresty/Makefile index 7ff98d7a2a9e..b99e28d6a618 100644 --- a/lang/luajit-openresty/Makefile +++ b/lang/luajit-openresty/Makefile @@ -19,7 +19,7 @@ IGNORE_riscv64= fails to compile: lj_arch.h:73:2: No support for this architect USES= cpe gmake -CONFLICTS_INSTALL= luajit +CONFLICTS_INSTALL= luajit luajit-devel USE_LDCONFIG= yes MAKE_ARGS= CC=${CC} Q= diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile index 0161d641b07a..4d7b7d14fc36 100644 --- a/lang/luajit/Makefile +++ b/lang/luajit/Makefile @@ -18,7 +18,7 @@ IGNORE_aarch64= fails to compile: lj_arch.h:55:2: No support for this architect IGNORE_powerpc64= fails to compile: lj_arch.h:346:2: No support for PowerPC 64 bit mode IGNORE_riscv64= fails to compile: lj_arch.h:55:2: No support for this architecture (yet) -CONFLICTS_INSTALL= luajit-openresty +CONFLICTS_INSTALL= luajit-devel luajit-openresty WRKSRC= ${WRKDIR}/LuaJIT-${DISTVERSION} USES= cpe gmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110280112.19S1CS6e070137>