nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: dlib: Update to 19.7. 

* gnu/packages/machine-learning.scm (dlib): Update to 19.7.
[arguments]: Add #:configure-flags.  Remove redundant CXXFLAGS from 'check' phase.
This commit is contained in:
Marius Bakke 2017-09-21 20:04:36 +02:00
parent 0cdb6ab499
commit abe97a58be
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/machine-learning.scm
View File

@ -524,14 +524,14 @@ and a QP solver.")
(define-public dlib (define-public dlib
(package (package
(name "dlib") (name "dlib")
(version "19.3") (version "19.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://dlib.net/files/dlib-" version ".tar.bz2")) "http://dlib.net/files/dlib-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0gfy83av717qymv53yv7ki6mgh6mdw4xcxxbjk8lrs72f8qvnrcw")) "1mljz02kwkrbggyncxv5fpnyjdybw2qihaacb3js8yfkw12vwpc2"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -541,7 +541,11 @@ and a QP solver.")
#t)))) #t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases ;; Recent releases defaults to "lib64" on 64bit.
`(#:configure-flags (list (string-append "-DCMAKE_INSTALL_LIBDIR="
(assoc-ref %outputs "out")
"/lib"))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'disable-asserts (add-after 'unpack 'disable-asserts
(lambda _ (lambda _
@ -576,7 +580,6 @@ and a QP solver.")
;; No test target, so we build and run the unit tests here. ;; No test target, so we build and run the unit tests here.
(let ((test-dir (string-append "../dlib-" ,version "/dlib/test"))) (let ((test-dir (string-append "../dlib-" ,version "/dlib/test")))
(with-directory-excursion test-dir (with-directory-excursion test-dir
(setenv "CXXFLAGS" "-std=gnu++11")
(and (zero? (system* "make" "-j" (number->string (parallel-job-count)))) (and (zero? (system* "make" "-j" (number->string (parallel-job-count))))
(zero? (system* "./dtest" "--runall"))))))) (zero? (system* "./dtest" "--runall")))))))
(add-after 'install 'delete-static-library (add-after 'install 'delete-static-library