me/guix
Archived
1
0
Fork 0
Code Activity

gnu: hdf5: Combine all outputs into one.

Browse source 
* gnu/packages/maths.scm (hdf5): Combine the outputs "out", "bin", "lib" and
  "include" into "out".
  (gmsh, octave): Adapt list of inputs.
This commit is contained in:
Andreas Enge 2015-03-12 22:16:12 +01:00
parent 97ffa451eb
commit 40029cbe30
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/maths.scm
View file

@ -325,7 +325,6 @@ plotting engine by third-party applications like Octave.")
(substitute* "configure" (substitute* "configure"
(("/bin/mv") "mv"))) (("/bin/mv") "mv")))
%standard-phases))) %standard-phases)))
(outputs '("out" "bin" "lib" "include"))
(home-page "http://www.hdfgroup.org") (home-page "http://www.hdfgroup.org")
(synopsis "Management suite for extremely large and complex data") (synopsis "Management suite for extremely large and complex data")
(description "HDF5 is a suite that makes possible the management of (description "HDF5 is a suite that makes possible the management of
@ -358,8 +357,7 @@ extremely large and complex data collections.")
("fltk" ,fltk) ("fltk" ,fltk)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("hdf5-lib" ,hdf5 "lib") ("hdf5" ,hdf5)
("hdf5-include" ,hdf5 "include")
("libxft" ,libxft) ("libxft" ,libxft)
("mesa" ,mesa) ("mesa" ,mesa)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -411,8 +409,7 @@ files.")
`(("fltk" ,fltk) `(("fltk" ,fltk)
("gfortran" ,gfortran-4.8) ("gfortran" ,gfortran-4.8)
("gmp" ,gmp) ("gmp" ,gmp)
("hdf5-lib" ,hdf5 "lib") ("hdf5" ,hdf5)
("hdf5-include" ,hdf5 "include")
("lapack" ,lapack) ("lapack" ,lapack)
("mesa" ,mesa) ("mesa" ,mesa)
("glu" ,glu) ("glu" ,glu)
@ -1098,7 +1095,7 @@ Fresnel integrals, and similar related functions as well.")
(srfi srfi-1) (srfi srfi-1)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils)) (guix build utils))
#:configure-flags #:configure-flags
`(;; Generate position independent code suitable for dynamic libraries `(;; Generate position independent code suitable for dynamic libraries
;; and use WALL timer to get more accurate timing. ;; and use WALL timer to get more accurate timing.
"-Fa" "alg" "-fPIC" "-D" "c" "-DWALL" "-Fa" "alg" "-fPIC" "-D" "c" "-DWALL"
@ -1125,10 +1122,10 @@ Fresnel integrals, and similar related functions as well.")
(alist-cons-after (alist-cons-after
'install 'install-doc 'install 'install-doc
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let ((doc (string-append (assoc-ref outputs "doc") (let ((doc (string-append (assoc-ref outputs "doc")
"/share/doc/atlas"))) "/share/doc/atlas")))
(mkdir-p doc) (mkdir-p doc)
(fold (lambda (file previous) (fold (lambda (file previous)
(and previous (zero? (system* "cp" file doc)))) (and previous (zero? (system* "cp" file doc))))
#t (find-files "../ATLAS/doc" ".*")))) #t (find-files "../ATLAS/doc" ".*"))))
(alist-cons-after (alist-cons-after