From patchwork Tue Aug 25 14:49:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 275657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75742C433DF for ; Tue, 25 Aug 2020 14:50:45 +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 389542075F for ; Tue, 25 Aug 2020 14:50:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dYM4fsSs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 389542075F 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaHc-00075g-EI for qemu-devel@archiver.kernel.org; Tue, 25 Aug 2020 10:50:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaGY-0005fR-3u for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:38 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:34525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaGW-0008RA-LL for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:37 -0400 Received: by mail-pg1-x52c.google.com with SMTP id i10so6992114pgk.1 for ; Tue, 25 Aug 2020 07:49:36 -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=xSa+lKrzpAxZpfbmVv/lwbN7oH6G4GxEh8xRVQQ8Z/A=; b=dYM4fsSsessGgBC6f16hCveN61KGkdQV7yIftTd8Y/DKuUFrxFBzy2ssSEJstyiVTp 2fCIf++Ehf2HCBOMedMB46er+luEp+A8gAlzpsmCptg1ComReGzZm7e6xgvL39ffGk4R /SxsQuNAsqnsQPLjouj+sUhkCjxLH320nDWcSJMHXF7gw+To+kRiQ0ZVdcaWeAqDtHpR 1yRtP2njssYXfIjhvmDhak+JyEJxnipYzSFM7Nnwq2Mc0ygPe5Ul7cfpKsOH9gTwgc0s QTGE4pNN/shijP1QqkhoFZLeqpN/RJOo+2j6uJLqrfH0dmXFgIyGy3+VItsKz4ueXzFa T94A== 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=xSa+lKrzpAxZpfbmVv/lwbN7oH6G4GxEh8xRVQQ8Z/A=; b=DpZjiaTuxnLJlQueft93Ew8jek6zyi8x+UH8zeASPMiAnV16Es1MtgHNJ9qhQgqlLS RK9GKX9hVjXDcwNkQivY/0txnmsZPgC4+QhxdPG036GZeMoXeU34D6m+PMBTtzvsewni sQdeP003LjnEP57awm845hYqDF4iZQ9SRAWG26eSYJoTHYzlDdKkWig1ecU9AsjYno69 1ieUErek6AGckFF5ULT8OdpsfBFGchd2LHRIQj8QvkRc3qhuatPAbXU31XSYRPrU+LEd VFW9J59BAHQeGuIB5SKEkg8jE7AnAgNQ9096FEj6ARFXImvi1NYZP78otp+1JVpiTTu8 QZCQ== X-Gm-Message-State: AOAM531cRO3N6MIUkHw6AgAjyNOfkJecICdwIMphtDJGGom67Y1PTMnp BNrOOwkiD50Zh4UM6wvQuJuDjKSTxRyc/7yg X-Google-Smtp-Source: ABdhPJyCrbgCZdBHPGMjIJSF2LNOR43TdtRnspTFZMNZjwBQyO2MKXhMKYceluBtdLoAJfN83gaiBQ== X-Received: by 2002:aa7:8285:: with SMTP id s5mr8215790pfm.226.1598366974701; Tue, 25 Aug 2020 07:49:34 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id s198sm3093188pgc.4.2020.08.25.07.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:49:33 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja 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:/ Date: Tue, 25 Aug 2020 22:49:16 +0800 Message-Id: <20200825144919.1217-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::52c; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x52c.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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: 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 Tue Aug 25 14:51:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 275654 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D397C433E1 for ; Tue, 25 Aug 2020 14:52:49 +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 0917820782 for ; Tue, 25 Aug 2020 14:52:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZXZWoOPs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0917820782 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaJc-0003iJ-63 for qemu-devel@archiver.kernel.org; Tue, 25 Aug 2020 10:52:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaIp-00020I-2F for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:51:59 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:44022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaIn-0000ZJ-Ez for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:51:58 -0400 Received: by mail-pf1-x435.google.com with SMTP id y206so7531954pfb.10 for ; Tue, 25 Aug 2020 07:51:57 -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=5EU+iN7Rjwb8vHvybFENyYEoG6wKKZBygxn/P8M+ZLw=; b=ZXZWoOPs/nXMQdTiyGtm+ziUpKbig3WJJVSAHTI87ZRUUkvxdIu82pOSCl/+WRbGra oDmgn7S4vcf8B36K+zEKmZFYiP7ISxCNAWxlm4UMOZdjojSHAH3h26OcGRVWrFzT0wW2 6Tva4Lwn+pxrRngE5j5JUaE46Za1wkw5ECVX+Iw1O77YBSsg6XBXrfIYl/RWRWH/lK8y ncR9JsjW0heN3nvySo/q+an7z9gs6aO5xYQZJON8sek9+YdduxiWPxV2aObo2Cqua2cT RdRKsWawlMcDdQjkkaydj4YcZVSH70iUUA2PQildpovog26olJ0QOfhDAlMLKnCH1Uyr 1GwQ== 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=5EU+iN7Rjwb8vHvybFENyYEoG6wKKZBygxn/P8M+ZLw=; b=OgUixc8zlIdixeFJEbyn7O2zknDgOnajZgHwY303clkeJGjIY5PGddMMJURLVYH9L2 xQ3NWXQNzJC70KOzP16rnpuoDD3qdQdS3o4Rb2SQV9sVWm8If1xdKjfl3ljhlI1Hz95B DCUoqD2fgBaX/uFMSk6VFHWXCir9Rx6O4G5oK86tNNzi6v0REtADwhQ7Z+mMVoGsDmpU gi6S5nSuVa3YR6lRdEohH2+ueyputQWZGYYZ8dr4Rbm+EKeoikoa9ULVHGKTBWG8ddi4 19DP0pRWtfW6D/UbXo6lvzvUHue4W8Q3JjqFZBZV2Sf+4QKart2DNpXQLANBuwd6TyS+ 4Crg== X-Gm-Message-State: AOAM532MmGO1D7aioX6XtEPA5Bh3zILg1N56Jg/kiOgnXhBwVTtjWXEH 1KERHTGbz24Cp6eMDXaA62ENZU3uZlrDT02b X-Google-Smtp-Source: ABdhPJywd5hanFCEVvpzQYKJFuDjTDmwRPXwqb1CluaJgmQrVEpX414KFgCV13HbDQ/LvvBE4iwAzA== X-Received: by 2002:a62:808e:: with SMTP id j136mr7751637pfd.99.1598367115753; Tue, 25 Aug 2020 07:51:55 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id m22sm3104383pja.36.2020.08.25.07.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:51:55 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 2/4] meson: fixes relpath may fail on win32. Date: Tue, 25 Aug 2020 22:51:31 +0800 Message-Id: <20200825145133.178-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825145133.178-1-luoyonggang@gmail.com> References: <20200825145133.178-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x435.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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.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 --- 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 Tue Aug 25 14:49:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 275656 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 425DCC433E1 for ; Tue, 25 Aug 2020 14:50:59 +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 07DF02075F for ; Tue, 25 Aug 2020 14:50:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mL4t+5kQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07DF02075F 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaHq-0007Xu-2C for qemu-devel@archiver.kernel.org; Tue, 25 Aug 2020 10:50:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaGd-0005lg-Lw for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:43 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:37124) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaGc-0008S8-4H for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:43 -0400 Received: by mail-pg1-x532.google.com with SMTP id g33so6982991pgb.4 for ; Tue, 25 Aug 2020 07:49:41 -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=htMtb1NzKhLangZNeh4fyVQE1LaLJL7zHAVE3XWM2KA=; b=mL4t+5kQR+qD0n7l12Y0V0Rjctr+8r5xeq8ZJfDtFa0jWrspoNZBSn9JaMTpU9JYh5 09ocHvVPJubA7bBKZncRxpgNxyYyZu5Twz6ooRP2dvxp/XIDwRhjXHMthRjYtYLA/GUM BSK3y+Cq/8tsrKhf99DfPqZ/Dg34bxZ88hXdhH0QkIMhAj7af/mE5Ek4WfZKAjvMDduf RHcO8K5KzNQdV3SXgdMu27Qx0CPdi0TKU0AyOpSW4Zj5Zt/yQbyyZIE0QRZeaNVBisNL MqHSodc7W/QS8GXj6U4s6VwclqvzM+lhZ44NP8qZJlhHH7jDouo7pOQgvI2WsCgwzN0s laZw== 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=htMtb1NzKhLangZNeh4fyVQE1LaLJL7zHAVE3XWM2KA=; b=Drf0mIfhZDfsx9OcDri/jJ+vbFyOopYOfR0kWMVtLe6/DuOPFgiu82rBM717y3GK7a nC7Hk9A0D/n8+OxD/oKX8Z/ziMvwBK0ixAwrZDvyPCIREX0hFTPUO6JINagiMeCY9itJ uKa44VUI9aHZpqBJTBXXORdqLMxfABJhokqxOQsIR92UB+btjIvcL4CcUdHkAnYZOIeL 5U39E+hvjnc1vNdJiDtsGCnjJR7xad/uwASgUvN/8UlFUbkk+sNbmOKFVzfIeGRLtG2Y MZFpUJhfTUSSIji6efJqN9OswrAygpFloS+YAKPgli5KVVe9v7ewwKzcpEND4s/0djmX kMzQ== X-Gm-Message-State: AOAM533YJdBk0qclNy9pGn69NeZWKp3GTn7gq+0ByhZdCJqizrsNsKEk 6Jdp7wCSvaC5blb7dV0ySDqATEVKaekzKT8V X-Google-Smtp-Source: ABdhPJyMxJtH29Hc2HKee3dVCCAhyxdbrsKfLcP8+MJ6TZsOmDbKIiMo2Viq93h3XEf44in6Ln8vGg== X-Received: by 2002:a65:45ca:: with SMTP id m10mr803125pgr.187.1598366980371; Tue, 25 Aug 2020 07:49:40 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id s198sm3093188pgc.4.2020.08.25.07.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:49:39 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 3/4] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Date: Tue, 25 Aug 2020 22:49:18 +0800 Message-Id: <20200825144919.1217-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825144919.1217-1-luoyonggang@gmail.com> References: <20200825144919.1217-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x532.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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index df5bf728b5..a3585881e1 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