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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0AF4158094 for ; Wed, 28 Sep 2022 08:19:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3DBFE07C5; Wed, 28 Sep 2022 08:19:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6573E07C5 for ; Wed, 28 Sep 2022 08:19:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B31B3410C5 for ; Wed, 28 Sep 2022 08:19:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B68C75 for ; Wed, 28 Sep 2022 08:19:53 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1664353166.eaa51858d9d2701d98839236338cad3acd3389c1.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch media-libs/openexr/openexr-3.1.5.ebuild X-VCS-Directories: media-libs/openexr/ media-libs/openexr/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: eaa51858d9d2701d98839236338cad3acd3389c1 X-VCS-Branch: master Date: Wed, 28 Sep 2022 08:19:53 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e54acbaa-a3c3-4e34-8009-e3cb5e48b3b9 X-Archives-Hash: 1237fb05877eb02c49617ee9ab8e3193 commit: eaa51858d9d2701d98839236338cad3acd3389c1 Author: Bernd Waibel posteo net> AuthorDate: Tue Sep 27 17:23:45 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Sep 28 08:19:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa51858 media-libs/openexr: fix build issue on x86 The package can fail to build on x86_32 if -march=native is set. This sets the -mf16c intrinsic which isn't available on every x86_32 arch. The patch replaces -march=native with -march=i686 if x86 is used. Also disable a failing test for x86. Closes: https://bugs.gentoo.org/840580 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/27498 Signed-off-by: Joonas Niilola gentoo.org> ...openexr-3.1.5-drop-failing-testDwaLookups.patch | 29 ++++++++++++++++++++++ media-libs/openexr/openexr-3.1.5.ebuild | 10 +++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch b/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch new file mode 100644 index 000000000000..7579ddd23156 --- /dev/null +++ b/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch @@ -0,0 +1,29 @@ +From 6f3c61b994e9a503fcc9649cba439d81f40901d0 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Tue, 27 Sep 2022 07:29:11 +0200 +Subject: [PATCH] drop failing testDwaLookups + +On x86_32 testDwaLookups fails + +Signed-off-by: Bernd Waibel +--- a/src/test/OpenEXRTest/main.cpp ++++ b/src/test/OpenEXRTest/main.cpp +@@ -65,7 +65,6 @@ + #include "testDwaCompressorSimd.h" + #include "testRle.h" + #include "testB44ExpLogTable.h" +-#include "testDwaLookups.h" + #include "testIDManifest.h" + + #include "tmpDir.h" +@@ -229,7 +228,6 @@ main (int argc, char *argv[]) + TEST (testDwaCompressorSimd, "basic"); + TEST (testRle, "core"); + TEST (testB44ExpLogTable, "core"); +- TEST (testDwaLookups, "core"); + TEST (testIDManifest, "core"); + + // NB: If you add a test here, make sure to enumerate it in the +-- +2.37.3 + diff --git a/media-libs/openexr/openexr-3.1.5.ebuild b/media-libs/openexr/openexr-3.1.5.ebuild index b13e0484bc86..14c4a1e4c3ba 100644 --- a/media-libs/openexr/openexr-3.1.5.ebuild +++ b/media-libs/openexr/openexr-3.1.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake +inherit cmake flag-o-matic MY_PN=OpenEXR @@ -43,10 +43,18 @@ src_prepare() { sed -e "s:/var/tmp/:${T}:" \ -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" + if use x86; then + eapply "${FILESDIR}"/${P}-drop-failing-testDwaLookups.patch + fi + cmake_src_prepare } src_configure() { + if use x86; then + replace-cpu-flags native i686 + fi + local mycmakeargs=( -DBUILD_TESTING=$(usex test) -DDOCS=$(usex doc)