diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-21 20:34:49 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-21 20:34:49 +0200 |
| commit | efa0ba499e78af732f302cbcd4002df6e259921e (patch) | |
| tree | 90f57e970497e9a8e089b45d8305ce3ce0a7ceb6 /gnu/packages/machine-learning.scm | |
| parent | 595dcd48a965462ad45f19e42864ae972f34183d (diff) | |
| parent | e2a95f8b16674ae2965bf155b6d28ca5942abb03 (diff) | |
| download | patches-efa0ba499e78af732f302cbcd4002df6e259921e.tar patches-efa0ba499e78af732f302cbcd4002df6e259921e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/machine-learning.scm')
| -rw-r--r-- | gnu/packages/machine-learning.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 291146bab4..4af36d9823 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -520,14 +520,14 @@ and a QP solver.") (define-public dlib (package (name "dlib") - (version "19.3") + (version "19.7") (source (origin (method url-fetch) (uri (string-append "http://dlib.net/files/dlib-" version ".tar.bz2")) (sha256 (base32 - "0gfy83av717qymv53yv7ki6mgh6mdw4xcxxbjk8lrs72f8qvnrcw")) + "1mljz02kwkrbggyncxv5fpnyjdybw2qihaacb3js8yfkw12vwpc2")) (modules '((guix build utils))) (snippet '(begin @@ -537,7 +537,11 @@ and a QP solver.") #t)))) (build-system cmake-build-system) (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 (add-after 'unpack 'disable-asserts (lambda _ @@ -572,7 +576,6 @@ and a QP solver.") ;; No test target, so we build and run the unit tests here. (let ((test-dir (string-append "../dlib-" ,version "/dlib/test"))) (with-directory-excursion test-dir - (setenv "CXXFLAGS" "-std=gnu++11") (and (zero? (system* "make" "-j" (number->string (parallel-job-count)))) (zero? (system* "./dtest" "--runall"))))))) (add-after 'install 'delete-static-library |