1 |
commit: 86a8cd6ba02ee38117d18ceff837518c6c13a5dd |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 7 15:45:45 2021 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 7 15:57:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a8cd6b |
7 |
|
8 |
media-libs/vulkan-layers: Fix eclass |
9 |
|
10 |
Closes: 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-layers-9999.ebuild => vulkan-layers-1.2.189-r1.ebuild} | 11 ++++------- |
15 |
media-libs/vulkan-layers/vulkan-layers-9999.ebuild | 11 ++++------- |
16 |
2 files changed, 8 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild |
19 |
similarity index 91% |
20 |
copy from media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
21 |
copy to media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild |
22 |
index f53561f9c1f..3e089306269 100644 |
23 |
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
24 |
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.189-r1.ebuild |
25 |
@@ -4,8 +4,7 @@ |
26 |
EAPI=7 |
27 |
|
28 |
MY_PN=Vulkan-ValidationLayers |
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 |
@@ -40,12 +39,10 @@ DEPEND="${RDEPEND} |
36 |
) |
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_LAYER_SUPPORT_FILES=ON |
49 |
-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) |
50 |
@@ -56,5 +53,5 @@ multilib_src_configure() { |
51 |
-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" |
52 |
-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" |
53 |
) |
54 |
- cmake-utils_src_configure |
55 |
+ cmake_src_configure |
56 |
} |
57 |
|
58 |
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
59 |
index f53561f9c1f..3e089306269 100644 |
60 |
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
61 |
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild |
62 |
@@ -4,8 +4,7 @@ |
63 |
EAPI=7 |
64 |
|
65 |
MY_PN=Vulkan-ValidationLayers |
66 |
-CMAKE_ECLASS="cmake-utils" |
67 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
68 |
+CMAKE_ECLASS="cmake" |
69 |
PYTHON_COMPAT=( python3_{8,9} ) |
70 |
inherit cmake-multilib python-any-r1 |
71 |
|
72 |
@@ -40,12 +39,10 @@ DEPEND="${RDEPEND} |
73 |
) |
74 |
" |
75 |
|
76 |
-src_prepare() { |
77 |
- cmake-utils_src_prepare |
78 |
-} |
79 |
- |
80 |
multilib_src_configure() { |
81 |
local mycmakeargs=( |
82 |
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" |
83 |
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" |
84 |
-DCMAKE_SKIP_RPATH=ON |
85 |
-DBUILD_LAYER_SUPPORT_FILES=ON |
86 |
-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) |
87 |
@@ -56,5 +53,5 @@ multilib_src_configure() { |
88 |
-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/" |
89 |
-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv" |
90 |
) |
91 |
- cmake-utils_src_configure |
92 |
+ cmake_src_configure |
93 |
} |