TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: flann: Remove "octave" output.

Browse source 
Octave support currently fails to build and is not used by any other
package in Guix.

* gnu/packages/maths.scm (flann)[outputs]: Remove "octave" output.
[inputs]: Remove OCTAVE-CLI.
[arguments]: Remove 'set-octave-directory' phase.
This commit is contained in:
Ludovic Courtès 2020-05-10 16:05:31 +02:00
parent 22bff285b4
commit f8bb53caad
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/maths.scm
View file

@ -3939,13 +3939,16 @@ (define-public flann
"022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz")) "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"))
(patches (search-patches "flann-cmake-3.11.patch")))) (patches (search-patches "flann-cmake-3.11.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" (outputs '("out"))
"octave")) ;46 MiB .mex file that pulls Octave
(native-inputs (native-inputs
`(("unzip" ,unzip))) `(("unzip" ,unzip)))
(inputs (inputs
`(("hdf5" ,hdf5) `(("hdf5" ,hdf5)
("octave" ,octave-cli) ;; FIXME: 'mkoctfile' fails with a linker error:
;; ld: cannot find -loctinterp
;; ld: cannot find -loctave
;; Disable it for now.
;;("octave" ,octave-cli)
("python" ,python-2) ; print syntax ("python" ,python-2) ; print syntax
;; ("python2-numpy" ,python2-numpy) ; only required for the tests ;; ("python2-numpy" ,python2-numpy) ; only required for the tests
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -3958,14 +3961,6 @@ (define-public flann
;; Save 12 MiB by not installing .a files. Passing ;; Save 12 MiB by not installing .a files. Passing
;; '-DBUILD_STATIC_LIBS=OFF' has no effect. ;; '-DBUILD_STATIC_LIBS=OFF' has no effect.
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'set-octave-directory
(lambda* (#:key outputs #:allow-other-keys)
;; Install the .mex file in the "octave" output.
(let ((out (assoc-ref outputs "octave")))
(substitute* "src/matlab/CMakeLists.txt"
(("share/flann/octave")
(string-append out "/share/flann/octave")))
#t)))
(add-after 'install 'remove-static-libraries (add-after 'install 'remove-static-libraries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))