[patch cygport]

[patch cygport]

[Marco Atzeri]

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


"Fixing libtool modules:" will enter in a never ending loop
when "_topdir=." is different from "readlink -f ."


+ '[' /cygdrive/d/cyg_pub/devel/openmpi/v4.0/openmpi-4.0.4-0.2.x86_64 
'!=' /pub/devel/openmpi/v4.0/openmpi-4.0.4-0.2.x86_64/inst/usr ']'
+ dlname=../../../../bin/cygmpi-40.dll
++ readlink -f usr/lib/../../../..


+ '[' /cygdrive/d/cyg_pub/devel/openmpi/v4.0 '!=' 
/pub/devel/openmpi/v4.0/openmpi-4.0.4-0.2.x86_64/inst/usr ']'
+ dlname=../../../../../bin/cygmpi-40.dll
++ readlink -f usr/lib/../../../../..

and so on ..


With the patch the two sides match and loop end as expected:

+ '[' 
/cygdrive/d/cyg_pub/devel/openmpi/v4.0/openmpi-4.0.4-0.2.x86_64/inst/usr 
'!=' 
/cygdrive/d/cyg_pub/devel/openmpi/v4.0/openmpi-4.0.4-0.2.x86_64/inst/usr ']'
+ '[' ../bin/cygmpi-40.dll '!=' ../bin/cygmpi-40.dll ']'

[-- Attachment #2: readlink.patch --]
[-- Type: text/plain, Size: 292 bytes --]

diff --git a/bin/cygport.in b/bin/cygport.in
index 1fe804d..2eeff26 100755
--- a/bin/cygport.in
+++ b/bin/cygport.in
@@ -397,7 +397,7 @@ if [ "x${_topdir}" = "x${argv[1]}" ]
 then
 	if [ -f ./${cygportfile} ]
 	then
-		_topdir=.;
+		_topdir=$(readlink -f .);
 	else
 		_topdir=/usr/src;
 	fi

Re: [PATCH cygport]

[Lemures Lemniscati]

On Fri, 15 Jan 2021 18:46:44 +0900, Lemures Lemniscati
> 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
> 
Sorry, this is a wrong patch, I'll resend.

Regards,
Lem

[PATCH cygport]

[Lemures Lemniscati]

[-- 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