| 1 |
Signed-off-by: Mike Gilbert <floppym@g.o> |
| 2 |
--- |
| 3 |
eclass/meson.eclass | 44 ++++++++++++++++++++++---------------------- |
| 4 |
1 file changed, 22 insertions(+), 22 deletions(-) |
| 5 |
|
| 6 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 7 |
index 6296f1dd26e5..7bd4b7ec8395 100644 |
| 8 |
--- a/eclass/meson.eclass |
| 9 |
+++ b/eclass/meson.eclass |
| 10 |
@@ -107,8 +107,8 @@ print("[{}]".format( |
| 11 |
", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))]))) |
| 12 |
EOF |
| 13 |
|
| 14 |
-# @FUNCTION: _meson_env_array |
| 15 |
-# @INTERNAL |
| 16 |
+# @FUNCTION: meson_env_array |
| 17 |
+# @USAGE: <shell-compatible argument string> ... |
| 18 |
# @DESCRIPTION: |
| 19 |
# Parses the command line flags and converts them into an array suitable for |
| 20 |
# use in a cross file. |
| 21 |
@@ -125,7 +125,7 @@ EOF |
| 22 |
# '--full-word-backslash=Hello World', '--simple', '--unicode-8=©', |
| 23 |
# '--unicode-16=𐐷', '--unicode-32=𐤅'] |
| 24 |
# |
| 25 |
-_meson_env_array() { |
| 26 |
+meson_env_array() { |
| 27 |
local python="$(eselect python show)" |
| 28 |
${python} -c "${__MESON_ARRAY_PARSER}" "$@" |
| 29 |
} |
| 30 |
@@ -174,29 +174,29 @@ _meson_create_cross_file() { |
| 31 |
|
| 32 |
cat > "${fn}" <<-EOF |
| 33 |
[binaries] |
| 34 |
- ar = $(_meson_env_array "$(tc-getAR)") |
| 35 |
- c = $(_meson_env_array "$(tc-getCC)") |
| 36 |
- cpp = $(_meson_env_array "$(tc-getCXX)") |
| 37 |
- fortran = $(_meson_env_array "$(tc-getFC)") |
| 38 |
+ ar = $(meson_env_array "$(tc-getAR)") |
| 39 |
+ c = $(meson_env_array "$(tc-getCC)") |
| 40 |
+ cpp = $(meson_env_array "$(tc-getCXX)") |
| 41 |
+ fortran = $(meson_env_array "$(tc-getFC)") |
| 42 |
llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)' |
| 43 |
- nm = $(_meson_env_array "$(tc-getNM)") |
| 44 |
- objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") |
| 45 |
- objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") |
| 46 |
+ nm = $(meson_env_array "$(tc-getNM)") |
| 47 |
+ objc = $(meson_env_array "$(tc-getPROG OBJC cc)") |
| 48 |
+ objcpp = $(meson_env_array "$(tc-getPROG OBJCXX c++)") |
| 49 |
pkgconfig = '$(tc-getPKG_CONFIG)' |
| 50 |
- strip = $(_meson_env_array "$(tc-getSTRIP)") |
| 51 |
- windres = $(_meson_env_array "$(tc-getRC)") |
| 52 |
+ strip = $(meson_env_array "$(tc-getSTRIP)") |
| 53 |
+ windres = $(meson_env_array "$(tc-getRC)") |
| 54 |
|
| 55 |
[properties] |
| 56 |
- c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}") |
| 57 |
- c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}") |
| 58 |
- cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}") |
| 59 |
- cpp_link_args = $(_meson_env_array "${CXXFLAGS} ${LDFLAGS}") |
| 60 |
- fortran_args = $(_meson_env_array "${FCFLAGS}") |
| 61 |
- fortran_link_args = $(_meson_env_array "${FCFLAGS} ${LDFLAGS}") |
| 62 |
- objc_args = $(_meson_env_array "${OBJCFLAGS} ${CPPFLAGS}") |
| 63 |
- objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}") |
| 64 |
- objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}") |
| 65 |
- objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}") |
| 66 |
+ c_args = $(meson_env_array "${CFLAGS} ${CPPFLAGS}") |
| 67 |
+ c_link_args = $(meson_env_array "${CFLAGS} ${LDFLAGS}") |
| 68 |
+ cpp_args = $(meson_env_array "${CXXFLAGS} ${CPPFLAGS}") |
| 69 |
+ cpp_link_args = $(meson_env_array "${CXXFLAGS} ${LDFLAGS}") |
| 70 |
+ fortran_args = $(meson_env_array "${FCFLAGS}") |
| 71 |
+ fortran_link_args = $(meson_env_array "${FCFLAGS} ${LDFLAGS}") |
| 72 |
+ objc_args = $(meson_env_array "${OBJCFLAGS} ${CPPFLAGS}") |
| 73 |
+ objc_link_args = $(meson_env_array "${OBJCFLAGS} ${LDFLAGS}") |
| 74 |
+ objcpp_args = $(meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}") |
| 75 |
+ objcpp_link_args = $(meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}") |
| 76 |
needs_exe_wrapper = true |
| 77 |
sys_root = '${SYSROOT}' |
| 78 |
pkg_config_libdir = '${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}' |
| 79 |
-- |
| 80 |
2.30.0.rc0 |
Archives