Thu Jul 2 21:42:23 2020 UTC ()
lua: move cmake bits to per-interpreter buildlink3s


(nia)
diff -r1.13 -r1.14 pkgsrc/lang/lua/luaversion.mk
diff -r1.4 -r1.5 pkgsrc/lang/lua51/buildlink3.mk
diff -r1.4 -r1.5 pkgsrc/lang/lua52/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/lang/lua53/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/lang/lua54/buildlink3.mk
cvs diff -r1.13 -r1.14 pkgsrc/lang/lua/luaversion.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua/luaversion.mk 2020/07/02 20:43:26 1.13
+++ pkgsrc/lang/lua/luaversion.mk 2020/07/02 21:42:23 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: luaversion.mk,v 1.13 2020/07/02 20:43:26 nia Exp $ 1# $NetBSD: luaversion.mk,v 1.14 2020/07/02 21:42:23 nia Exp $
2 2
3# This file determins which Lua version is used as a dependency for 3# This file determins which Lua version is used as a dependency for
4# a package. 4# a package.
5# 5#
6# === User-settable variables === 6# === User-settable variables ===
7# 7#
8# LUA_VERSION_DEFAULT 8# LUA_VERSION_DEFAULT
9# The preferred lua version to use. 9# The preferred lua version to use.
10# 10#
11# Possible values: 51 52 53 54 11# Possible values: 51 52 53 54
12# Default: 53 12# Default: 53
13# 13#
14# === Infrastructure variables === 14# === Infrastructure variables ===
@@ -154,22 +154,14 @@ LUA_BASEDEPENDS= lua54>=5.4<5.5:${LUA_PK @@ -154,22 +154,14 @@ LUA_BASEDEPENDS= lua54>=5.4<5.5:${LUA_PK
154PKG_FAIL_REASON+= "No valid Lua version found" 154PKG_FAIL_REASON+= "No valid Lua version found"
155 155
156.endif 156.endif
157 157
158#LUA_DEPENDS= ${BUILDLINK_API_DEPENDS.${LUA_PACKAGE}}:${LUA_PKGSRCDIR} 158#LUA_DEPENDS= ${BUILDLINK_API_DEPENDS.${LUA_PACKAGE}}:${LUA_PKGSRCDIR}
159 159
160.include "${LUA_PKGSRCDIR}/version.mk" 160.include "${LUA_PKGSRCDIR}/version.mk"
161_LUA_DOT_VERSION= ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} 161_LUA_DOT_VERSION= ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
162 162
163LUA_INCDIR= include/lua-${_LUA_DOT_VERSION} 163LUA_INCDIR= include/lua-${_LUA_DOT_VERSION}
164LUA_INTERPRETER= ${LOCALBASE}/bin/lua${_LUA_DOT_VERSION} 164LUA_INTERPRETER= ${LOCALBASE}/bin/lua${_LUA_DOT_VERSION}
165LUA_COMPILER= ${LOCALBASE}/bin/luac${_LUA_DOT_VERSION} 165LUA_COMPILER= ${LOCALBASE}/bin/luac${_LUA_DOT_VERSION}
166 166
167.if defined(USE_CMAKE) 
168# used by FindLua.cmake 
169CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON 
170CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2 
171CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=${LUA_VERSION_MAJOR} 
172CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=${LUA_VERSION_MINOR} 
173.endif 
174 
175.endif # LUA_LUAVERSION_MK 167.endif # LUA_LUAVERSION_MK
cvs diff -r1.4 -r1.5 pkgsrc/lang/lua51/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua51/buildlink3.mk 2015/07/20 11:30:54 1.4
+++ pkgsrc/lang/lua51/buildlink3.mk 2020/07/02 21:42:23 1.5
@@ -1,22 +1,30 @@ @@ -1,22 +1,30 @@
1# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
2 2
3BUILDLINK_TREE+= lua51 3BUILDLINK_TREE+= lua51
4 4
5.if !defined(LUA51_BUILDLINK3_MK) 5.if !defined(LUA51_BUILDLINK3_MK)
6LUA51_BUILDLINK3_MK:= 6LUA51_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.1<5.2 8BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.1<5.2
9BUILDLINK_PKGSRCDIR.lua51?= ../../lang/lua51 9BUILDLINK_PKGSRCDIR.lua51?= ../../lang/lua51
10 10
11.if defined(BUILDLINK_DEPMETHOD.lua) 11.if defined(BUILDLINK_DEPMETHOD.lua)
12BUILDLINK_DEPMETHOD.lua51?= ${BUILDLINK_DEPMETHOD.lua} 12BUILDLINK_DEPMETHOD.lua51?= ${BUILDLINK_DEPMETHOD.lua}
13.endif 13.endif
14 14
15# -llua -> -llua5.1 15# -llua -> -llua5.1
16BUILDLINK_TRANSFORM+= l:lua:lua5.1 16BUILDLINK_TRANSFORM+= l:lua:lua5.1
17BUILDLINK_INCDIRS.lua51+= include/lua-5.1 17BUILDLINK_INCDIRS.lua51+= include/lua-5.1
18 18
 19.if defined(USE_CMAKE)
 20# used by FindLua.cmake
 21CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
 22CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
 23CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
 24CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=1
 25.endif
 26
19.include "../../mk/readline.buildlink3.mk" 27.include "../../mk/readline.buildlink3.mk"
20.endif # LUA51_BUILDLINK3_MK 28.endif # LUA51_BUILDLINK3_MK
21 29
22BUILDLINK_TREE+= -lua51 30BUILDLINK_TREE+= -lua51
cvs diff -r1.4 -r1.5 pkgsrc/lang/lua52/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua52/buildlink3.mk 2015/07/20 11:30:54 1.4
+++ pkgsrc/lang/lua52/buildlink3.mk 2020/07/02 21:42:23 1.5
@@ -1,22 +1,30 @@ @@ -1,22 +1,30 @@
1# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
2 2
3BUILDLINK_TREE+= lua52 3BUILDLINK_TREE+= lua52
4 4
5.if !defined(LUA52_BUILDLINK3_MK) 5.if !defined(LUA52_BUILDLINK3_MK)
6LUA52_BUILDLINK3_MK:= 6LUA52_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua52+= lua52>=5.2.0<5.3 8BUILDLINK_API_DEPENDS.lua52+= lua52>=5.2.0<5.3
9BUILDLINK_PKGSRCDIR.lua52?= ../../lang/lua52 9BUILDLINK_PKGSRCDIR.lua52?= ../../lang/lua52
10 10
11.if defined(BUILDLINK_DEPMETHOD.lua) 11.if defined(BUILDLINK_DEPMETHOD.lua)
12BUILDLINK_DEPMETHOD.lua52?= ${BUILDLINK_DEPMETHOD.lua} 12BUILDLINK_DEPMETHOD.lua52?= ${BUILDLINK_DEPMETHOD.lua}
13.endif 13.endif
14 14
15# -llua -> -llua5.2 15# -llua -> -llua5.2
16BUILDLINK_TRANSFORM+= l:lua:lua5.2 16BUILDLINK_TRANSFORM+= l:lua:lua5.2
17BUILDLINK_INCDIRS.lua52+= include/lua-5.2 17BUILDLINK_INCDIRS.lua52+= include/lua-5.2
18 18
 19.if defined(USE_CMAKE)
 20# used by FindLua.cmake
 21CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
 22CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
 23CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
 24CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=2
 25.endif
 26
19.include "../../mk/readline.buildlink3.mk" 27.include "../../mk/readline.buildlink3.mk"
20.endif # LUA52_BUILDLINK3_MK 28.endif # LUA52_BUILDLINK3_MK
21 29
22BUILDLINK_TREE+= -lua52 30BUILDLINK_TREE+= -lua52
cvs diff -r1.2 -r1.3 pkgsrc/lang/lua53/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua53/buildlink3.mk 2015/07/20 11:30:54 1.2
+++ pkgsrc/lang/lua53/buildlink3.mk 2020/07/02 21:42:23 1.3
@@ -1,22 +1,30 @@ @@ -1,22 +1,30 @@
1# $NetBSD: buildlink3.mk,v 1.2 2015/07/20 11:30:54 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
2 2
3BUILDLINK_TREE+= lua53 3BUILDLINK_TREE+= lua53
4 4
5.if !defined(LUA53_BUILDLINK3_MK) 5.if !defined(LUA53_BUILDLINK3_MK)
6LUA53_BUILDLINK3_MK:= 6LUA53_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua53+= lua53>=5.3.0<5.4 8BUILDLINK_API_DEPENDS.lua53+= lua53>=5.3.0<5.4
9BUILDLINK_PKGSRCDIR.lua53?= ../../lang/lua53 9BUILDLINK_PKGSRCDIR.lua53?= ../../lang/lua53
10 10
11.if defined(BUILDLINK_DEPMETHOD.lua) 11.if defined(BUILDLINK_DEPMETHOD.lua)
12BUILDLINK_DEPMETHOD.lua53?= ${BUILDLINK_DEPMETHOD.lua} 12BUILDLINK_DEPMETHOD.lua53?= ${BUILDLINK_DEPMETHOD.lua}
13.endif 13.endif
14 14
15# -llua -> -llua5.3 15# -llua -> -llua5.3
16BUILDLINK_TRANSFORM+= l:lua:lua5.3 16BUILDLINK_TRANSFORM+= l:lua:lua5.3
17BUILDLINK_INCDIRS.lua53+= include/lua-5.3 17BUILDLINK_INCDIRS.lua53+= include/lua-5.3
18 18
 19.if defined(USE_CMAKE)
 20# used by FindLua.cmake
 21CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
 22CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
 23CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
 24CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=3
 25.endif
 26
19.include "../../mk/readline.buildlink3.mk" 27.include "../../mk/readline.buildlink3.mk"
20.endif # LUA53_BUILDLINK3_MK 28.endif # LUA53_BUILDLINK3_MK
21 29
22BUILDLINK_TREE+= -lua53 30BUILDLINK_TREE+= -lua53
cvs diff -r1.2 -r1.3 pkgsrc/lang/lua54/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua54/buildlink3.mk 2020/06/30 13:48:59 1.2
+++ pkgsrc/lang/lua54/buildlink3.mk 2020/07/02 21:42:23 1.3
@@ -1,22 +1,30 @@ @@ -1,22 +1,30 @@
1# $NetBSD: buildlink3.mk,v 1.2 2020/06/30 13:48:59 nia Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
2 2
3BUILDLINK_TREE+= lua54 3BUILDLINK_TREE+= lua54
4 4
5.if !defined(LUA54_BUILDLINK3_MK) 5.if !defined(LUA54_BUILDLINK3_MK)
6LUA54_BUILDLINK3_MK:= 6LUA54_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua54+= lua54>=5.4.0<5.5 8BUILDLINK_API_DEPENDS.lua54+= lua54>=5.4.0<5.5
9BUILDLINK_PKGSRCDIR.lua54?= ../../lang/lua54 9BUILDLINK_PKGSRCDIR.lua54?= ../../lang/lua54
10 10
11.if defined(BUILDLINK_DEPMETHOD.lua) 11.if defined(BUILDLINK_DEPMETHOD.lua)
12BUILDLINK_DEPMETHOD.lua54?= ${BUILDLINK_DEPMETHOD.lua} 12BUILDLINK_DEPMETHOD.lua54?= ${BUILDLINK_DEPMETHOD.lua}
13.endif 13.endif
14 14
15# -llua -> -llua5.4 15# -llua -> -llua5.4
16BUILDLINK_TRANSFORM+= l:lua:lua5.4 16BUILDLINK_TRANSFORM+= l:lua:lua5.4
17BUILDLINK_INCDIRS.lua54+= include/lua-5.4 17BUILDLINK_INCDIRS.lua54+= include/lua-5.4
18 18
 19.if defined(USE_CMAKE)
 20# used by FindLua.cmake
 21CMAKE_ARGS+= -DLua_FIND_VERSION_EXACT=ON
 22CMAKE_ARGS+= -DLua_FIND_VERSION_COUNT=2
 23CMAKE_ARGS+= -DLua_FIND_VERSION_MAJOR=5
 24CMAKE_ARGS+= -DLua_FIND_VERSION_MINOR=4
 25.endif
 26
19.include "../../mk/readline.buildlink3.mk" 27.include "../../mk/readline.buildlink3.mk"
20.endif # LUA54_BUILDLINK3_MK 28.endif # LUA54_BUILDLINK3_MK
21 29
22BUILDLINK_TREE+= -lua54 30BUILDLINK_TREE+= -lua54