| 1 |
commit: 61295737d111bfc7268ab2bc96a3f6718f9e791c |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 5 19:56:25 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 5 19:56:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61295737 |
| 7 |
|
| 8 |
meson.eclass: style cleanup |
| 9 |
|
| 10 |
eclass/meson.eclass | 21 +++++++++++---------- |
| 11 |
1 file changed, 11 insertions(+), 10 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 14 |
index ddceffd8c63..057339dffa4 100644 |
| 15 |
--- a/eclass/meson.eclass |
| 16 |
+++ b/eclass/meson.eclass |
| 17 |
@@ -94,7 +94,8 @@ __MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass |
| 18 |
|
| 19 |
|
| 20 |
read -d '' __MESON_ARRAY_PARSER <<"EOF" |
| 21 |
-import shlex; |
| 22 |
+import shlex |
| 23 |
+import sys |
| 24 |
|
| 25 |
# See http://mesonbuild.com/Syntax.html#strings |
| 26 |
def quote(str): |
| 27 |
@@ -102,7 +103,7 @@ def quote(str): |
| 28 |
return "'{}'".format(escaped) |
| 29 |
|
| 30 |
print("[{}]".format( |
| 31 |
- ", ".join([quote(x) for x in shlex.split(None)]))) |
| 32 |
+ ", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))]))) |
| 33 |
EOF |
| 34 |
|
| 35 |
# @FUNCTION: _meson_env_array |
| 36 |
@@ -124,7 +125,7 @@ EOF |
| 37 |
# '--unicode-16=𐐷', '--unicode-32=𐤅'] |
| 38 |
# |
| 39 |
_meson_env_array() { |
| 40 |
- echo "$1" | python -c "$__MESON_ARRAY_PARSER" |
| 41 |
+ python -c "${__MESON_ARRAY_PARSER}" "$@" |
| 42 |
} |
| 43 |
|
| 44 |
# @FUNCTION: _meson_create_cross_file |
| 45 |
@@ -165,13 +166,13 @@ _meson_create_cross_file() { |
| 46 |
strip = '${STRIP}' |
| 47 |
|
| 48 |
[properties] |
| 49 |
- c_args = $(_meson_env_array "$CFLAGS") |
| 50 |
- c_link_args = $(_meson_env_array "$LDFLAGS") |
| 51 |
- cpp_args = $(_meson_env_array "$CXXFLAGS") |
| 52 |
- cpp_link_args = $(_meson_env_array "$LDFLAGS") |
| 53 |
- fortran_args = $(_meson_env_array "$FCFLAGS") |
| 54 |
- objc_args = $(_meson_env_array "$OBJCFLAGS") |
| 55 |
- objcpp_args = $(_meson_env_array "$OBJCXXFLAGS") |
| 56 |
+ c_args = $(_meson_env_array "${CFLAGS}") |
| 57 |
+ c_link_args = $(_meson_env_array "${LDFLAGS}") |
| 58 |
+ cpp_args = $(_meson_env_array "${CXXFLAGS}") |
| 59 |
+ cpp_link_args = $(_meson_env_array "${LDFLAGS}") |
| 60 |
+ fortran_args = $(_meson_env_array "${FCFLAGS}") |
| 61 |
+ objc_args = $(_meson_env_array "${OBJCFLAGS}") |
| 62 |
+ objcpp_args = $(_meson_env_array "${OBJCXXFLAGS}") |
| 63 |
|
| 64 |
[host_machine] |
| 65 |
system = '${system}' |
Archives