From patchwork Wed Aug 26 11:33:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11737983 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A0CE717C7 for ; Wed, 26 Aug 2020 11:35:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7848D2083B for ; Wed, 26 Aug 2020 11:35:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UD9cOa/a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7848D2083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAti3-0005EF-IC for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Aug 2020 07:35:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtgr-0002tY-Bx for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:05 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:35742) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAtgp-0006hJ-M9 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:05 -0400 Received: by mail-pg1-x544.google.com with SMTP id o5so903039pgb.2 for ; Wed, 26 Aug 2020 04:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nHEmWVZQoKiBv31d0b1nWAUGSiNgf5i9gDUSz3OTqd8=; b=UD9cOa/a47vPa6dJ1ilncNdjvMU112NkxIte03WY+6qrSWCP+ysQaBLpsUbtEITezO GooWbTavYASJP/x8QSp2uJh3bIMn4DifApS3o1sIx3QylRgXZyoW94GJ/QDyIo4dukrr kCim66fs6/oqMuTsTZtFlJJA6DXh12WLEGl4g+8qCwqFH5AHJhNSnW68BVyATZ5CO5Gt dl7QVf9T9wq7TVARFJsKgXI7hAWaCm1lLHy4ZeAvLNK2bilR/rD4AoaL2G6oUbfb/yJo hIkV85g0YtdLXpj/x7hzvhXp2XmRBQNc+gFQZx1k2jeXlMbUlBB/wGX14x+WvQlkwg2Q jEjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=nHEmWVZQoKiBv31d0b1nWAUGSiNgf5i9gDUSz3OTqd8=; b=baixsrNYR4jIi+DSxgMwUNSX8T58/uXA071+DfNUOGs+0AEpvY/y9d9rzw7xbsD+rS IjXdW96YEAd28zWNN+hg/fE3Mam54P92m/ZXVWllgOanvNjaNTKlUwh7m9ZLH2pEwiS5 h2bbgniw35PoWeiOgelFoL8ok7Ui1fLHjKO6yHI0VZ51G3GY9oq2DK7Y0SvRI8vz0+P5 NmuXNfs1ot0XF3M5SW0ZrCJDZ+reg1gQUu3/zyTMv2mSHYi03gRcLBRxMrptZHQiTP8s tZ9RS/IktUOkVX+aXbBcpqxeSAQHr6Ej2+KOdUzvVWPB5O8YXGH+52zizfHNLDYFDDyT MUpw== X-Gm-Message-State: AOAM5300FuQ4RWDklxFL8KubwJfOs590SMSJa3+/TUzs/khXdRqRGGdB 90p2OJ6c93his41BLrsOIILaffeGzN8kmeQy X-Google-Smtp-Source: ABdhPJyYo7308n1g7FMHCagGy2xTCPEiZc2hnY40vH2WXOVo9fniG0ZeWKl1IfVrSNfDSZOzP379Nw== X-Received: by 2002:a63:1704:: with SMTP id x4mr9761293pgl.186.1598441641561; Wed, 26 Aug 2020 04:34:01 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id p20sm1915914pjz.49.2020.08.26.04.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:34:00 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v4 1/5] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja Date: Wed, 26 Aug 2020 19:33:22 +0800 Message-Id: <20200826113326.491-1-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::544; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo SIMPLE_PATH_RE should match the full path token. Or the $ and : contained in path would not matched if the path are start with C:/ and E:/ Signed-off-by: Yonggang Luo --- scripts/ninjatool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py index cc77d51aa8..6ca8be6f10 100755 --- a/scripts/ninjatool.py +++ b/scripts/ninjatool.py @@ -55,7 +55,7 @@ else: PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" -SIMPLE_PATH_RE = re.compile(r"[^$\s:|]+") +SIMPLE_PATH_RE = re.compile(r"^[^$\s:|]+$") IDENT_RE = re.compile(r"[a-zA-Z0-9_.-]+$") STRING_RE = re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.") TOPLEVEL_RE = re.compile(r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|.") From patchwork Wed Aug 26 11:33:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11737959 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 220F913B1 for ; Wed, 26 Aug 2020 11:34:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E92982083B for ; Wed, 26 Aug 2020 11:34:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HsGcthRJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E92982083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAthN-0003mP-99 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Aug 2020 07:34:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtgt-0002wQ-KG for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:07 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:35741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAtgr-0006ha-Q4 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:07 -0400 Received: by mail-pg1-x542.google.com with SMTP id o5so903066pgb.2 for ; Wed, 26 Aug 2020 04:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7+MsaJjYLlKc/kuo4dhCFuDpn67NQClb7RmuHL3RlA8=; b=HsGcthRJ9N3OECP7X47G7ESwjmIP3y8AVPNnspvwZ6H6tJeQxJAbmcnBiDkDY/sVr0 j6ReJxUk+iHREvryzlZpXE0LYMGl8JgD4GEismbia5IMuJUor+33qP2WINW+pqdAmHmg 86h3TaFfVUVFKWzIBQ6bh9Ly9HIjDss/7tuNx4iwecf9EZm+Boc25/3awEj4wcOEsHaQ asUI/E1RI+S1vHD2Gedu7AtKUxfrfBqUnHByx033SZdaeECPSDDJlc7IJJzCeYlm19ak 1jxbTZu+OY6xe3dlo5wQnDcdEokFTRsDLOodpsuc3/JjP+hn1qt7jaZ2I6k6apzGdQHn lh6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7+MsaJjYLlKc/kuo4dhCFuDpn67NQClb7RmuHL3RlA8=; b=fFyP/7oFuVPzbt3P7t3bBznViEfLpg2MnYoPy9tfKOLPXVeqapYUJQiN9a0fw3l9ZD S9hmvP+6PW3f3/BnDlhkSmYvi6ciqmLS5oSRuryjJm6SRrpqdXuFrf0XYKGPK9gqKa5q SIFu+xhvvTtOwI4Km2pOsQgTQXUnshwG+t8Yta2Yj7mubemp5Oz3YkSbJRWkZyp2w17u 6/jnSRW/NgcyaIaPbwrhKQJkMAHKxnC4rakL5bz3NC6whNHaLCeT8XVmVua45JtzLNgb O/mcZFu6plMe36euj+RI47EaTBnzBGnoTHd/UnwK+ElJ3g/DckXUxqkihk1tnX4CbTm5 y9jw== X-Gm-Message-State: AOAM53125ugkRLIg6dvaeMkq8YyAG9cFEqMeyVFOhiCKqzBU0IKXrxrN dXKhQ+qX1qu+tJN8YBJcffLkGu712USAj/uw X-Google-Smtp-Source: ABdhPJwNq7RJrlszEOTpuGU7r+F2jPYwowfUiILps/pp642CXdQXsmPpsaOXZm6TKv6k99WSpPz9Rg== X-Received: by 2002:aa7:982e:: with SMTP id q14mr11932382pfl.299.1598441644133; Wed, 26 Aug 2020 04:34:04 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id p20sm1915914pjz.49.2020.08.26.04.34.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:34:03 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v4 2/5] meson: fixes relpath may fail on win32. Date: Wed, 26 Aug 2020 19:33:23 +0800 Message-Id: <20200826113326.491-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200826113326.491-1-luoyonggang@gmail.com> References: <20200826113326.491-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::542; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo On win32, os.path.relpath would raise exception when do the following relpath: C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail. So we try catch it for stopping it from raise exception on msys2 Signed-off-by: Yonggang Luo --- scripts/mtest2make.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index bdb257bbd9..d7a51bf97e 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -53,9 +53,16 @@ i = 0 for test in json.load(sys.stdin): env = ' '.join(('%s=%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) - executable = os.path.relpath(test['cmd'][0]) + executable = test['cmd'][0] + try: + executable = os.path.relpath(executable) + except: + pass if test['workdir'] is not None: - test['cmd'][0] = os.path.relpath(test['cmd'][0], test['workdir']) + try: + test['cmd'][0] = os.path.relpath(executable, test['workdir']) + except: + test['cmd'][0] = executable else: test['cmd'][0] = executable cmd = '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in test['cmd']))) From patchwork Wed Aug 26 11:33:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11737987 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3CEE11751 for ; Wed, 26 Aug 2020 11:35:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1313C20897 for ; Wed, 26 Aug 2020 11:35:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="McxdFCJY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1313C20897 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtiX-0006Ev-Bd for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Aug 2020 07:35:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtgv-0002yo-N1 for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:09 -0400 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:44549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAtgu-0006hw-5v for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:09 -0400 Received: by mail-pl1-x642.google.com with SMTP id q3so753563pls.11 for ; Wed, 26 Aug 2020 04:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rIP9TCfc3oqvA8Vp/R/E5MTUabOcrCowAJuIfVAgJrs=; b=McxdFCJYs+BiH6gK7MPaLnbxsQ55pKhilJ5aycblqtnYfks6rOaE8OiGCLmLfPoPPB IuGuWwV5yzlzHsUyIGS2uaIbHMJcFFZd1OeJjmBdvJmP5+R6Zczhdk40GbonssIK6iUX 4U21p4z0uzr4PcB/RXiCwPcjKb0LT1iBu9aY57o/Kw9+hYqOeprwJk/OrCtlKfUgjoSx cmCrh9Ialxr7dhWDZxICFm5YcVOG4LKBGG9vjrAhXCYwzlkQrAwgZLaGPKBuL2KpbbIi hL5saYAqhvA5bHUWjJN6DTJSUc2Zn+axkYbgQ7jCxL+mZazh5DdfFvOJjF0RUBu2a0Qo IN2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rIP9TCfc3oqvA8Vp/R/E5MTUabOcrCowAJuIfVAgJrs=; b=qf6tg4q7T2jDSXUF0fzfg2lYSetcw4p6lyQ6MugBFvawWmP/KNssZwdCt7D1FoYSA9 ofRLpBF4AqG4sUM0qUsjZ9Bpzb609SaFYwDZMrQYOhpbPiJq9bg4ABI2gjfLNIeFh4pq QCLCCw5kp5bkeQ4jvu7Og1GKjzHJqHsWnfzflqsTaoqblfNKMulJov7IpD8HQ1S3U8wY QLmamLzhfqp9M6bNL3Wic3RzVhiNM38OedVDa38q7EUmWO6IZ7q/qR3LwD6KgErEgXKC lP+v/hA1disi+6K29/I+rkPxdRTA0yOZ9qAzWnuczevakYFDUARHREmpOGNP7KHohmp6 x7DQ== X-Gm-Message-State: AOAM530WKXrlX2sqNnCSm+SpqV1nBPFhUsUy06USZWYTBk1l1UgIkcia VeEzZCdbkSmJQqCNNSqtPkruBAP1gB1eM6sY X-Google-Smtp-Source: ABdhPJxVHwMA+AA1Ndg5VAuD+JTC9a1pd+rL/05ahWZDSnbtzpx/IclLCb2hsbeAIeExe4sP1kFNUw== X-Received: by 2002:a17:902:d903:: with SMTP id c3mr11910434plz.145.1598441646381; Wed, 26 Aug 2020 04:34:06 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id p20sm1915914pjz.49.2020.08.26.04.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:34:05 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v4 3/5] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Date: Wed, 26 Aug 2020 19:33:24 +0800 Message-Id: <20200826113326.491-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200826113326.491-1-luoyonggang@gmail.com> References: <20200826113326.491-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::642; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x642.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo Fixes this for msys2/mingw64 by remove the include_type for sdl2 discovery in meson Signed-off-by: Yonggang Luo --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index f0fe5f8799..1644bbd83c 100644 --- a/meson.build +++ b/meson.build @@ -224,8 +224,7 @@ if 'CONFIG_BRLAPI' in config_host brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split()) endif -sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static, - include_type: 'system') +sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static) sdl_image = not_found if sdl.found() # work around 2.0.8 bug From patchwork Wed Aug 26 11:33:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11737991 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E79081731 for ; Wed, 26 Aug 2020 11:37:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BC4D02087C for ; Wed, 26 Aug 2020 11:37:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="u5z9pycC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC4D02087C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtk2-0000A2-0U for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Aug 2020 07:37:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAtgy-00033f-CH for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:12 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:52877) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAtgw-0006iM-Gl for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:12 -0400 Received: by mail-pj1-x1043.google.com with SMTP id z18so753270pjr.2 for ; Wed, 26 Aug 2020 04:34:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bzrUXWXJ2P4FPb4Z7Y3jIG7wAqzpJKqykSmKTUKfTsk=; b=u5z9pycCFqA45WFDE2O9+QCeUMcDKQxarzMWr5DsalvEkoetjHgyOzsK7pcjYXmrah kKkGKRbEl60Uzt5bWSq6zqM+zgZmqtAgDvUhq72pWJxY5502EADjVJvbFS6y4kVy717R eHyzICOIIxl68GyCvrGY4SpHheqAA1KC9AWL8mBboPvD6/xzLO5hdun7plsHWEUvTOh1 FY0r2UiKxASuFn/NMumWukWGEB7YhUBczVv/GORGYpqczvU9vDOUa7oIj2RHOcEcz4vw 8YIz3oFr5atM2cSLglz5nbiFThz9/B7WB7Myw+dLu1ernkPJi4JxnTWnRdauHB0LTnMN TSEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bzrUXWXJ2P4FPb4Z7Y3jIG7wAqzpJKqykSmKTUKfTsk=; b=jerT5vfLMX5vur3ti7lOFWnt9IvsSzA3cw6F4ut+RUYNlsdqdyAAMrEm7T0NKt6efk 1YHA9iC4HyFS9nvDDhBVqWSQM4MsEHf13A6sYXaAHtX23nO37nG38KcJsLcII4JmVIYS p44dyOq7hx6lclbXPtps537aWYCE7mkNrLR7nUu4puncp0P272u3mw2i/3TZOXl1Znpa lHebK8pisY+RPZbiwPa0ZUmtGOAikTLGHAK7BlpWrUtqQznYTOugkfwP+L0dO9TO+RJ3 +9JU6+fLzHScBF6tjVLpeT0t5SDbpGKbm8iwk7gGpVm+TVgcF0BTNKpM9YI7ApN7h5nh WTfg== X-Gm-Message-State: AOAM531bSZRKR1sTVHmAp3cyziWcN2xcUVVyDpoX9KMWfynXRCqr02GU udG3/hAeW1yiPNcufsoASicEeeGU1NjGkQ9e X-Google-Smtp-Source: ABdhPJzlcSKV71fc2x6/mA03+AQNsQEqKuCpHjc6Cl/Y7+Z2kCI9gOuW67eQlvHOgiDK5rCb1oSVgg== X-Received: by 2002:a17:90a:1546:: with SMTP id y6mr5567886pja.93.1598441648712; Wed, 26 Aug 2020 04:34:08 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id p20sm1915914pjz.49.2020.08.26.04.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:34:07 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v4 4/5] configure: Fix include and linkage issue on msys2 Date: Wed, 26 Aug 2020 19:33:25 +0800 Message-Id: <20200826113326.491-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200826113326.491-1-luoyonggang@gmail.com> References: <20200826113326.491-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1043; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1043.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo On msys2, the -I/e/path/to/qemu -L/e/path/to/qemu are not recognized by the compiler Cause $PWD are result posix style path such as /e/path/to/qemu that can not be recognized by mingw gcc, and `pwd -W` are result Windows style path such as E:/path/to/qemu that can be recognized by the mingw gcc. So we replace all $PWD with $build_path that can building qemu under msys2/mingw environment. Signed-off-by: Yonggang Luo --- configure | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/configure b/configure index b1e11397a8..3b9e79923d 100755 --- a/configure +++ b/configure @@ -13,8 +13,13 @@ export CCACHE_RECACHE=yes # make source path absolute source_path=$(cd "$(dirname -- "$0")"; pwd) +build_path=$PWD +if [ "$MSYSTEM" = "MINGW64" -o "$MSYSTEM" = "MINGW32" ]; then +source_path=$(cd "$(dirname -- "$0")"; pwd -W) +build_path=`pwd -W` +fi -if test "$PWD" = "$source_path" +if test "$build_path" = "$source_path" then echo "Using './build' as the directory for build output" @@ -346,7 +351,12 @@ ld_has() { $ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 } -if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; +check_valid_build_path="[[:space:]:]" +if [ "$MSYSTEM" = "MINGW64" -o "$MSYSTEM" = "MINGW32" ]; then +check_valid_build_path="[[:space:]]" +fi + +if printf %s\\n "$source_path" "$build_path" | grep -q "$check_valid_build_path"; then error_exit "main directory cannot contain spaces nor colons" fi @@ -942,7 +952,7 @@ Linux) linux="yes" linux_user="yes" kvm="yes" - QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES" + QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I${build_path}/linux-headers $QEMU_INCLUDES" libudev="yes" ;; esac @@ -4283,7 +4293,7 @@ EOF symlink "$source_path/dtc/Makefile" "dtc/Makefile" fi fdt_cflags="-I${source_path}/dtc/libfdt" - fdt_ldflags="-L$PWD/dtc/libfdt" + fdt_ldflags="-L${build_path}/dtc/libfdt" fdt_libs="$fdt_libs" elif test "$fdt" = "yes" ; then # Not a git build & no libfdt found, prompt for system install @@ -5268,7 +5278,7 @@ case "$capstone" in else LIBCAPSTONE=libcapstone.a fi - capstone_libs="-L$PWD/capstone -lcapstone" + capstone_libs="-L${build_path}/capstone -lcapstone" capstone_cflags="-I${source_path}/capstone/include" ;; @@ -6268,8 +6278,8 @@ case "$slirp" in git_submodules="${git_submodules} slirp" fi mkdir -p slirp - slirp_cflags="-I${source_path}/slirp/src -I$PWD/slirp/src" - slirp_libs="-L$PWD/slirp -lslirp" + slirp_cflags="-I${source_path}/slirp/src -I${build_path}/slirp/src" + slirp_libs="-L${build_path}/slirp -lslirp" if test "$mingw32" = "yes" ; then slirp_libs="$slirp_libs -lws2_32 -liphlpapi" fi @@ -8212,7 +8222,7 @@ fi mv $cross config-meson.cross rm -rf meson-private meson-info meson-logs -NINJA=$PWD/ninjatool $meson setup \ +NINJA="${build_path}/ninjatool" $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ @@ -8232,7 +8242,7 @@ NINJA=$PWD/ninjatool $meson setup \ -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \ -Dgettext=$gettext -Dxkbcommon=$xkbcommon \ $cross_arg \ - "$PWD" "$source_path" + "$build_path" "$source_path" if test "$?" -ne 0 ; then error_exit "meson setup failed" From patchwork Wed Aug 26 11:33:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11737989 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2B677722 for ; Wed, 26 Aug 2020 11:36:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 023B52083B for ; Wed, 26 Aug 2020 11:36:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NhK7UdRi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 023B52083B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtjS-0007g9-W1 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 26 Aug 2020 07:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAth0-00037M-Aa for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:14 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:40722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAtgy-0006iT-PH for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:34:14 -0400 Received: by mail-pj1-x1029.google.com with SMTP id kx11so733520pjb.5 for ; Wed, 26 Aug 2020 04:34:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kZmgaDEBNjpxaFbsHI9krVOWSzauPOV79k08lIpZd10=; b=NhK7UdRiHc7jqeAi377NWdg8cg3gN+zYrVkghPy5vo8mBf2fFMJrZPgUMGmocXdTIM y7fiD9qkG/G5TDutJqt6ZHd2hxZOU0WcNnPGYOsVzwIgvvugFOHQo/wXbyqexJMJB9Vp dwxB2P15fT+0K+DkL70aBxxFtlfRDgC09AXSksGv9i3C7sVsnONo79JIeqA25hZtpsqF 9B2tRER8HfpcK9vvMTqXBLZjZrXcBDuNRfGQrAgTaFFEQIvpjSTG3cD/bFGRcl9ABWcB oaEbmFbKCt1D+Bj8GH1gFvcVIOSYAhD6E8oBUAa4UhGzde0p9mChO7HjzJnlJRFUINgN BKtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kZmgaDEBNjpxaFbsHI9krVOWSzauPOV79k08lIpZd10=; b=kMeDEemqtM/ERySNALOyS3jsw4bSBsagF6z4+t/oMzrkces551l3fcwmCmt3AIbrdL zKuy1YRH5tO4nelIMDIUizgnPRSVLE7WnLcLBbgt+Lp3mBkt744WbbSdzOCFa6ZE4WR1 6QxKaf0ig4pYStiQcgDTouf2rB36Evfp00YXjsQSFfO2QoIZMtBNU1JC5Sd4dx0mPtQU 59mam2s/oRfY+EpUB7HAe7ofwNxXo9h/dKSWJUUmejNXmk0zgAjey7n2ZUiOtTT3qa6q MkkH0gSpxDmDD7lFQBHtsCx3j+BMq2I/YattqFFgliWKqVh1A6e4pp0Li301BVmEZjPh xi5A== X-Gm-Message-State: AOAM5315KkuYPPASqXauNsKXc8Rdy3aytGviHBIeb7MrQimlL2QA9IzV pa+hKAAhqMfHjedK/P5p9YnDxaqxWhlcY5sZ X-Google-Smtp-Source: ABdhPJwVy7pWROAr6IRAs2qh2C0ECcv+4fohV2y6Lh9VN34IxxRhc08nKcUZhn5AlHkFNnRmTtJiwA== X-Received: by 2002:a17:902:82c7:: with SMTP id u7mr11841462plz.310.1598441651055; Wed, 26 Aug 2020 04:34:11 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id p20sm1915914pjz.49.2020.08.26.04.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:34:10 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v4 5/5] meson: Fixes ninjatool can not be recognized as script under Window/MSYS2 Date: Wed, 26 Aug 2020 19:33:26 +0800 Message-Id: <20200826113326.491-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200826113326.491-1-luoyonggang@gmail.com> References: <20200826113326.491-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1029.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo use ninja instead ${build_path}/ninjatool Signed-off-by: Yonggang Luo --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 3b9e79923d..2ad0c58492 100755 --- a/configure +++ b/configure @@ -8222,7 +8222,7 @@ fi mv $cross config-meson.cross rm -rf meson-private meson-info meson-logs -NINJA="${build_path}/ninjatool" $meson setup \ +NINJA="ninja" $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \