Fix Julia 0.3.0 build (for most purposes). Not making default yet because it is unclear if I missed something important. Failed to make it use external openblas and lapack correctly…

This commit is contained in:
Michael Raskin
2014-08-24 00:24:46 +04:00
parent 252ee7adc9
commit 33ef69390b
6 changed files with 62 additions and 17 deletions

View File

@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
};
meta = {
inherit version;
description = "Linear Algebra PACKage";
homepage = "http://www.netlib.org/lapack/";
license = "revised-BSD";

View File

@@ -2,11 +2,12 @@
let
atlasMaybeShared = atlas.override { inherit shared; };
usedLibExtension = if shared then ".so" else ".a";
version = "3.4.1";
in
stdenv.mkDerivation {
name = "liblapack-3.4.1";
stdenv.mkDerivation rec {
name = "liblapack-${version}";
src = fetchurl {
url = "http://www.netlib.org/lapack/lapack-3.4.1.tgz";
url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
};
@@ -37,6 +38,7 @@ stdenv.mkDerivation {
};
meta = {
inherit version;
description = "Linear Algebra PACKage";
homepage = "http://www.netlib.org/lapack/";
license = "revised-BSD";

View File

@@ -0,0 +1,32 @@
{ stdenv, fetchurl, gfortran, perl, liblapack }:
stdenv.mkDerivation rec {
version = "0.2.10";
name = "openblas-${version}";
src = fetchurl {
url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
name = "openblas-${version}.tar.gz";
};
preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
buildInputs = [gfortran perl];
cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
target = if cpu == "i686" then "P2" else
if cpu == "x86_64" then "CORE2" else
# allow autodetect
"";
makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1";
meta = {
description = "Basic Linear Algebra Subprograms";
license = stdenv.lib.licenses.bsd3;
homepage = "https://github.com/xianyi/OpenBLAS";
platforms = [ "x86_64-linux" ];
};
}

View File

@@ -1,12 +1,7 @@
{ stdenv, fetchurl, gfortran, perl }:
{ stdenv, fetchurl, gfortran, perl, liblapack }:
stdenv.mkDerivation rec {
version = "0.2.2";
lapack_version = "3.4.1";
lapack_src = fetchurl {
url = "http://www.netlib.org/lapack/lapack-${lapack_version}.tgz";
sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
};
name = "openblas-${version}";
src = fetchurl {
@@ -15,7 +10,7 @@ stdenv.mkDerivation rec {
name = "openblas-${version}.tar.gz";
};
preBuild = "cp ${lapack_src} lapack-${lapack_version}.tgz";
preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
buildInputs = [gfortran perl];