commit: d52e6e589ebd7b0f5abc4b700c95a99b67a32776 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sat Aug 7 15:01:48 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Aug 7 15:03:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52e6e58
media-libs/vulkan-layers: Make sure NDEBUG is set Closes: 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-layers-9999.ebuild => vulkan-layers-1.2.182-r1.ebuild} | 13 +++++++++---- ...kan-layers-9999.ebuild => vulkan-layers-1.2.182.ebuildu} | 6 ++++-- media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 13 +++++++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild similarity index 86% copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild copy to media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild index 581d5596cdd..7e1ddb7b15e 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.2.182-r1.ebuild @@ -4,8 +4,9 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers -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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -39,6 +40,10 @@ DEPEND="${RDEPEND} ) " +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -51,5 +56,5 @@ multilib_src_configure() { -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" ) - cmake_src_configure + cmake-utils_src_configure } diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuildu similarity index 91% copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild copy to media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuildu index 581d5596cdd..4cccb1b6e68 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.2.182.ebuildu @@ -5,7 +5,8 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) +CMAKE_BUILD_TYPE="Release" 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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -40,6 +41,7 @@ DEPEND="${RDEPEND} " multilib_src_configure() { + CMAKE_BUILD_TYPE="Release" local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON -DBUILD_LAYER_SUPPORT_FILES=ON diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild index 581d5596cdd..7e1ddb7b15e 100644 --- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild @@ -4,8 +4,9 @@ EAPI=7 MY_PN=Vulkan-ValidationLayers -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" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -39,6 +40,10 @@ DEPEND="${RDEPEND} ) " +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -51,5 +56,5 @@ multilib_src_configure() { -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" -DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" ) - cmake_src_configure + cmake-utils_src_configure }
