[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: opencv: Update configure flags.
From: |
guix-commits |
Subject: |
01/01: gnu: opencv: Update configure flags. |
Date: |
Tue, 15 Jan 2019 06:20:38 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit ebe0271aa0d4f7eb91a1c48c34fee8825bf5ead4
Author: Efraim Flashner <address@hidden>
Date: Tue Jan 15 13:18:00 2019 +0200
gnu: opencv: Update configure flags.
* gnu/packages/image-processing.scm (opencv)[arguments]: Change the
configure-flags on a per-architecture basis.
---
gnu/packages/image-processing.scm | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index bd5e88b..32ba1da 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -61,7 +61,8 @@
#:use-module (gnu packages video)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (ice-9 match))
;; We use the latest snapshot of this package because the latest release is
;; from 2011 and has known vulnerabilities that cannot easily be fixed by
@@ -247,14 +248,19 @@ integrates with various databases on GUI toolkits such as
Qt and Tk.")
;; (CPU_ALL_OPTIMIZATIONS) for a list of all optimizations
;; BASELINE is the minimum optimization all CPUs must support
;;
- ;; DISPATCH is the list of optional dispatches. We add them all.
- "-DCPU_BASELINE=SSE2, NEON"
+ ;; DISPATCH is the list of optional dispatches.
+ "-DCPU_BASELINE=SSE2"
-
"-DCPU_DISPATCH=NEON;VFPV3;FP16;SSE;SSE2;SSE3;SSSE3;SSE4_1;SSE4_2;POPCNT;AVX;FP16;AVX2;FMA3;AVX_512F;AVX512_SKX"
- ,@(if (string-prefix? "x86_64" (or (%current-target-system)
- (%current-system)))
-
'("-DCPU_DISPATCH_REQUIRE=SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2")
- '())
+ ,@(match (%current-system)
+ ("x86_64-linux"
+
'("-DCPU_DISPATCH=NEON;VFPV3;FP16;SSE;SSE2;SSE3;SSSE3;SSE4_1;SSE4_2;POPCNT;AVX;FP16;AVX2;FMA3;AVX_512F;AVX512_SKX"
+
"-DCPU_DISPATCH_REQUIRE=SSE3,SSSE3,SSE4_1,SSE4_2,AVX,AVX2"))
+ ("armhf-linux"
+ '("-DCPU_BASELINE_DISABLE=NEON")) ; causes build failures
+ ("aarch64-linux"
+ '("-DCPU_BASELINE=NEON"
+ "-DCPU_DISPATCH=NEON;VFPV3;FP16"))
+ (_ '()))
"-DBUILD_PERF_TESTS=OFF"
"-DBUILD_TESTS=ON"