commit: f417aa0799113b639784eb3e7409e66da76e582f Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sat Aug 7 19:32:31 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Aug 7 19:36:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f417aa07
media-libs/vulkan-loader: 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> ...loader-9999.ebuild => vulkan-loader-1.2.182-r1.ebuild} | 15 ++++++++++----- media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild similarity index 86% copy from media-libs/vulkan-loader/vulkan-loader-9999.ebuild copy to media-libs/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild index 22fae7e6067..45bfc80ea55 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.182-r1.ebuild @@ -4,7 +4,8 @@ EAPI=7 MY_PN=Vulkan-Loader -CMAKE_ECLASS="cmake" +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" inherit flag-o-matic cmake-multilib toolchain-funcs if [[ ${PV} == *9999* ]]; then @@ -13,7 +14,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 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -26,7 +27,7 @@ IUSE="layers wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND=" - >=dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-headers-${PV} wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] @@ -35,6 +36,10 @@ DEPEND=" " PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { # Integrated clang assembler doesn't work with x86 - Bug #698164 if tc-is-clang && [[ ${ABI} == x86 ]]; then @@ -50,13 +55,13 @@ multilib_src_configure() { -DBUILD_WSI_XLIB_SUPPORT=$(usex X) -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) - cmake_src_configure + cmake-utils_src_configure } multilib_src_install() { keepdir /etc/vulkan/icd.d - cmake_src_install + cmake-utils_src_install } pkg_postinst() { diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index 22fae7e6067..45bfc80ea55 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -4,7 +4,8 @@ EAPI=7 MY_PN=Vulkan-Loader -CMAKE_ECLASS="cmake" +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" inherit flag-o-matic cmake-multilib toolchain-funcs if [[ ${PV} == *9999* ]]; then @@ -13,7 +14,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 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -26,7 +27,7 @@ IUSE="layers wayland X" BDEPEND=">=dev-util/cmake-3.10.2" DEPEND=" - >=dev-util/vulkan-headers-${PV} + ~dev-util/vulkan-headers-${PV} wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] @@ -35,6 +36,10 @@ DEPEND=" " PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { # Integrated clang assembler doesn't work with x86 - Bug #698164 if tc-is-clang && [[ ${ABI} == x86 ]]; then @@ -50,13 +55,13 @@ multilib_src_configure() { -DBUILD_WSI_XLIB_SUPPORT=$(usex X) -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) - cmake_src_configure + cmake-utils_src_configure } multilib_src_install() { keepdir /etc/vulkan/icd.d - cmake_src_install + cmake-utils_src_install } pkg_postinst() {
