| 1 |
commit: 8827b0d229accd44e58e0b3322f51bb97afcbb99 |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 7 15:51:36 2021 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 7 15:57:16 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8827b0d2 |
| 7 |
|
| 8 |
dev-util/vulkan-tools: Fix eclass |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/822249 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
| 13 |
|
| 14 |
...kan-tools-9999.ebuild => vulkan-tools-1.2.189-r1.ebuild} | 13 +++++-------- |
| 15 |
dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 13 +++++-------- |
| 16 |
2 files changed, 10 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild |
| 19 |
similarity index 92% |
| 20 |
copy from dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 21 |
copy to dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild |
| 22 |
index 82f33ec2490..038bf033579 100644 |
| 23 |
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 24 |
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild |
| 25 |
@@ -4,8 +4,7 @@ |
| 26 |
EAPI=7 |
| 27 |
|
| 28 |
MY_PN=Vulkan-Tools |
| 29 |
-CMAKE_ECLASS="cmake-utils" |
| 30 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 31 |
+CMAKE_ECLASS="cmake" |
| 32 |
PYTHON_COMPAT=( python3_{8,9} ) |
| 33 |
inherit cmake-multilib python-any-r1 |
| 34 |
|
| 35 |
@@ -58,12 +57,10 @@ pkg_setup() { |
| 36 |
python-any-r1_pkg_setup |
| 37 |
} |
| 38 |
|
| 39 |
-src_prepare() { |
| 40 |
- cmake-utils_src_prepare |
| 41 |
-} |
| 42 |
- |
| 43 |
multilib_src_configure() { |
| 44 |
local mycmakeargs=( |
| 45 |
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" |
| 46 |
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" |
| 47 |
-DCMAKE_SKIP_RPATH=ON |
| 48 |
-DBUILD_VULKANINFO=ON |
| 49 |
-DBUILD_CUBE=$(usex cube) |
| 50 |
@@ -78,9 +75,9 @@ multilib_src_configure() { |
| 51 |
-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) |
| 52 |
) |
| 53 |
|
| 54 |
- cmake-utils_src_configure |
| 55 |
+ cmake_src_configure |
| 56 |
} |
| 57 |
|
| 58 |
multilib_src_install() { |
| 59 |
- cmake-utils_src_install |
| 60 |
+ cmake_src_install |
| 61 |
} |
| 62 |
|
| 63 |
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 64 |
index 82f33ec2490..038bf033579 100644 |
| 65 |
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 66 |
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild |
| 67 |
@@ -4,8 +4,7 @@ |
| 68 |
EAPI=7 |
| 69 |
|
| 70 |
MY_PN=Vulkan-Tools |
| 71 |
-CMAKE_ECLASS="cmake-utils" |
| 72 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 73 |
+CMAKE_ECLASS="cmake" |
| 74 |
PYTHON_COMPAT=( python3_{8,9} ) |
| 75 |
inherit cmake-multilib python-any-r1 |
| 76 |
|
| 77 |
@@ -58,12 +57,10 @@ pkg_setup() { |
| 78 |
python-any-r1_pkg_setup |
| 79 |
} |
| 80 |
|
| 81 |
-src_prepare() { |
| 82 |
- cmake-utils_src_prepare |
| 83 |
-} |
| 84 |
- |
| 85 |
multilib_src_configure() { |
| 86 |
local mycmakeargs=( |
| 87 |
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" |
| 88 |
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" |
| 89 |
-DCMAKE_SKIP_RPATH=ON |
| 90 |
-DBUILD_VULKANINFO=ON |
| 91 |
-DBUILD_CUBE=$(usex cube) |
| 92 |
@@ -78,9 +75,9 @@ multilib_src_configure() { |
| 93 |
-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) |
| 94 |
) |
| 95 |
|
| 96 |
- cmake-utils_src_configure |
| 97 |
+ cmake_src_configure |
| 98 |
} |
| 99 |
|
| 100 |
multilib_src_install() { |
| 101 |
- cmake-utils_src_install |
| 102 |
+ cmake_src_install |
| 103 |
} |
Archives