Resolve gap-system/gap#5761

james-d-mitchell · Aug 26, 2024 · bf87aa5 · bf87aa5
1 parent ef1a0de
commit bf87aa5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/PackageInfo.g b/PackageInfo.g
@@ -122,9 +122,11 @@ Dependencies := rec(
 ),
 
 AvailabilityTest := function()
-  if (not ("datastructures" in SHOW_STAT())) and
-     (Filename(DirectoriesPackagePrograms("datastructures"), "datastructures.so") = fail) then
-     return fail;
+  if not LoadKernelExtension("datastructures") then
+    LogPackageLoadingMessage(PACKAGE_WARNING,
+                            ["the kernel module is not compiled, ",
+                             "the package cannot be loaded."]);
+    return fail;
   fi;
   return true;
 end,

diff --git a/init.g b/init.g
@@ -12,12 +12,8 @@
 #R  Read the declaration files.
 ##
 
-if (not IsBound(__DATASTRUCTURES_C)) and ("datastructures" in SHOW_STAT()) then
-  LoadStaticModule("datastructures");
-fi;
-if (not IsBound(__DATASTRUCTURES_C)) and
-   (Filename(DirectoriesPackagePrograms("datastructures"), "datastructures.so") <> fail) then
-  LoadDynamicModule(Filename(DirectoriesPackagePrograms("datastructures"), "datastructures.so"));
+if not LoadKernelExtension("datastructures") then
+  Error("failed to load the datastructures package kernel extension");
 fi;
 
 # interface definitions