CVS commit: pkgsrc/lang

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar 25 18:55:47 UTC 2023

Modified Files:
        pkgsrc/lang/lua51: buildlink3.mk
        pkgsrc/lang/lua52: buildlink3.mk
        pkgsrc/lang/lua53: buildlink3.mk
        pkgsrc/lang/lua54: buildlink3.mk

Log Message:
lua*: honor BUILD_USES_CMAKE


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/lua51/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/lua52/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/lua53/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/lua54/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/lua51/buildlink3.mk
diff -u pkgsrc/lang/lua51/buildlink3.mk:1.5 pkgsrc/lang/lua51/buildlink3.mk:1.6
--- pkgsrc/lang/lua51/buildlink3.mk:1.5 Thu Jul  2 21:42:23 2020
+++ pkgsrc/lang/lua51/buildlink3.mk     Sat Mar 25 18:55:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2023/03/25 18:55:46 wiz Exp $
 
 BUILDLINK_TREE+=       lua51
 
@@ -16,7 +16,7 @@ BUILDLINK_DEPMETHOD.lua51?=   ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.1
 BUILDLINK_INCDIRS.lua51+=      include/lua-5.1
 
-.if defined(USE_CMAKE)
+.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
 # used by FindLua.cmake
 CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
 CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2

Index: pkgsrc/lang/lua52/buildlink3.mk
diff -u pkgsrc/lang/lua52/buildlink3.mk:1.5 pkgsrc/lang/lua52/buildlink3.mk:1.6
--- pkgsrc/lang/lua52/buildlink3.mk:1.5 Thu Jul  2 21:42:23 2020
+++ pkgsrc/lang/lua52/buildlink3.mk     Sat Mar 25 18:55:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/07/02 21:42:23 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2023/03/25 18:55:46 wiz Exp $
 
 BUILDLINK_TREE+=       lua52
 
@@ -16,7 +16,7 @@ BUILDLINK_DEPMETHOD.lua52?=   ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.2
 BUILDLINK_INCDIRS.lua52+=      include/lua-5.2
 
-.if defined(USE_CMAKE)
+.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
 # used by FindLua.cmake
 CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
 CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2

Index: pkgsrc/lang/lua53/buildlink3.mk
diff -u pkgsrc/lang/lua53/buildlink3.mk:1.3 pkgsrc/lang/lua53/buildlink3.mk:1.4
--- pkgsrc/lang/lua53/buildlink3.mk:1.3 Thu Jul  2 21:42:23 2020
+++ pkgsrc/lang/lua53/buildlink3.mk     Sat Mar 25 18:55:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/03/25 18:55:46 wiz Exp $
 
 BUILDLINK_TREE+=       lua53
 
@@ -16,7 +16,7 @@ BUILDLINK_DEPMETHOD.lua53?=   ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.3
 BUILDLINK_INCDIRS.lua53+=      include/lua-5.3
 
-.if defined(USE_CMAKE)
+.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
 # used by FindLua.cmake
 CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
 CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2

Index: pkgsrc/lang/lua54/buildlink3.mk
diff -u pkgsrc/lang/lua54/buildlink3.mk:1.3 pkgsrc/lang/lua54/buildlink3.mk:1.4
--- pkgsrc/lang/lua54/buildlink3.mk:1.3 Thu Jul  2 21:42:23 2020
+++ pkgsrc/lang/lua54/buildlink3.mk     Sat Mar 25 18:55:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/07/02 21:42:23 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/03/25 18:55:47 wiz Exp $
 
 BUILDLINK_TREE+=       lua54
 
@@ -16,7 +16,7 @@ BUILDLINK_DEPMETHOD.lua54?=   ${BUILDLINK_
 BUILDLINK_TRANSFORM+=          l:lua:lua5.4
 BUILDLINK_INCDIRS.lua54+=      include/lua-5.4
 
-.if defined(USE_CMAKE)
+.if defined(USE_CMAKE) || defined(BUILD_USES_CMAKE)
 # used by FindLua.cmake
 CMAKE_ARGS+=   -DLua_FIND_VERSION_EXACT=ON
 CMAKE_ARGS+=   -DLua_FIND_VERSION_COUNT=2