From nobody Thu Oct 28 01:12:28 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 C96041812365; Thu, 28 Oct 2021 01:12:28 +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 4Hfnbc4QTdz4qrR; Thu, 28 Oct 2021 01:12:28 +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 69C351A940; Thu, 28 Oct 2021 01:12:28 +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 19S1CSC4070138; Thu, 28 Oct 2021 01:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S1CS6e070137; Thu, 28 Oct 2021 01:12:28 GMT (envelope-from git) Date: Thu, 28 Oct 2021 01:12:28 GMT Message-Id: <202110280112.19S1CS6e070137@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 8823f793732f - main - lang/Makefile: connect lang/luajit-devel to build 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8823f793732f8c92235a6332417d53ef4cc361b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=8823f793732f8c92235a6332417d53ef4cc361b4 commit 8823f793732f8c92235a6332417d53ef4cc361b4 Author: Sergey A. Osokin AuthorDate: 2021-10-28 01:10:40 +0000 Commit: Sergey A. Osokin 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