commit: 86a8cd6ba02ee38117d18ceff837518c6c13a5dd Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sun Nov 7 15:45:45 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sun Nov 7 15:57:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a8cd6b
media-libs/vulkan-layers: Fix eclass Closes: https://bugs.gentoo.org/822249 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> ...kan-layers-9999.ebuild => vulkan-layers-1.2.189-r1.ebuild} | 11 ++++------- media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild similarity index 91% copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild copy to media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild index f53561f9c1f..3e089306269 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild @@ -4,8 +4,7 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers -CMAKE_ECLASS="cmake-utils" -CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 @@ -40,12 +39,10 @@ DEPEND="${RDEPEND} ) " -src_prepare() { - cmake-utils_src_prepare -} - multilib_src_configure() { local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" -DCMAKE_SKIP_RPATH=ON -DBUILD_LAYER_SUPPORT_FILES=ON -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) @@ -56,5 +53,5 @@ multilib_src_configure() { -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index f53561f9c1f..3e089306269 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -4,8 +4,7 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers -CMAKE_ECLASS="cmake-utils" -CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 @@ -40,12 +39,10 @@ DEPEND="${RDEPEND} ) " -src_prepare() { - cmake-utils_src_prepare -} - multilib_src_configure() { local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" -DCMAKE_SKIP_RPATH=ON -DBUILD_LAYER_SUPPORT_FILES=ON -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) @@ -56,5 +53,5 @@ multilib_src_configure() { -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" ) - cmake-utils_src_configure + cmake_src_configure }
