From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EB1B158086 for ; Sun, 7 Nov 2021 15:57:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AC202BC018; Sun, 7 Nov 2021 15:57:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 07C9F2BC016 for ; Sun, 7 Nov 2021 15:57:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01A93343128 for ; Sun, 7 Nov 2021 15:57:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F0C81A8 for ; Sun, 7 Nov 2021 15:57:34 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1636300640.ae537a654dadc0b7a77d60fa085cd3a12c8cf72d.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild media-libs/vulkan-loader/vulkan-loader-9999.ebuild X-VCS-Directories: media-libs/vulkan-loader/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: ae537a654dadc0b7a77d60fa085cd3a12c8cf72d X-VCS-Branch: master Date: Sun, 7 Nov 2021 15:57:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cecdb583-193f-4f71-b70a-8bd63a84943c X-Archives-Hash: 9b582511dd7eca407076e597a0728828 commit: ae537a654dadc0b7a77d60fa085cd3a12c8cf72d Author: Nick Sarnie gentoo org> AuthorDate: Sun Nov 7 15:53:44 2021 +0000 Commit: Nick Sarnie gentoo 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 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() {