From nobody Fri Oct 14 22:05:08 2022 X-Original-To: dev-commits-ports-main@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 4Mq0n10p9Nz4fS3X; Fri, 14 Oct 2022 22:05:09 +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 4Mq0n100D0z3fbZ; Fri, 14 Oct 2022 22:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665785109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmUjXGD+k0BKhXvxfVs5ZrL5q6LrUylfJT8+0WOvlDw=; b=taOyZDRApVmAfFSC0sv7jD/t3iO/4seoTnCiEY//c9QuHjrB3pCFLUqfIJ/fuVhQqV/bKA uwN+tiov4Iuxgex4ybj7eH71U+H7jiTVER2hI4A7YbfJm2EZwM8sI01a9gHJBRRfFXKFjN yTKv8wLjikN+ETVDMLg8sVToggoTVQggTSGl+v7WD/snR+Hn3U4np5x363OniSX3o/mFc1 Ql4/KnL79eoI2mtboAO33DF6COJOPuBUAgX0+ojqvp2xQxsUIiNNxa7myaczHEIeKkk1oN F2fBIwpr0i1O7PXwk0eVSy2Ep8dXJUOuOSdwH4WKk4wBedh/Kz4P+q+kS/fpHA== 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 4Mq0n065c9zvSN; Fri, 14 Oct 2022 22:05:08 +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 29EM58EY089658; Fri, 14 Oct 2022 22:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29EM58A3089657; Fri, 14 Oct 2022 22:05:08 GMT (envelope-from git) Date: Fri, 14 Oct 2022 22:05:08 GMT Message-Id: <202210142205.29EM58A3089657@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: d402101c0098 - main - Uses/luajit.mk: Set LUAJIT_LUAVER to show the LuaJIT spec version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d402101c00983a7baa723864a5daaa6ad1d0f835 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665785109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qmUjXGD+k0BKhXvxfVs5ZrL5q6LrUylfJT8+0WOvlDw=; b=oxkONRH81+DB/BY8Es6s+7xFSHMMuC4sGmlCG6kPtHoe8ro48F+q7dpLQ4dZPg+SPGzNK2 8nEWXK2p1dYg3yAA+7LoTKetUvCYovAAoq6V6T92L7pe4K3S/jX+Poe2faqLDoIgkMUZw4 zSj2k/+stoY8XQa0s10lrBgj+pK6zO7ikykdbCNnZqHc+fOqdS6luxUZudLdD3GFR75aik xLV+V2I3Q3tluMJ0EMC1Wmi9Rl2bah3IcugnDUQQY4VSiBIsfTycxeGxgeKNLQacbGdNjQ Dsas7aTGZ+uJOYHhsnEHk5NFlVyux+gsV5jC2Y3LfngXLp/oCan0Y7GANzb5HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665785109; a=rsa-sha256; cv=none; b=GIP0Zywc0nmDet3udAWcdocvOpPQI6vPP23Onx+TFNxM+vz6G1QtimrOcpQrcUZ3VSy1x1 vFC1o6wPMImfUPFegMSx/cE1p3fiJg9eO0KgMwMhCFtoL4hyIbJPh/q112kUs8fSwwHjDg PQ1aYA0oSxCWn/qh3fG6sAkYEt/3DMb4KmRJbst7tOyw3wl96TUvQ4lzVKr5X/bD8LJqBf 0Kyf6xtI15dNWqoD8OKYYqOSjYMzEZxRIv9QAKrDolUq+ViFmLQLA9duOfzjcSkKDQt51m 7cSg0Gs0kqPRa1fSdyiWRgsqLop2rNp7fLQgjJyi9xwAPzDP6E4Kxcl179Xn6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=d402101c00983a7baa723864a5daaa6ad1d0f835 commit d402101c00983a7baa723864a5daaa6ad1d0f835 Author: Adam Weinberger AuthorDate: 2022-10-14 22:04:14 +0000 Commit: Adam Weinberger CommitDate: 2022-10-14 22:04:34 +0000 Uses/luajit.mk: Set LUAJIT_LUAVER to show the LuaJIT spec version --- Mk/Uses/luajit.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk index 452370b55de6..c7a15b191209 100644 --- a/Mk/Uses/luajit.mk +++ b/Mk/Uses/luajit.mk @@ -6,6 +6,8 @@ # After bsd.port.options.mk or bsd.port.pre.mk, the following are set: # LUAJIT_VER: The selected luajit version # LUAJIT_INCDIR: The path to luajit's header files +# LUAJIT_LUAVER: Which luajit spec version is selected +# (2.0 for luajit, else 2.1) .if !defined(_INCLUDE_USES_LUAJIT_MK) _INCLUDE_USES_LUAJIT_MK=yes @@ -27,11 +29,12 @@ IGNORE= Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_ .endif .if ${LUAJIT_VER} == luajit -LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-2.0 +LUAJIT_LUAVER= 2.0 .else -LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-2.1 +LUAJIT_LUAVER= 2.1 .endif LIB_DEPENDS+= libluajit-5.1.so:lang/${LUAJIT_VER} +LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-${LUAJIT_LUAVER} .endif