public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101382 from omasanori/linbox-fix 

linbox: backport upstream fixes
This commit is contained in:
Timo Kaufmann 2020-11-04 23:02:55 +01:00 committed by GitHub
parent a172554adb e0fecf442c
commit 8201f4f6fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/linbox/default.nix
View File

@ -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";
@ -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"

13
pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch Normal file
View File

@ -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) :