| 1 |
commit: ae537a654dadc0b7a77d60fa085cd3a12c8cf72d |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 7 15:53:44 2021 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 7 15:57:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae537a65 |
| 7 |
|
| 8 |
media-libs/vulkan-loader: 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 |
...n-loader-9999.ebuild => vulkan-loader-1.2.189-r1.ebuild} | 13 +++++-------- |
| 15 |
media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 13 +++++-------- |
| 16 |
2 files changed, 10 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild |
| 19 |
similarity index 91% |
| 20 |
copy from media-libs/vulkan-loader/vulkan-loader-9999.ebuild |
| 21 |
copy to media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild |
| 22 |
index 45bfc80ea55..035beeeddcc 100644 |
| 23 |
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild |
| 24 |
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.189-r1.ebuild |
| 25 |
@@ -4,8 +4,7 @@ |
| 26 |
EAPI=7 |
| 27 |
|
| 28 |
MY_PN=Vulkan-Loader |
| 29 |
-CMAKE_ECLASS="cmake-utils" |
| 30 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 31 |
+CMAKE_ECLASS="cmake" |
| 32 |
inherit flag-o-matic cmake-multilib toolchain-funcs |
| 33 |
|
| 34 |
if [[ ${PV} == *9999* ]]; then |
| 35 |
@@ -36,10 +35,6 @@ DEPEND=" |
| 36 |
" |
| 37 |
PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" |
| 38 |
|
| 39 |
-src_prepare() { |
| 40 |
- cmake-utils_src_prepare |
| 41 |
-} |
| 42 |
- |
| 43 |
multilib_src_configure() { |
| 44 |
# Integrated clang assembler doesn't work with x86 - Bug #698164 |
| 45 |
if tc-is-clang && [[ ${ABI} == x86 ]]; then |
| 46 |
@@ -47,6 +42,8 @@ multilib_src_configure() { |
| 47 |
fi |
| 48 |
|
| 49 |
local mycmakeargs=( |
| 50 |
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" |
| 51 |
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" |
| 52 |
-DCMAKE_SKIP_RPATH=ON |
| 53 |
-DBUILD_TESTS=OFF |
| 54 |
-DBUILD_LOADER=ON |
| 55 |
@@ -55,13 +52,13 @@ multilib_src_configure() { |
| 56 |
-DBUILD_WSI_XLIB_SUPPORT=$(usex X) |
| 57 |
-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" |
| 58 |
) |
| 59 |
- cmake-utils_src_configure |
| 60 |
+ cmake_src_configure |
| 61 |
} |
| 62 |
|
| 63 |
multilib_src_install() { |
| 64 |
keepdir /etc/vulkan/icd.d |
| 65 |
|
| 66 |
- cmake-utils_src_install |
| 67 |
+ cmake_src_install |
| 68 |
} |
| 69 |
|
| 70 |
pkg_postinst() { |
| 71 |
|
| 72 |
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild |
| 73 |
index 45bfc80ea55..035beeeddcc 100644 |
| 74 |
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild |
| 75 |
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild |
| 76 |
@@ -4,8 +4,7 @@ |
| 77 |
EAPI=7 |
| 78 |
|
| 79 |
MY_PN=Vulkan-Loader |
| 80 |
-CMAKE_ECLASS="cmake-utils" |
| 81 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 82 |
+CMAKE_ECLASS="cmake" |
| 83 |
inherit flag-o-matic cmake-multilib toolchain-funcs |
| 84 |
|
| 85 |
if [[ ${PV} == *9999* ]]; then |
| 86 |
@@ -36,10 +35,6 @@ DEPEND=" |
| 87 |
" |
| 88 |
PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )" |
| 89 |
|
| 90 |
-src_prepare() { |
| 91 |
- cmake-utils_src_prepare |
| 92 |
-} |
| 93 |
- |
| 94 |
multilib_src_configure() { |
| 95 |
# Integrated clang assembler doesn't work with x86 - Bug #698164 |
| 96 |
if tc-is-clang && [[ ${ABI} == x86 ]]; then |
| 97 |
@@ -47,6 +42,8 @@ multilib_src_configure() { |
| 98 |
fi |
| 99 |
|
| 100 |
local mycmakeargs=( |
| 101 |
+ -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" |
| 102 |
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" |
| 103 |
-DCMAKE_SKIP_RPATH=ON |
| 104 |
-DBUILD_TESTS=OFF |
| 105 |
-DBUILD_LOADER=ON |
| 106 |
@@ -55,13 +52,13 @@ multilib_src_configure() { |
| 107 |
-DBUILD_WSI_XLIB_SUPPORT=$(usex X) |
| 108 |
-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" |
| 109 |
) |
| 110 |
- cmake-utils_src_configure |
| 111 |
+ cmake_src_configure |
| 112 |
} |
| 113 |
|
| 114 |
multilib_src_install() { |
| 115 |
keepdir /etc/vulkan/icd.d |
| 116 |
|
| 117 |
- cmake-utils_src_install |
| 118 |
+ cmake_src_install |
| 119 |
} |
| 120 |
|
| 121 |
pkg_postinst() { |
Archives