[PATCH cygport]

[Lemures Lemniscati <lemures.lemniscati@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]

Hi!

This is another patch for cygport: 

I'd like to apply alternatives to lua packages to have different
versions of lua being installed. But, in such cases, current
__list_deps() might pick wrong dependencies.

And, this is a patch to add a flag __SKIP_LIST_DEPS_LUA to skip
__list_deps() detecting depedency on lua, for the time being.


Regards,

Lem




diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart
index 98f7808..f83f239 100644
--- a/lib/pkg_info.cygpart
+++ b/lib/pkg_info.cygpart
@@ -331,7 +331,14 @@ __list_deps() {
 		done
 	fi
 
-	if check_prog lua
+#****v* Information/__SKIP_LIST_DEPS_LUA
+#  DESCRIPTION
+#  A flag in __list_deps() to skip detecting depedency on lua.
+#  Set a nonempty string to __SKIP_LIST_DEPS_LUA in order to skip.
+#  (e.g. in case Lua's of different versions exist).
+#****
+
+	if [ -n "${__SKIP_LIST_DEPS_LUA}" ] || check_prog lua
 	then
 		luapaths=($(lua -e 'print(package.path..";"..package.cpath)' | tr '\;' ' '))
 		luapaths+=" ${DEPS_PATH//:/ }"
-- 
2.30.0


[-- Attachment #2: 0001-Add-a-flag-__SKIP_LIST_DEPS_LUA-to-skip-detecting-de.patch --]
[-- Type: application/octet-stream, Size: 899 bytes --]

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lemures Lemniscati <lemures.lemniscati@gmail.com>
Date: Fri, 15 Jan 2021 18:33:09 +0900
Subject: [PATCH] Add a flag __SKIP_LIST_DEPS_LUA to skip detecting depedency


diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart
index 98f7808..f83f239 100644
--- a/lib/pkg_info.cygpart
+++ b/lib/pkg_info.cygpart
@@ -331,7 +331,14 @@ __list_deps() {
 		done
 	fi
 
-	if check_prog lua
+#****v* Information/__SKIP_LIST_DEPS_LUA
+#  DESCRIPTION
+#  A flag in __list_deps() to skip detecting depedency on lua.
+#  Set a nonempty string to __SKIP_LIST_DEPS_LUA in order to skip.
+#  (e.g. in case Lua's of different versions exist).
+#****
+
+	if [ -n "${__SKIP_LIST_DEPS_LUA}" ] || check_prog lua
 	then
 		luapaths=($(lua -e 'print(package.path..";"..package.cpath)' | tr '\;' ' '))
 		luapaths+=" ${DEPS_PATH//:/ }"
-- 
2.30.0