| 1 |
commit: ce04c0d73800992a2cea29537516573e5bfd20cc |
| 2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Fri Apr 9 18:42:40 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 11 02:13:53 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce04c0d7 |
| 7 |
|
| 8 |
meson.eclass: Support dev-util/samurai |
| 9 |
|
| 10 |
samurai is a ninja-compatible build tool written in C which |
| 11 |
works with cmake, meson and other users of ninja. |
| 12 |
|
| 13 |
It is feature-complete and supports most of the same options |
| 14 |
as ninja. |
| 15 |
|
| 16 |
Signed-off-by: orbea <orbea <AT> riseup.net> |
| 17 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 18 |
|
| 19 |
eclass/meson.eclass | 4 +++- |
| 20 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 23 |
index f2f7173f5a9a..905c4d89f501 100644 |
| 24 |
--- a/eclass/meson.eclass |
| 25 |
+++ b/eclass/meson.eclass |
| 26 |
@@ -48,7 +48,7 @@ inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs |
| 27 |
EXPORT_FUNCTIONS src_configure src_compile src_test src_install |
| 28 |
|
| 29 |
_MESON_DEPEND=">=dev-util/meson-0.59.4 |
| 30 |
- >=dev-util/ninja-1.8.2 |
| 31 |
+ ${NINJA_DEPEND} |
| 32 |
dev-util/meson-format-array |
| 33 |
" |
| 34 |
|
| 35 |
@@ -285,6 +285,8 @@ meson_feature() { |
| 36 |
meson_src_configure() { |
| 37 |
debug-print-function ${FUNCNAME} "$@" |
| 38 |
|
| 39 |
+ [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" |
| 40 |
+ |
| 41 |
local BUILD_CFLAGS=${BUILD_CFLAGS} |
| 42 |
local BUILD_CPPFLAGS=${BUILD_CPPFLAGS} |
| 43 |
local BUILD_CXXFLAGS=${BUILD_CXXFLAGS} |
Archives