[pkgsrc/trunk]: pkgsrc/lang lua: move cmake bits to per-interpreter buildlink3s

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b4037406765
branches:  trunk
changeset: 435255:0b4037406765
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Jul 02 21:42:23 2020 +0000

description:
lua: move cmake bits to per-interpreter buildlink3s

diffstat:

 lang/lua/luaversion.mk   |  10 +---------
 lang/lua51/buildlink3.mk |  10 +++++++++-
 lang/lua52/buildlink3.mk |  10 +++++++++-
 lang/lua53/buildlink3.mk |  10 +++++++++-
 lang/lua54/buildlink3.mk |  10 +++++++++-
 5 files changed, 37 insertions(+), 13 deletions(-)

diffs (118 lines):

diff -r 621a4cbbd76a -r 0b4037406765 lang/lua/luaversion.mk
--- a/lang/lua/luaversion.mk    Thu Jul 02 21:41:07 2020 +0000
+++ b/lang/lua/luaversion.mk    Thu Jul 02 21:42:23 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: luaversion.mk,v 1.13 2020/07/02 20:43:26 nia Exp $
+# $NetBSD: luaversion.mk,v 1.14 2020/07/02 21:42:23 nia Exp $
 
 # This file determins which Lua version is used as a dependency for
 # a package.
@@ -164,12 +164,4 @@
 LUA_INTERPRETER=       ${LOCALBASE}/bin/lua${_LUA_DOT_VERSION}
 LUA_COMPILER=          ${LOCALBASE}/bin/luac${_LUA_DOT_VERSION}
 
-.if defined(USE_CMAKE)
-# used by FindLua.cmake
-CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
-CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
-CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=${LUA_VERSION_MAJOR}
-CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=${LUA_VERSION_MINOR}
-.endif
-
 .endif  # LUA_LUAVERSION_MK
diff -r 621a4cbbd76a -r 0b4037406765 lang/lua51/buildlink3.mk
--- a/lang/lua51/buildlink3.mk  Thu Jul 02 21:41:07 2020 +0000
+++ b/lang/lua51/buildlink3.mk  Thu Jul 02 21:42:23 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua51
 
@@ -16,6 +16,14 @@
 BUILDLINK_TRANSFORM+=          l:lua:lua5.1
 BUILDLINK_INCDIRS.lua51+=      include/lua-5.1
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=1
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA51_BUILDLINK3_MK
 
diff -r 621a4cbbd76a -r 0b4037406765 lang/lua52/buildlink3.mk
--- a/lang/lua52/buildlink3.mk  Thu Jul 02 21:41:07 2020 +0000
+++ b/lang/lua52/buildlink3.mk  Thu Jul 02 21:42:23 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua52
 
@@ -16,6 +16,14 @@
 BUILDLINK_TRANSFORM+=          l:lua:lua5.2
 BUILDLINK_INCDIRS.lua52+=      include/lua-5.2
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=2
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA52_BUILDLINK3_MK
 
diff -r 621a4cbbd76a -r 0b4037406765 lang/lua53/buildlink3.mk
--- a/lang/lua53/buildlink3.mk  Thu Jul 02 21:41:07 2020 +0000
+++ b/lang/lua53/buildlink3.mk  Thu Jul 02 21:42:23 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/07/20 11:30:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua53
 
@@ -16,6 +16,14 @@
 BUILDLINK_TRANSFORM+=          l:lua:lua5.3
 BUILDLINK_INCDIRS.lua53+=      include/lua-5.3
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=3
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA53_BUILDLINK3_MK
 
diff -r 621a4cbbd76a -r 0b4037406765 lang/lua54/buildlink3.mk
--- a/lang/lua54/buildlink3.mk  Thu Jul 02 21:41:07 2020 +0000
+++ b/lang/lua54/buildlink3.mk  Thu Jul 02 21:42:23 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/06/30 13:48:59 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
 
 BUILDLINK_TREE+=       lua54
 
@@ -16,6 +16,14 @@
 BUILDLINK_TRANSFORM+=          l:lua:lua5.4
 BUILDLINK_INCDIRS.lua54+=      include/lua-5.4
 
+.if defined(USE_CMAKE)
+# used by FindLua.cmake
+CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
+CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MAJOR=5
+CMAKE_ARGS+=   -DLua_FIND_VERSION_MINOR=4
+.endif
+
 .include "../../mk/readline.buildlink3.mk"
 .endif # LUA54_BUILDLINK3_MK