Resolve gap-system/gap#5761

gap-packages · Aug 26, 2024 · cf302bc · cf302bc
1 parent ef1a0de
commit cf302bc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/PackageInfo.g b/PackageInfo.g
@@ -122,11 +122,17 @@ Dependencies := rec(
 ),
 
 AvailabilityTest := function()
- if (not ("datastructures" in SHOW_STAT())) and
- (Filename(DirectoriesPackagePrograms("datastructures"), "datastructures.so") = fail) then
- return fail;
+ if CompareVersionNumbers(GAPInfo.Version, "4.12") then
+ if not LoadKernelExtension("datastructures") then
+ Error("failed to load the datastructures package kernel extension");
+ fi;
+ else
+ if (not ("datastructures" in SHOW_STAT())) and
+ (Filename(DirectoriesPackagePrograms("datastructures"), "datastructures.so") = fail) then
+ return fail;
+ fi;
+ return true;
  fi;
- return true;
 end,
 
 TestFile := "tst/testall.g",

diff --git a/init.g b/init.g
@@ -12,12 +12,18 @@
 #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 CompareVersionNumbers(GAPInfo.Version, "4.12") then
+ if not LoadKernelExtension("datastructures") then
+ Error("failed to load the datastructures package kernel extension");
+ fi;
+else
+ 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"));
+ fi;
 fi;
 
 # interface definitions