Skip to content

linbox: backport upstream fixes #101382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timokau merged 1 commit into from
Nov 4, 2020
Merged

linbox: backport upstream fixes #101382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions pkgs/development/libraries/linbox/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);

stdenv.mkDerivation rec {
pname = "linbox";
version = "1.6.3";

version = "1.6.3"; # TODO: Check postPatch script on update

src = fetchFromGitHub {
owner = "linbox-team";
Expand All @@ -36,6 +35,20 @@ stdenv.mkDerivation rec {
fflas-ffpack
];

patches = [
# Remove inappropriate `const &` qualifiers on data members that can be
# modified via member functions.
# See also: https://github.com/linbox-team/linbox/pull/256
./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update
];

postPatch = ''
# Remove @LINBOXSAGE_LIBS@ that is actually undefined.
# See also: https://github.com/linbox-team/linbox/pull/249
# TODO: Remove on 1.7.0 update
find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \;
'';

configureFlags = [
"--with-blas-libs=-lblas"
"--disable-optimization"
Expand Down
13 changes: 13 additions & 0 deletions pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/linbox/algorithms/det-rational.h
+++ b/linbox/algorithms/det-rational.h
@@ -79,8 +79,8 @@
struct MyRationalModularDet {
const Blackbox &A;
const MyMethod &M;
- const Integer &mul;//multiplicative prec;
- const Integer ÷
+ Integer mul;//multiplicative prec;
+ Integer div;

MyRationalModularDet(const Blackbox& b, const MyMethod& n,
const Integer & p1, const Integer & p2) :