commit: 8827b0d229accd44e58e0b3322f51bb97afcbb99 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sun Nov 7 15:51:36 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sun Nov 7 15:57:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8827b0d2
dev-util/vulkan-tools: Fix eclass Bug: 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-tools-9999.ebuild => vulkan-tools-1.2.189-r1.ebuild} | 13 +++++-------- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild similarity index 92% copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild copy to dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild index 82f33ec2490..038bf033579 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild @@ -4,8 +4,7 @@ EAPI=7 MY_PN=Vulkan-Tools -CMAKE_ECLASS="cmake-utils" -CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 @@ -58,12 +57,10 @@ pkg_setup() { python-any-r1_pkg_setup } -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_VULKANINFO=ON -DBUILD_CUBE=$(usex cube) @@ -78,9 +75,9 @@ multilib_src_configure() { -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_install() { - cmake-utils_src_install + cmake_src_install } diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 82f33ec2490..038bf033579 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -4,8 +4,7 @@ EAPI=7 MY_PN=Vulkan-Tools -CMAKE_ECLASS="cmake-utils" -CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_ECLASS="cmake" PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 @@ -58,12 +57,10 @@ pkg_setup() { python-any-r1_pkg_setup } -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_VULKANINFO=ON -DBUILD_CUBE=$(usex cube) @@ -78,9 +75,9 @@ multilib_src_configure() { -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_install() { - cmake-utils_src_install + cmake_src_install }
