From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CF6DF138334 for ; Sat, 18 Aug 2018 06:13:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AADEE077D; Sat, 18 Aug 2018 06:13:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F36DBE077D for ; Sat, 18 Aug 2018 06:13:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E38933BEA8 for ; Sat, 18 Aug 2018 06:13:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC4923A7 for ; Sat, 18 Aug 2018 06:13:33 +0000 (UTC) From: "Amy Liffey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Liffey" Message-ID: <1534572658.b396186669ec607562148b9f5303565a5d01aa2b.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencv/opencv-3.4.1-r3.ebuild media-libs/opencv/opencv-3.4.1-r4.ebuild X-VCS-Directories: media-libs/opencv/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Liffey X-VCS-Revision: b396186669ec607562148b9f5303565a5d01aa2b X-VCS-Branch: master Date: Sat, 18 Aug 2018 06:13:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ba30148-972a-470e-b0e1-2b2d4fa5f0ac X-Archives-Hash: d6ca10f6fdd3b4bb2506c243e0787b51 commit: b396186669ec607562148b9f5303565a5d01aa2b Author: Ștefan Talpalaru yahoo com> AuthorDate: Fri Aug 17 15:29:18 2018 +0000 Commit: Amy Liffey gentoo org> CommitDate: Sat Aug 18 06:10:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3961866 media-libs/opencv: disable implied CPU flags The OpenCV build system tries to be helpful by enabling unrequested CPU flags based on requested ones. Unfortunately, this breaks the build on AMD Piledriver because FMA3 implies AVX2 which is not available on this architecture. Further more, these CPU flags should only be handled by the corresponding Portage flags, instead of CMake's hard-coded automagic. This commit fixes that by disabling the whole "implication" mechanism for CPU flags, while also undoing the previous attempt at solving the problem by translating those broken "implications" into REQUIRED_USE. Authored-by: Ștefan Talpalaru yahoo.com> Bug: https://bugs.gentoo.org/656638 .../{opencv-3.4.1-r3.ebuild => opencv-3.4.1-r4.ebuild} | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/media-libs/opencv/opencv-3.4.1-r3.ebuild b/media-libs/opencv/opencv-3.4.1-r4.ebuild similarity index 97% rename from media-libs/opencv/opencv-3.4.1-r3.ebuild rename to media-libs/opencv/opencv-3.4.1-r4.ebuild index 89dc5ebc819..e2aeffdea2c 100644 --- a/media-libs/opencv/opencv-3.4.1-r3.ebuild +++ b/media-libs/opencv/opencv-3.4.1-r4.ebuild @@ -41,16 +41,7 @@ REQUIRED_USE=" java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( ${PYTHON_REQUIRED_USE} ) - tesseract? ( contrib ) - cpu_flags_x86_avx2? ( cpu_flags_x86_avx cpu_flags_x86_fma3 ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx2 ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 cpu_flags_x86_popcnt ) - cpu_flags_x86_popcnt? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_sse3 cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse )" + tesseract? ( contrib )" # The following logic is intrinsic in the build system, but we do not enforce # it on the useflags since this just blocks emerging pointlessly: @@ -413,6 +404,7 @@ multilib_src_configure() { # ================================================== # cpu flags, should solve 633900 #=================================================== + -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON -DCPU_DISPATCH= -DENABLE_SSE=$(usex cpu_flags_x86_sse) -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)