From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1022335-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8634E1382C5
for <garchives@archives.gentoo.org>; Sat, 5 May 2018 19:56:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C5F7AE0872;
Sat, 5 May 2018 19:56:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A17D3E0872
for <gentoo-commits@lists.gentoo.org>; Sat, 5 May 2018 19:56:52 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A653A335C85
for <gentoo-commits@lists.gentoo.org>; Sat, 5 May 2018 19:56:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 783283A
for <gentoo-commits@lists.gentoo.org>; Sat, 5 May 2018 19:56:49 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1525550203.61295737d111bfc7268ab2bc96a3f6718f9e791c.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/meson.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 61295737d111bfc7268ab2bc96a3f6718f9e791c
X-VCS-Branch: master
Date: Sat, 5 May 2018 19:56:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 157432ec-aad5-4e51-b7e5-5a4ce027cf2c
X-Archives-Hash: 295176865ae6433646223b495bacf028
commit: 61295737d111bfc7268ab2bc96a3f6718f9e791c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May 5 19:56:25 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 5 19:56:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61295737
meson.eclass: style cleanup
eclass/meson.eclass | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index ddceffd8c63..057339dffa4 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -94,7 +94,8 @@ __MESON_AUTO_DEPEND=${MESON_AUTO_DEPEND} # See top of eclass
read -d '' __MESON_ARRAY_PARSER <<"EOF"
-import shlex;
+import shlex
+import sys
# See http://mesonbuild.com/Syntax.html#strings
def quote(str):
@@ -102,7 +103,7 @@ def quote(str):
return "'{}'".format(escaped)
print("[{}]".format(
- ", ".join([quote(x) for x in shlex.split(None)])))
+ ", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))])))
EOF
# @FUNCTION: _meson_env_array
@@ -124,7 +125,7 @@ EOF
# '--unicode-16=𐐷', '--unicode-32=𐤅']
#
_meson_env_array() {
- echo "$1" | python -c "$__MESON_ARRAY_PARSER"
+ python -c "${__MESON_ARRAY_PARSER}" "$@"
}
# @FUNCTION: _meson_create_cross_file
@@ -165,13 +166,13 @@ _meson_create_cross_file() {
strip = '${STRIP}'
[properties]
- c_args = $(_meson_env_array "$CFLAGS")
- c_link_args = $(_meson_env_array "$LDFLAGS")
- cpp_args = $(_meson_env_array "$CXXFLAGS")
- cpp_link_args = $(_meson_env_array "$LDFLAGS")
- fortran_args = $(_meson_env_array "$FCFLAGS")
- objc_args = $(_meson_env_array "$OBJCFLAGS")
- objcpp_args = $(_meson_env_array "$OBJCXXFLAGS")
+ c_args = $(_meson_env_array "${CFLAGS}")
+ c_link_args = $(_meson_env_array "${LDFLAGS}")
+ cpp_args = $(_meson_env_array "${CXXFLAGS}")
+ cpp_link_args = $(_meson_env_array "${LDFLAGS}")
+ fortran_args = $(_meson_env_array "${FCFLAGS}")
+ objc_args = $(_meson_env_array "${OBJCFLAGS}")
+ objcpp_args = $(_meson_env_array "${OBJCXXFLAGS}")
[host_machine]
system = '${system}'