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 C7F97158089 for ; Sat, 28 Oct 2023 21:46:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B1212BC018; Sat, 28 Oct 2023 21:46:20 +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 7DB7C2BC018 for ; Sat, 28 Oct 2023 21:46:20 +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 87C9F335C52 for ; Sat, 28 Oct 2023 21:46:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2EB211BA for ; Sat, 28 Oct 2023 21:46:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1698529436.5ec2935c4a72141d81fbf2910128470321fdd92e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch media-libs/opencolorio/opencolorio-2.3.0.ebuild X-VCS-Directories: media-libs/opencolorio/files/ media-libs/opencolorio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5ec2935c4a72141d81fbf2910128470321fdd92e X-VCS-Branch: master Date: Sat, 28 Oct 2023 21:46:17 +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: 4d393301-affe-47e6-a98d-dd39b7dca745 X-Archives-Hash: 78f22a8d13fe351fc0f627942e4175ee commit: 5ec2935c4a72141d81fbf2910128470321fdd92e Author: Paul Zander gmail com> AuthorDate: Sat Oct 28 10:49:24 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 28 21:43:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec2935c media-libs/opencolorio: 2.3.0 Correctly recover CXX_FLAGS >From https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1861 CXXFLAGS is backed up in the beginning of CheckSupportSSE2, but it is not correctly recovered. Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> .../files/opencolorio-2.3.0-fix-cxxflags.patch | 23 ++++++++++++++++++++++ media-libs/opencolorio/opencolorio-2.3.0.ebuild | 1 + 2 files changed, 24 insertions(+) diff --git a/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch b/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch new file mode 100644 index 000000000000..cefae22a00e6 --- /dev/null +++ b/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch @@ -0,0 +1,23 @@ +From d69edd3ef411853cd780b75cf260295a39a8a49f Mon Sep 17 00:00:00 2001 +From: Eric Renaud-Houde +Date: Wed, 20 Sep 2023 15:10:46 -0400 +Subject: [PATCH] Correctly reset CMAKE_CXX_FLAGS. + +Signed-off-by: Eric Renaud-Houde +--- + share/cmake/utils/CheckSupportSSE2.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/share/cmake/utils/CheckSupportSSE2.cmake b/share/cmake/utils/CheckSupportSSE2.cmake +index 8c929c7e9..6a07155de 100644 +--- a/share/cmake/utils/CheckSupportSSE2.cmake ++++ b/share/cmake/utils/CheckSupportSSE2.cmake +@@ -59,7 +59,7 @@ else() + message(STATUS "Performing Test COMPILER_SUPPORTS_SSE2 - Failed") + endif() + +-set(CMAKE_REQUIRED_FLAGS "${_cmake_cxx_flags_orig}") ++set(CMAKE_CXX_FLAGS "${_cmake_cxx_flags_orig}") + unset(_cmake_cxx_flags_orig) + + if(__universal_build) diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild b/media-libs/opencolorio/opencolorio-2.3.0.ebuild index a89bc43446ab..13f9c323a420 100644 --- a/media-libs/opencolorio/opencolorio-2.3.0.ebuild +++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild @@ -82,6 +82,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch" "${FILESDIR}/${PN}-2.3.0-support-yaml-cpp-0.8.0.patch" + "${FILESDIR}/${PN}-2.3.0-fix-cxxflags.patch" ) pkg_setup() {