commit: 296a7e3ebc72720e8bf385b2a2508b099245df44 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sat Aug 7 19:35:35 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Aug 7 19:36:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=296a7e3e
dev-util/vulkan-tools: Make sure NDEBUG is set Bug: https://bugs.gentoo.org/796662 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> ...n-tools-9999.ebuild => vulkan-tools-1.2.182-r1.ebuild} | 15 ++++++++++----- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild similarity index 87% copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild copy to dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild index 217cda131c4..82f33ec2490 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild @@ -4,8 +4,9 @@ EAPI=7 MY_PN=Vulkan-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -57,6 +58,10 @@ pkg_setup() { python-any-r1_pkg_setup } +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -73,9 +78,9 @@ multilib_src_configure() { -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) - cmake_src_configure + cmake-utils_src_configure } multilib_src_install() { - cmake_src_install + cmake-utils_src_install } diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 217cda131c4..82f33ec2490 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -4,8 +4,9 @@ EAPI=7 MY_PN=Vulkan-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -57,6 +58,10 @@ pkg_setup() { python-any-r1_pkg_setup } +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -73,9 +78,9 @@ multilib_src_configure() { -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) - cmake_src_configure + cmake-utils_src_configure } multilib_src_install() { - cmake_src_install + cmake-utils_src_install }
