diff options
| author |   Paul Zander <negril.nx+gentoo@gmail.com> | 2023-10-28 12:49:24 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-10-28 22:43:56 +0100 |
| commit | 5ec2935c4a72141d81fbf2910128470321fdd92e (patch) | |
| tree | a71413b61820ca37b564fc365e00c57f170e89c6 /media-libs/opencolorio | |
| parent | media-libs/opencolorio: fix 2.2.1 doc with newer doxygen (diff) | |
| download | gentoo-5ec2935c4a72141d81fbf2910128470321fdd92e.tar.gz gentoo-5ec2935c4a72141d81fbf2910128470321fdd92e.tar.bz2 gentoo-5ec2935c4a72141d81fbf2910128470321fdd92e.zip | |
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 <negril.nx+gentoo@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/opencolorio')
| -rw-r--r-- | media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch | 23 | ||||
| -rw-r--r-- | media-libs/opencolorio/opencolorio-2.3.0.ebuild | 1 |
2 files changed, 24 insertions, 0 deletions
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 <eric.renaud.houde@gmail.com> +Date: Wed, 20 Sep 2023 15:10:46 -0400 +Subject: [PATCH] Correctly reset CMAKE_CXX_FLAGS. + +Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com> +--- + 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() { |