Author: guibert
Date: Fri Jul  9 13:15:56 2010
New Revision: 22549
URL: https://svn.nixos.org/websvn/nix/?rev=22549&sc=1

Log:
compile static libraries for blas and lapack

Modified:
   nixpkgs/trunk/pkgs/development/libraries/science/math/blas/default.nix
   
nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/blas-link.patch
   nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/default.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/science/math/blas/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/science/math/blas/default.nix      
Fri Jul  9 13:15:51 2010        (r22548)
+++ nixpkgs/trunk/pkgs/development/libraries/science/math/blas/default.nix      
Fri Jul  9 13:15:56 2010        (r22549)
@@ -24,7 +24,17 @@
     echo >>make.inc "BLASLIB = libblas.so.3.0.3"
   '';
 
+  buildPhase = ''
+    make
+    echo >>make.inc "ARCHFLAGS = "
+    echo >>make.inc "BLASLIB = libblas.a"
+    echo >>make.inc "ARCH = ar rcs"
+    echo >>make.inc "RANLIB = ranlib"
+    make
+  '';
+ 
   installPhase = ''
+    install -D -m755 libblas.a "$out/lib/libblas.a"
     install -D -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3"
     ln -s libblas.so.3.0.3 "$out/lib/libblas.so.3"
     ln -s libblas.so.3.0.3 "$out/lib/libblas.so"

Modified: 
nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/blas-link.patch
==============================================================================
--- 
nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/blas-link.patch 
    Fri Jul  9 13:15:51 2010        (r22548)
+++ 
nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/blas-link.patch 
    Fri Jul  9 13:15:56 2010        (r22549)
@@ -6,7 +6,7 @@
  
  ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
 -      $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
-+      $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) -lblas
++      $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) ${BLASLIB}
        $(RANLIB) $@
  
  single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
@@ -18,7 +18,7 @@
  ../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN)  \
                $(ZMATGEN) $(DZATGEN)
 -      $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
-+      $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) -lblas
++      $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) ${BLASLIB}
        $(RANLIB) $@
  
  single: $(SMATGEN) $(SCATGEN)

Modified: 
nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/default.nix 
Fri Jul  9 13:15:51 2010        (r22548)
+++ nixpkgs/trunk/pkgs/development/libraries/science/math/liblapack/default.nix 
Fri Jul  9 13:15:56 2010        (r22549)
@@ -33,10 +33,30 @@
   buildPhase = ''
     make clean
     make lib
+    echo >make.inc  "SHELL = ${stdenv.shell}"
+    echo >>make.inc "PLAT ="
+    echo >>make.inc "FORTRAN = gfortran"
+    echo >>make.inc "OPTS = -O2 -fPIC"
+    echo >>make.inc "DRVOPTS = \$(OPTS)"
+    echo >>make.inc "NOOPT = -O0 -fPIC"
+    echo >>make.inc "LOADER = gfortran"
+    echo >>make.inc "LOADOPTS = "
+    echo >>make.inc "TIMER = INT_ETIME"
+    echo >>make.inc "ARCH = ar rcs"
+    echo >>make.inc "RANLIB = ranlib"
+    echo >>make.inc "BLASLIB = "
+    echo >>make.inc "ARCHFLAGS ="
+    echo >>make.inc "LAPACKLIB    = liblapack.a"
+    echo >>make.inc "TMGLIB       = tmglib.a"
+    echo >>make.inc "EIGSRCLIB    = eigsrc.a"
+    echo >>make.inc "LINSRCLIB    = linsrc.a"
+    make clean
+    make lib
   '';
 
   installPhase = ''
     ensureDir "$out/lib"
+    install -m755 *.a* "$out/lib"
     install -m755 *.so* "$out/lib"
     ln -sf liblapack.so.3 "$out/lib/liblapack.so"
     ln -sf libtmglib.so.3 "$out/lib/libtmglib.so"
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to