Skip to content

Commit

Permalink
Merge pull request #94 from Joseph-Edwards/master
Browse files Browse the repository at this point in the history
Update kernel module checking
  • Loading branch information
laurentbartholdi authored Aug 26, 2024
2 parents 283d540 + eb627fd commit 91eaa46
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
1 change: 0 additions & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
- master
- stable-4.13
- stable-4.12
- stable-4.11
ABI: ['']
os: [ubuntu-latest]
include:
Expand Down
15 changes: 7 additions & 8 deletions PackageInfo.g
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,22 @@ PackageDoc := rec(
),

Dependencies := rec(
GAP := ">=4.11.0",
GAP := ">=4.12.0",
NeededOtherPackages := [["GAPDoc",">=1.0"]],
SuggestedOtherPackages := [],
ExternalConditions := ["GAP compiled with GMP support"]
),

AvailabilityTest := function()
local f, s;
f := Filename(DirectoriesPackagePrograms("float"),"float.so");
if f=fail then
LogPackageLoadingMessage(PACKAGE_WARNING,
if not IsKernelExtensionAvailable("float") then
LogPackageLoadingMessage(PACKAGE_WARNING,
[Concatenation("The DLL program `",
Filename(DirectoriesPackagePrograms("float")[1],"float.so"),
Filename(DirectoriesPackagePrograms("float")[1], "float.so"),
"' was not compiled, and is needed for the float package."),
"Run `./configure && make' in its home directory"]);
fi;
return f<>fail;
return fail;
fi;
return true;
end,

BannerString := Concatenation(~.PackageName, " ", String(~.Version), " with modules [?] ...\n"),
Expand Down
8 changes: 2 additions & 6 deletions init.g
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,8 @@ else
fi;

CallFuncList(function()
local f;
f := Filename(DirectoriesPackagePrograms("float"),"float.so");
if f=fail then
Info(InfoPackageLoading,1,"No dynamic library loaded for Float -- couldn't find file");
else
LoadDynamicModule(f);
if LoadKernelExtension("float") = false then
Error("No dynamic library loaded for Float -- couldn't find file");
fi;
end,[]);

Expand Down

0 comments on commit 91eaa46

Please sign in to comment.