linbox: backport upstream fixes
References:f78117d9c3
4ff828e200
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
This commit is contained in:
parent
ec3aa4c109
commit
e0fecf442c
|
@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "linbox";
|
pname = "linbox";
|
||||||
version = "1.6.3";
|
version = "1.6.3"; # TODO: Check postPatch script on update
|
||||||
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linbox-team";
|
owner = "linbox-team";
|
||||||
|
@ -36,6 +35,20 @@ stdenv.mkDerivation rec {
|
||||||
fflas-ffpack
|
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 = [
|
configureFlags = [
|
||||||
"--with-blas-libs=-lblas"
|
"--with-blas-libs=-lblas"
|
||||||
"--disable-optimization"
|
"--disable-optimization"
|
||||||
|
|
|
@ -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) :
|
Loading…
Reference in New Issue