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

gnu: opencv: Fix building on non-x86_64 systems. 

* gnu/packages/image-processing.scm (opencv)[arguments]: Add
configure-flag to disable carotene. Don't require x86_64 CPU
except on x86_64. Fix typo.
This commit is contained in:
Efraim Flashner 2019-01-13 22:26:40 +02:00
parent c5c42f0a9c
commit 6949f45c10
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/image-processing.scm
View File

@ -7,6 +7,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2018 Lprndn <guix@lprndn.info> ;;; Copyright © 2018 Lprndn <guix@lprndn.info>
;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -235,6 +236,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
`(#:configure-flags `(#:configure-flags
(list "-DWITH_IPP=OFF" (list "-DWITH_IPP=OFF"
"-DWITH_ITT=OFF" "-DWITH_ITT=OFF"
"-DWITH_CAROTENE=OFF" ; only visible on arm/aarch64
;; CPU-Features: ;; CPU-Features:
;; See cmake/OpenCVCompilerOptimizations.cmake ;; See cmake/OpenCVCompilerOptimizations.cmake
@ -245,10 +247,13 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
"-DCPU_BASELINE=SSE2, NEON" "-DCPU_BASELINE=SSE2, NEON"
"-DCPU_DISPATCH=SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2" "-DCPU_DISPATCH=SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2"
"-DCPU_DISPATCH_REQUIRE=SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2" ,@(if (string-prefix? "x86_64" (or (%current-target-system)
(%current-system)))
'("-DCPU_DISPATCH_REQUIRE=SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2")
'())
"-DBUILD_PERF_TESTS=OFF" "-DBUILD_PERF_TESTS=OFF"
"-D BUILD_TESTS=ON" "-DBUILD_TESTS=ON"
(string-append "-DOPENCV_EXTRA_MODULES_PATH=" (string-append "-DOPENCV_EXTRA_MODULES_PATH="
"/tmp/guix-build-opencv-" ,version ".drv-0" "/tmp/guix-build-opencv-" ,version ".drv-0"