[latex3-commits] [git/LaTeX3-latex3-lualibs] nocpackage: Handle nonexistance of C module loaders (5d12200)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/lualibs
On branch  : nocpackage
Link       : https://github.com/latex3/lualibs/commit/5d122003d69e4b1726c18b402651d8d6f5de5a47

>---------------------------------------------------------------

commit 5d122003d69e4b1726c18b402651d8d6f5de5a47
Author: Marcel Fabian Krüger <zauguin at gmail.com>
Date:   Sat Jul 4 23:41:26 2020 +0200

    Handle nonexistance of C module loaders


>---------------------------------------------------------------

5d122003d69e4b1726c18b402651d8d6f5de5a47
 lualibs-basic-merged.lua | 11 +++++++++--
 lualibs-package.lua      |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lualibs-basic-merged.lua b/lualibs-basic-merged.lua
index 24a62e3..3c36bd4 100644
--- a/lualibs-basic-merged.lua
+++ b/lualibs-basic-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : lualibs-basic-merged.lua
 -- parent file : lualibs-basic.lua
--- merge date  : 2020-05-01 15:49
+-- merge date  : 2020-07-04 23:41
 
 do -- begin closure to overcome local limits and interference
 
@@ -165,7 +165,7 @@ local helpers=package.helpers or {
   ["all in one fallback"]=searchers[4+offset],
  },
  methods={},
- sequence={
+ sequence=lua.loadlib and { 
   "already loaded",
   "preload table",
   "qualified path",
@@ -175,6 +175,13 @@ local helpers=package.helpers or {
   "cpath specification",
   "all in one fallback",
   "not loaded",
+ } or {
+  "already loaded",
+  "preload table",
+  "qualified path",
+  "lua extra list",
+  "path specification",
+  "not loaded",
  }
 }
 package.helpers=helpers
diff --git a/lualibs-package.lua b/lualibs-package.lua
index 0dd71e5..bc5e781 100644
--- a/lualibs-package.lua
+++ b/lualibs-package.lua
@@ -69,7 +69,7 @@ local helpers = package.helpers or {
     },
     methods    = {
     },
-    sequence   = {
+    sequence   = lua.loadlib and { -- The default sequence depends on whether dynamic binary modules are allowed
         "already loaded",
         "preload table",
         "qualified path", -- beware, lua itself doesn't handle qualified paths (prepends ./)
@@ -79,6 +79,13 @@ local helpers = package.helpers or {
         "cpath specification",
         "all in one fallback",
         "not loaded",
+    } or {
+        "already loaded",
+        "preload table",
+        "qualified path", -- beware, lua itself doesn't handle qualified paths (prepends ./)
+        "lua extra list",
+        "path specification",
+        "not loaded",
     }
 }