git: d402101c0098 - main - Uses/luajit.mk: Set LUAJIT_LUAVER to show the LuaJIT spec version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 14 Oct 2022 22:05:08 UTC
The branch main has been updated by adamw:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d402101c00983a7baa723864a5daaa6ad1d0f835
commit d402101c00983a7baa723864a5daaa6ad1d0f835
Author: Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2022-10-14 22:04:14 +0000
Commit: Adam Weinberger <adamw@FreeBSD.org>
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