Signed-off-by: Mike Gilbert <flop...@gentoo.org>
---
eclass/meson.eclass | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 6296f1dd26e5..7bd4b7ec8395 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -107,8 +107,8 @@ print("[{}]".format(
", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))])))
EOF
-# @FUNCTION: _meson_env_array
-# @INTERNAL
+# @FUNCTION: meson_env_array
+# @USAGE: <shell-compatible argument string> ...
# @DESCRIPTION:
# Parses the command line flags and converts them into an array suitable for
# use in a cross file.
@@ -125,7 +125,7 @@ EOF
# '--full-word-backslash=Hello World', '--simple', '--unicode-8=©',
# '--unicode-16=𐐷', '--unicode-32=𐤅']
#
-_meson_env_array() {
+meson_env_array() {
local python="$(eselect python show)"
${python} -c "${__MESON_ARRAY_PARSER}" "$@"
}
@@ -174,29 +174,29 @@ _meson_create_cross_file() {
cat > "${fn}" <<-EOF
[binaries]
- ar = $(_meson_env_array "$(tc-getAR)")
- c = $(_meson_env_array "$(tc-getCC)")
- cpp = $(_meson_env_array "$(tc-getCXX)")
- fortran = $(_meson_env_array "$(tc-getFC)")
+ ar = $(meson_env_array "$(tc-getAR)")
+ c = $(meson_env_array "$(tc-getCC)")
+ cpp = $(meson_env_array "$(tc-getCXX)")
+ fortran = $(meson_env_array "$(tc-getFC)")
llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)'
- nm = $(_meson_env_array "$(tc-getNM)")
- objc = $(_meson_env_array "$(tc-getPROG OBJC cc)")
- objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)")
+ nm = $(meson_env_array "$(tc-getNM)")
+ objc = $(meson_env_array "$(tc-getPROG OBJC cc)")
+ objcpp = $(meson_env_array "$(tc-getPROG OBJCXX c++)")
pkgconfig = '$(tc-getPKG_CONFIG)'
- strip = $(_meson_env_array "$(tc-getSTRIP)")
- windres = $(_meson_env_array "$(tc-getRC)")
+ strip = $(meson_env_array "$(tc-getSTRIP)")
+ windres = $(meson_env_array "$(tc-getRC)")
[properties]
- c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
- c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
- cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
- cpp_link_args = $(_meson_env_array "${CXXFLAGS} ${LDFLAGS}")
- fortran_args = $(_meson_env_array "${FCFLAGS}")
- fortran_link_args = $(_meson_env_array "${FCFLAGS} ${LDFLAGS}")
- objc_args = $(_meson_env_array "${OBJCFLAGS} ${CPPFLAGS}")
- objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
- objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
- objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
+ c_args = $(meson_env_array "${CFLAGS} ${CPPFLAGS}")
+ c_link_args = $(meson_env_array "${CFLAGS} ${LDFLAGS}")
+ cpp_args = $(meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
+ cpp_link_args = $(meson_env_array "${CXXFLAGS} ${LDFLAGS}")
+ fortran_args = $(meson_env_array "${FCFLAGS}")
+ fortran_link_args = $(meson_env_array "${FCFLAGS} ${LDFLAGS}")
+ objc_args = $(meson_env_array "${OBJCFLAGS} ${CPPFLAGS}")
+ objc_link_args = $(meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
+ objcpp_args = $(meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
+ objcpp_link_args = $(meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
needs_exe_wrapper = true
sys_root = '${SYSROOT}'
pkg_config_libdir =
'${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
--
2.30.0.rc0
