summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Liffey <amynka@gentoo.org>2019-01-24 09:54:25 +0100
committerAmy Liffey <amynka@gentoo.org>2019-01-24 10:24:08 +0100
commitfeeb7a004035ddf5a3c45b19399165cff76c6f82 (patch)
tree95210314fd6d7811d116d693c21067d505424c2e /media-libs/opencv/files
parentnet-libs/gsoap: Removed old. (diff)
downloadgentoo-feeb7a004035ddf5a3c45b19399165cff76c6f82.tar.gz
gentoo-feeb7a004035ddf5a3c45b19399165cff76c6f82.tar.bz2
gentoo-feeb7a004035ddf5a3c45b19399165cff76c6f82.zip
media-libs/opencv: fix popcnt detection
Closes: https://bugs.gentoo.org/633900 Submitted-by: Branko Grubic <bitlord0xff@gmail.com> Signed-off-by: Amy Liffey <amynka@gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11
Diffstat (limited to 'media-libs/opencv/files')
-rw-r--r--media-libs/opencv/files/opencv-3.4.1-popcnt.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-3.4.1-popcnt.patch b/media-libs/opencv/files/opencv-3.4.1-popcnt.patch
new file mode 100644
index 000000000000..51a6d554a252
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-popcnt.patch
@@ -0,0 +1,30 @@
+From a2d6fc7ac040c6ef94a36515f9ea24428f8f1ecc Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@intel.com>
+Date: Tue, 24 Apr 2018 12:40:25 +0300
+Subject: [PATCH] cmake: fix popcnt detection
+
+via GCC/Clang __POPCNT__ define
+---
+ cmake/checks/cpu_popcnt.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/checks/cpu_popcnt.cpp b/cmake/checks/cpu_popcnt.cpp
+index 16e5575108b..44c7deda053 100644
+--- a/cmake/checks/cpu_popcnt.cpp
++++ b/cmake/checks/cpu_popcnt.cpp
+@@ -4,12 +4,14 @@
+ # define CV_POPCNT_U64 _mm_popcnt_u64
+ # endif
+ # define CV_POPCNT_U32 _mm_popcnt_u32
+-#else
++#elif defined(__POPCNT__)
+ # include <popcntintrin.h>
+ # if defined(__x86_64__)
+ # define CV_POPCNT_U64 __builtin_popcountll
+ # endif
+ # define CV_POPCNT_U32 __builtin_popcount
++#else
++# error "__POPCNT__ is not defined by compiler"
+ #endif
+
+ int main()