commit: ae537a654dadc0b7a77d60fa085cd3a12c8cf72d Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Sun Nov 7 15:53:44 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sun Nov 7 15:57:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae537a65
media-libs/vulkan-loader: 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> ...n-loader-9999.ebuild => vulkan-loader-1.2.189-r1.ebuild} | 13 +++++-------- media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild similarity index 91% copy from media-libs/vulkan-loader/vulkan-loader-9999.ebuild copy to media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild index 45bfc80ea55..035beeeddcc 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild @@ -4,8 +4,7 @@ EAPI=7 MY_PN=Vulkan-Loader -CMAKE_ECLASS="cmake-utils" -CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_ECLASS="cmake" inherit flag-o-matic cmake-multilib toolchain-funcs if [[ ${PV} == *9999* ]]; then @@ -36,10 +35,6 @@ 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 @@ -47,6 +42,8 @@ multilib_src_configure() { fi local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" -DCMAKE_SKIP_RPATH=ON -DBUILD_TESTS=OFF -DBUILD_LOADER=ON @@ -55,13 +52,13 @@ multilib_src_configure() { -DBUILD_WSI_XLIB_SUPPORT=$(usex X) -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_install() { keepdir /etc/vulkan/icd.d - cmake-utils_src_install + cmake_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 45bfc80ea55..035beeeddcc 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -4,8 +4,7 @@ EAPI=7 MY_PN=Vulkan-Loader -CMAKE_ECLASS="cmake-utils" -CMAKE_MAKEFILE_GENERATOR="emake" +CMAKE_ECLASS="cmake" inherit flag-o-matic cmake-multilib toolchain-funcs if [[ ${PV} == *9999* ]]; then @@ -36,10 +35,6 @@ 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 @@ -47,6 +42,8 @@ multilib_src_configure() { fi local mycmakeargs=( + -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" -DCMAKE_SKIP_RPATH=ON -DBUILD_TESTS=OFF -DBUILD_LOADER=ON @@ -55,13 +52,13 @@ multilib_src_configure() { -DBUILD_WSI_XLIB_SUPPORT=$(usex X) -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_install() { keepdir /etc/vulkan/icd.d - cmake-utils_src_install + cmake_src_install } pkg_postinst() {
