diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2021-10-28 01:10:40 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2021-10-28 01:10:40 +0000 |
| commit | 8823f793732f8c92235a6332417d53ef4cc361b4 (patch) | |
| tree | c2a1db0566c1ecabde7e6bd1352c1f487b6e9827 | |
| parent | 4fec652f2efb9f18b16a84028dd9a3d17a71589b (diff) | |
| download | ports-8823f793732f8c92235a6332417d53ef4cc361b4.tar.gz ports-8823f793732f8c92235a6332417d53ef4cc361b4.zip | |
lang/Makefile: connect lang/luajit-devel to build
Update CONFLICTS for lang/luajit and lang/luajit-openresty.
| -rw-r--r-- | lang/Makefile | 1 | ||||
| -rw-r--r-- | lang/luajit-openresty/Makefile | 2 | ||||
| -rw-r--r-- | 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 |