From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by sourceware.org (Postfix) with ESMTPS id EA60C3840C19 for ; Fri, 15 Jan 2021 10:06:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EA60C3840C19 Received: by mail-pg1-x52f.google.com with SMTP id q7so5703883pgm.5 for ; Fri, 15 Jan 2021 02:06:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-transfer-encoding; bh=ZMnitv1jJWxlnycxsclult2XWVr2t7CIpKzItGVHVzU=; b=CmdVKtjlszJCU+X2EevDtWSVSqu0Vc9G01vG2NT6u1C5ARkdfikLpUzkHytUBWkZcB MKGwVFIub2b7xvUSeV4OjuMRmDXK03WTuBHlIMNH5BilfOoHpgdZzRh00D/bZM6/jWmg JU+fUJovjenGmZXr2EEyAinrnEEzc6hODxSAxgYgV4gTy97HmHzWNEyb+MqemnzyS+dj 1s1R4SVSDhkD19bLoVX8JScgkQDVe3sbpZdodnJGwC6GONVeOS9tl+Z+Inzx2mSaWNcY 4dNhcuGxhN5FBy2Iqe63YtzTb4iyezYUzoChXmD5fOxuiOfqNdUw4fWETE9j7cz4XBk0 qklA== X-Gm-Message-State: AOAM5307wdZbzP6AHJPuQ+PIoZS5+I9slMoxZjXHflVCFW8SJ4tKXIEM sfQjjwWL8XBKpth2Bb9nxZI/UqCtyjg= X-Google-Smtp-Source: ABdhPJwVpeEMqMwJrcTwHEBAnNfYASiOmhCNvddWBtOxTNOGhayyIc+bGxxdJQ69IlUQOQi3pMYMcA== X-Received: by 2002:a62:63c5:0:b029:1a9:3a46:7d32 with SMTP id x188-20020a6263c50000b02901a93a467d32mr12118261pfb.39.1610705192659; Fri, 15 Jan 2021 02:06:32 -0800 (PST) Received: from [192.168.3.11] ([2400:2411:aa20:4300:a9ce:956c:12f6:ffee]) by smtp.gmail.com with ESMTPSA id t5sm7785716pjr.22.2021.01.15.02.06.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2021 02:06:31 -0800 (PST) Date: Fri, 15 Jan 2021 19:06:32 +0900 From: Lemures Lemniscati To: cygwin-apps@cygwin.com Subject: [PATCH cygport] A patch to add a flag __SKIP_LIST_DEPS_LUA Message-Id: <20210115190630.C2D4.50F79699@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_6001682400000000C30A_MULTIPART_MIXED_" Content-Transfer-Encoding: 8bit X-Mailer: Becky! ver. 2.75.02 [ja] X-Antivirus: Avast (VPS 210115-0, 2021/01/15), Outbound message X-Antivirus-Status: Clean X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: cygwin-apps@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin package maintainer discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2021 10:06:35 -0000 --------_6001682400000000C30A_MULTIPART_MIXED_ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Hi! This is a fixed 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. I think it will do no harm. Regards, Lem diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart index 98f7808..1b27b61 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 [ -z "${__SKIP_LIST_DEPS_LUA}" ] && check_prog lua then luapaths=($(lua -e 'print(package.path..";"..package.cpath)' | tr '\;' ' ')) luapaths+=" ${DEPS_PATH//:/ }" -- 2.30.0 --------_6001682400000000C30A_MULTIPART_MIXED_ Content-Type: application/octet-stream; name="0001-Add-a-flag-__SKIP_LIST_DEPS_LUA-to-skip-detecting-de.patch" Content-Disposition: attachment; filename="0001-Add-a-flag-__SKIP_LIST_DEPS_LUA-to-skip-detecting-de.patch" Content-Transfer-Encoding: base64 RnJvbSAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMZW11cmVzIExlbW5pc2NhdGkgPGxlbXVyZXMubGVtbmlzY2F0 aUBnbWFpbC5jb20+CkRhdGU6IEZyaSwgMTUgSmFuIDIwMjEgMTg6NTI6NDQgKzA5MDAKU3ViamVj dDogW1BBVENIXSBBZGQgYSBmbGFnIF9fU0tJUF9MSVNUX0RFUFNfTFVBIHRvIHNraXAgZGV0ZWN0 aW5nIGRlcGVkZW5jeQoKCmRpZmYgLS1naXQgYS9saWIvcGtnX2luZm8uY3lncGFydCBiL2xpYi9w a2dfaW5mby5jeWdwYXJ0CmluZGV4IDk4Zjc4MDguLjFiMjdiNjEgMTAwNjQ0Ci0tLSBhL2xpYi9w a2dfaW5mby5jeWdwYXJ0CisrKyBiL2xpYi9wa2dfaW5mby5jeWdwYXJ0CkBAIC0zMzEsNyArMzMx LDE0IEBAIF9fbGlzdF9kZXBzKCkgewogCQlkb25lCiAJZmkKIAotCWlmIGNoZWNrX3Byb2cgbHVh CisjKioqKnYqIEluZm9ybWF0aW9uL19fU0tJUF9MSVNUX0RFUFNfTFVBCisjICBERVNDUklQVElP TgorIyAgQSBmbGFnIGluIF9fbGlzdF9kZXBzKCkgdG8gc2tpcCBkZXRlY3RpbmcgZGVwZWRlbmN5 IG9uIGx1YS4KKyMgIFNldCBhIG5vbmVtcHR5IHN0cmluZyB0byBfX1NLSVBfTElTVF9ERVBTX0xV QSBpbiBvcmRlciB0byBza2lwLgorIyAgKGUuZy4gaW4gY2FzZSBMdWEncyBvZiBkaWZmZXJlbnQg dmVyc2lvbnMgZXhpc3QpLgorIyoqKioKKworCWlmIFsgLXogIiR7X19TS0lQX0xJU1RfREVQU19M VUF9IiBdICYmIGNoZWNrX3Byb2cgbHVhCiAJdGhlbgogCQlsdWFwYXRocz0oJChsdWEgLWUgJ3By aW50KHBhY2thZ2UucGF0aC4uIjsiLi5wYWNrYWdlLmNwYXRoKScgfCB0ciAnXDsnICcgJykpCiAJ CWx1YXBhdGhzKz0iICR7REVQU19QQVRILy86LyB9IgotLSAKMi4zMC4wCgo= --------_6001682400000000C30A_MULTIPART_MIXED_--