[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: gnu: opencv: Fix building on non-x86_64 systems.
From: |
guix-commits |
Subject: |
01/06: gnu: opencv: Fix building on non-x86_64 systems. |
Date: |
Mon, 14 Jan 2019 08:08:05 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 6949f45c105fe75d424420becf854030bf382378
Author: Efraim Flashner <address@hidden>
Date: Sun Jan 13 22:26:40 2019 +0200
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.
---
gnu/packages/image-processing.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index 9c2ec50..9be9ced 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Björn Höfling <address@hidden>
;;; Copyright © 2018 Lprndn <address@hidden>
+;;; Copyright © 2019 Efraim Flashner <address@hidden>
;;;
;;; 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
(list "-DWITH_IPP=OFF"
"-DWITH_ITT=OFF"
+ "-DWITH_CAROTENE=OFF" ; only visible on arm/aarch64
;; CPU-Features:
;; 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_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"
- "-D BUILD_TESTS=ON"
+ "-DBUILD_TESTS=ON"
(string-append "-DOPENCV_EXTRA_MODULES_PATH="
"/tmp/guix-build-opencv-" ,version ".drv-0"
- branch master updated (c5c42f0 -> 6c56e9c), guix-commits, 2019/01/14
- 02/06: gnu: opencv: Don't hardcode build directories., guix-commits, 2019/01/14
- 03/06: gnu: opencv: Update configure flags., guix-commits, 2019/01/14
- 01/06: gnu: opencv: Fix building on non-x86_64 systems.,
guix-commits <=
- 05/06: gnu: python-django-filter: Use 'invoke'., guix-commits, 2019/01/14
- 06/06: gnu: opencv: Use 'git-fetch'., guix-commits, 2019/01/14
- 04/06: gnu: opencv: Loosen test suite failures., guix-commits, 2019/01/14