mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-28 16:17:42 +03:00
julia03: clean up LDFLAGS and LD_LIBRARY_PATH
There were a few unused LDFLAGS and LD_LIBRARY_PATH settings. There was also an incorrect setting; Julia prefers to be linked to threaded FFTW. The libary names are now set correctly so that it's not necessary to link system libraries into $out/lib/julia as if they were private libraries. The LDFLAGS were also moved out of NIX_LDFLAGS so they will affect only the Julia build itself, and not all the individual private libraries.
This commit is contained in:
parent
41cc06fd00
commit
bd280660f7
@ -8,13 +8,21 @@ with stdenv.lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
realGcc = stdenv.cc.cc;
|
realGcc = stdenv.cc.cc;
|
||||||
arch = head (splitString "-" stdenv.system);
|
in
|
||||||
march =
|
stdenv.mkDerivation rec {
|
||||||
{
|
pname = "julia";
|
||||||
"x86_64-linux" = "x86-64";
|
version = "0.3.6";
|
||||||
"i686-linux" = "i686";
|
name = "${pname}-${version}";
|
||||||
}."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
|
|
||||||
|
|
||||||
|
src = fetchgit {
|
||||||
|
url = "git://github.com/JuliaLang/julia.git";
|
||||||
|
rev = "refs/tags/v${version}";
|
||||||
|
md5 = "d28e8f428485219f756d80c011d5dd32";
|
||||||
|
name = "julia-git-v${version}";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraSrcs =
|
||||||
|
let
|
||||||
dsfmt_ver = "2.2";
|
dsfmt_ver = "2.2";
|
||||||
grisu_ver = "1.1.1";
|
grisu_ver = "1.1.1";
|
||||||
utf8proc_ver = "1.1.6";
|
utf8proc_ver = "1.1.6";
|
||||||
@ -32,20 +40,7 @@ let
|
|||||||
url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
|
url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
|
||||||
md5 = "2462346301fac2994c34f5574d6c3ca7";
|
md5 = "2462346301fac2994c34f5574d6c3ca7";
|
||||||
};
|
};
|
||||||
in
|
in [ dsfmt_src grisu_src utf8proc_src ];
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "julia";
|
|
||||||
version = "0.3.6";
|
|
||||||
name = "${pname}-${version}";
|
|
||||||
|
|
||||||
extraSrcs = [ dsfmt_src grisu_src utf8proc_src ];
|
|
||||||
|
|
||||||
src = fetchgit {
|
|
||||||
url = "git://github.com/JuliaLang/julia.git";
|
|
||||||
rev = "refs/tags/v${version}";
|
|
||||||
md5 = "d28e8f428485219f756d80c011d5dd32";
|
|
||||||
name = "julia-git-v${version}";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
[
|
||||||
@ -55,31 +50,37 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
makeFlags =
|
makeFlags =
|
||||||
[
|
let
|
||||||
"USE_SYSTEM_PATCHELF=1"
|
arch = head (splitString "-" stdenv.system);
|
||||||
"USE_SYSTEM_BLAS=1"
|
march =
|
||||||
"USE_SYSTEM_LAPACK=1"
|
{
|
||||||
"USE_SYSTEM_ARPACK=1"
|
"x86_64-linux" = "x86-64";
|
||||||
|
"i686-linux" = "i686";
|
||||||
|
}."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
|
||||||
|
in [
|
||||||
"ARCH=${arch}"
|
"ARCH=${arch}"
|
||||||
"MARCH=${march}"
|
"MARCH=${march}"
|
||||||
"JULIA_CPU_TARGET=${march}"
|
"JULIA_CPU_TARGET=${march}"
|
||||||
"PREFIX=$(out)"
|
"PREFIX=$(out)"
|
||||||
"prefix=$(out)"
|
"prefix=$(out)"
|
||||||
"SHELL=${stdenv.shell}"
|
"SHELL=${stdenv.shell}"
|
||||||
|
|
||||||
|
"USE_SYSTEM_PATCHELF=1"
|
||||||
|
|
||||||
|
"USE_SYSTEM_BLAS=1"
|
||||||
|
"LIBBLAS=-lopenblas"
|
||||||
|
"LIBBLASNAME=libopenblas"
|
||||||
|
|
||||||
|
"USE_SYSTEM_LAPACK=1"
|
||||||
|
"LIBLAPACK=-lopenblas"
|
||||||
|
"LIBLAPACKNAME=libopenblas"
|
||||||
|
|
||||||
|
"USE_SYSTEM_ARPACK=1"
|
||||||
];
|
];
|
||||||
|
|
||||||
GLPK_PREFIX = "${glpk}/include";
|
GLPK_PREFIX = "${glpk}/include";
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
|
NIX_CFLAGS_COMPILE = [ "-fPIC" ];
|
||||||
NIX_LDFLAGS =
|
|
||||||
optionals
|
|
||||||
(realGcc != null)
|
|
||||||
[
|
|
||||||
"-L${realGcc}/lib"
|
|
||||||
"-L${realGcc}/lib64"
|
|
||||||
"-lpcre" "-lm" "-lfftw3f" "-lfftw3" "-lglpk"
|
|
||||||
"-lunistring" "-lz" "-lgmp" "-lmpfr" "-lopenblas"
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
|
sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
|
||||||
@ -92,6 +93,24 @@ stdenv.mkDerivation rec {
|
|||||||
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
|
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Julia tries to load these libraries dynamically at runtime, but they can't be found.
|
||||||
|
# Easier by far to link against them as usual.
|
||||||
|
# These go in LDFLAGS, where they affect only Julia itself, and not NIX_LDFLAGS,
|
||||||
|
# where they would also be used for all the private libraries Julia builds.
|
||||||
|
LDFLAGS = [
|
||||||
|
"-larpack"
|
||||||
|
"-lfftw3_threads"
|
||||||
|
"-lfftw3f_threads"
|
||||||
|
"-lglpk"
|
||||||
|
"-lgmp"
|
||||||
|
"-lmpfr"
|
||||||
|
"-lopenblas"
|
||||||
|
"-lpcre"
|
||||||
|
"-lsuitesparse"
|
||||||
|
"-lunistring"
|
||||||
|
"-lz"
|
||||||
|
];
|
||||||
|
|
||||||
configurePhase = ''
|
configurePhase = ''
|
||||||
for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
|
for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK ZLIB MPFR;
|
||||||
do
|
do
|
||||||
@ -106,27 +125,9 @@ stdenv.mkDerivation rec {
|
|||||||
copy_kill_hash "$i" deps
|
copy_kill_hash "$i" deps
|
||||||
done
|
done
|
||||||
|
|
||||||
${if realGcc ==null then "" else ''export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib"''}
|
|
||||||
|
|
||||||
export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
|
|
||||||
|
|
||||||
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
|
|
||||||
|
|
||||||
export PATH="$PATH:${stdenv.cc.libc}/sbin"
|
export PATH="$PATH:${stdenv.cc.libc}/sbin"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
preBuild = ''
|
|
||||||
# Link dynamically loaded shared libraries into output so they are found at runtime.
|
|
||||||
mkdir -p "$out/lib/julia"
|
|
||||||
ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/libblas.so"
|
|
||||||
ln -s "${openblas}/lib/libopenblas.so" "$out/lib/julia/liblapack.so"
|
|
||||||
ln -s "${suitesparse}/lib/libsuitesparse.so" "$out/lib/julia/libsuitesparse.so"
|
|
||||||
ln -s "${arpack}/lib/libarpack.so" "$out/lib/julia/libarpack.so"
|
|
||||||
for i in umfpack cholmod amd camd colamd spqr; do
|
|
||||||
ln -s libsuitesparse.so "$out/lib/julia/lib$i.so";
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
dontPatchELF = true;
|
dontPatchELF = true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user