From patchwork Tue Aug 25 14:51:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735823 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 E55A0722 for ; Tue, 25 Aug 2020 14:52:37 +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 BAACD2075F for ; Tue, 25 Aug 2020 14:52:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ohVoPahk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BAACD2075F 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]:46460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaJQ-0003c7-Rb for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaIn-0001wS-3v for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:51:57 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:35937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaIl-0000Xo-JX for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:51:56 -0400 Received: by mail-pf1-x443.google.com with SMTP id m8so7551308pfh.3 for ; Tue, 25 Aug 2020 07:51:55 -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=MU1D0gcoO3ZaMdBitGLyuB0vQmL5fSRzDQyIOcmupWk=; b=ohVoPahkc/2gK3Rsd+a2bbGrnOOsqVW2vj8cBMSo1hoeFiuMskYoShu6gzrqMUyuwl Fp/mzMmNpt8Ve3qsVCW5pJiUpLD8dAR6C20FQAEPyWTAOh47ysKH9BydAXtyYrCo3zLs 1tz/dCuOCbVcGGqCgyVCVfDYuwGfc+Qa5T5M162UY4nTbrcGU5GjR3K/RsXzFPwVTgUR 8UbkM9x+J/QTYsaaULPAobhdQLzax8d3w9AtHrXiUt+hn0HakVHT7y44gwj8650/kM/n lg5LN6psD+MGUQ9c3gF9FoT5qlcR2fGu7MMqsX1QIby/x2GrMdV2n4Z7DbYJE+yO5hV1 +luA== 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=MU1D0gcoO3ZaMdBitGLyuB0vQmL5fSRzDQyIOcmupWk=; b=IdAKP2ln4yd4EsMQDfyPHQUTCFdsIqR9E073vmsYBKxvPDhW15EUD34FzVqo0HbTN2 xrP9+hDfFjw/GThsVvZcThnvmmBvTgv1ipIXIjcpDZ1Xc8s8x0Ap3qnbEHm6hzYvOf82 qnJfKZ+BaX8vop0FgiZPG3YH5mBPqmoD6SBgwiDL2QQ27sE2rcOWOiGzaigWzwQkgwEA y/f3xX4VBqmG5bxdsy7TPKcOICISd1jspbL7+GluUBSb/kevPyWJ5z0fCj1GJnZiFzH+ rfhtzUjAykqH8AYIEv2uEc5SFSWKRzlgpm5SomXHrzkZAuP8O3S+OE8JqZx0ECMaQzlh 8Zvg== X-Gm-Message-State: AOAM533oDajoMPBBL0rxYSdrv0xHvyzhK9ksosUhie6iuQfjBR86roQA RlcEhIbv9PFekjiTK/f3NE1pFa2BKiOYIkj7 X-Google-Smtp-Source: ABdhPJy+opfCw285m1BaJXRV+7yNArTPmBS/bouh/w03m5MdGiQFj6z0EG+oVBuxSLOkXs/3EiSpTA== X-Received: by 2002:a17:902:7d85:: with SMTP id a5mr8079601plm.148.1598367113655; Tue, 25 Aug 2020 07:51:53 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id m22sm3104383pja.36.2020.08.25.07.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:51:52 -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 Date: Tue, 25 Aug 2020 22:51:30 +0800 Message-Id: <20200825145133.178-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::443; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x443.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+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:/ --- 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: Yonggang Luo X-Patchwork-Id: 11735825 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 87F90138A for ; Tue, 25 Aug 2020 14:52:39 +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 5EE012075F for ; Tue, 25 Aug 2020 14:52:39 +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 5EE012075F 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]:46666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaJS-0003iJ-IW for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:52:38 -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+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 --- 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:51:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735827 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 C4699722 for ; Tue, 25 Aug 2020 14:53:40 +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 9672B2075F for ; Tue, 25 Aug 2020 14:53:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VC3oo2nm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9672B2075F 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]:51944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaKR-0005sS-QS for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:53:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaIr-00028Y-Tp for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:52:01 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:38790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaIq-0000ZY-7a for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:52:01 -0400 Received: by mail-pj1-x1031.google.com with SMTP id ep8so1357515pjb.3 for ; Tue, 25 Aug 2020 07:51:59 -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=ahNl6xGv3lvDsVsmUoTS6dtgGoj1wQWvaseozR7dTqs=; b=VC3oo2nm6kHuWgur5na5NzNdVPxbq4uAbOgPohSlBaiJ96DmZObxO32rbAltY977xX OkJlJckRnOm4UN9E/aoIOjvMPiNHjJMytwhmvwZJco1EgxEjg09bnnWhW4vbyYmU/SXS ghT4GDgr94b4spD0SuNgStVDMNMb9RmUU8XvlsiD3NriNmzfYzrd6RsQt0JpqBmZ5Pki FvflRlWnQzNr7iMdxED94sGrcS4k7ulfi9zHwH4XFYqi8SEAqtxmHv/rVSgwWPXYQMEE gNpZ+so1c1WCZVBTkEn6mFdAMdRxvWS5qHWnPfzWnrauYzX9rONh3nYCNFbZC8p2LYVl ZdyQ== 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=ahNl6xGv3lvDsVsmUoTS6dtgGoj1wQWvaseozR7dTqs=; b=iQoqHj3/Wu0H4+LA/JkTkO4ZrOwP2vS7XG/na8RKN+2w+Tp63Lzy4Ud1RCTkDFWVJR P/HLxWLp02iUtZ1SHVWLygsU8cSFDBytyA4Esp1GQmWwjsduUKKBqx0iitIDR3ocuMAT icPkHXlqEdtDeerAYY8fvxwW+I0gsQvgBO1wQsDxlwvWieuMKvBoLnoXt0O6swPlfbFF bgbfWGwiny8Ul64Qe1BPvbxrW+r8I1RVo9cHeqqkEArX4OugaCez7NM5YLRwO28N0qlA RqMxxdj1xgX0CWmSCn70FlwAb3J31ABqih1am/rdXXhZPHfYOocp6xZ/BJcjR0dQCfB/ IPYA== X-Gm-Message-State: AOAM530Jp2ghYCvMglXeLd4IVQ0uP6rNJcUJHIrQrap26+tj3uEqyNWZ fwOCneqUCq5bb+hDLEekwD8DPLrMLkLV8hie X-Google-Smtp-Source: ABdhPJz4eH0YDlM9Np3lgVR28cyBjFvCQWGDakFBgqBfzFtDxpcNLdnX8m4PJ3ucoA2Q9Jzl7X5xIA== X-Received: by 2002:a17:90b:3750:: with SMTP id ne16mr1922599pjb.6.1598367118413; Tue, 25 Aug 2020 07:51:58 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id m22sm3104383pja.36.2020.08.25.07.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:51:57 -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:51:32 +0800 Message-Id: <20200825145133.178-3-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::1031; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1031.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+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 --- 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 From patchwork Tue Aug 25 14:51:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735829 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 829B9138A for ; Tue, 25 Aug 2020 14:53: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 57E372075F for ; Tue, 25 Aug 2020 14:53:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="C/OePMky" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 57E372075F 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]:53134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaKk-0006M0-KC for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:53:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaIv-0002Hy-7Q for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:52:05 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:44647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaIt-0000Zz-Do for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:52:04 -0400 Received: by mail-pg1-x52a.google.com with SMTP id m34so6978150pgl.11 for ; Tue, 25 Aug 2020 07:52: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=yChn4o9CAS9a4x2QiJ5qxkdY1fP0JvPuRXAqc0hsYGk=; b=C/OePMkyQY9Pxp8PHm990LIcxBlcZQ4f8a13FHofHzcSMKw+cBJdTHHXXOGDu3eEhi /SqEDoglSpwNpEY/s5XGBH9WOPbewY/8jjg2O+Pz92wZMGM6y+TbUjtdwdoVZQ5t3ZTw naxaf4lDZZ1d724Y0eGSxkp9tVG748oqhQz2kH0RYuesEWWtMkRXEwJYuxa+1alligXs ENQITOUumIYant1DzQ9j7vvFTSF+xs6TIjxO5U5FYi281cE2qk0ooQWVrfX77/mSvtNs s3Oqjm6v4RxpTPEPMOYNasHPz3fT8ObcsN69R2UmmC6S8EqVBDNqZM5QtD1FlqGDNLbH zFGg== 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=yChn4o9CAS9a4x2QiJ5qxkdY1fP0JvPuRXAqc0hsYGk=; b=mgtz0vQTXRgH4M3X9Z+D3UXFt3ZCXp/EaM4i8tm7kfVQx8i7l50QE91oWRFCwl/nD3 hl+VE64bThDGvgpAl3lf3u1YZlSwyRo7rqRnJ4crw+v1BHnpwU7Wx7gXaldZZwmUBPVl Vk8GlTe3vjooMl/TXfu7v1fRgpIL7TpmyEyyewb3YPP6qsVHqRFfBg8vYPdmjf/WezaU RMoL/Po3ObUhHQbmzj4zp5m5Xy0pSnBdCzI6QCSq+IolzlTvT/kJUs9CHR5NVRSSgzIs 3oFfQoIvKAJ97orTS6C4pey8zcMr3imth/MRDaHXMeHeREP8UEY8NimBRt9EglSFAbV2 BJZQ== X-Gm-Message-State: AOAM532BCzBayxttds7u5k/A77xY2bN38KUUFPdXT4yD9ScSnmCS/cqv zaX8Fg71M29m08eUy4ymRgxwgDtxdULi5obc X-Google-Smtp-Source: ABdhPJxawlQAwy6s06ewpez8RMMHvnTj0EanNSsuc1vLWucUK94lLDjWtS8+15/kb/2LCMCF7mOYhw== X-Received: by 2002:a63:8ec8:: with SMTP id k191mr7018919pge.154.1598367121321; Tue, 25 Aug 2020 07:52:01 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id m22sm3104383pja.36.2020.08.25.07.51.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:52:00 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 4/4] configure: Fix include and linkage issue on msys2 Date: Tue, 25 Aug 2020 22:51:33 +0800 Message-Id: <20200825145133.178-4-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::52a; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x52a.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+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 Case $PWD are result msys type path such as /e/path/to/qemu but `pwd -W` are result E:/path/to/qemu that can be recognized by the compiler So we replace all $PWD with $build_path that can handling msys2/mingw properly --- configure | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/configure b/configure index b8f5b81a67..a0e2b20877 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 @@ -4299,7 +4309,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 @@ -5284,7 +5294,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" ;; @@ -6284,8 +6294,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 @@ -8233,7 +8243,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" \ @@ -8249,11 +8259,11 @@ NINJA=$PWD/ninjatool $meson setup \ -Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \ -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \ -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \ - -Dsdl=$sdl -Dsdl_image=$sdl_image \ - -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \ - -Dgettext=$gettext \ + -Dsdl=$sdl -Dsdl_image=$sdl_image \ + -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \ + -Dgettext=$gettext \ $cross_arg \ - "$PWD" "$source_path" + "$build_path" "$source_path" if test "$?" -ne 0 ; then error_exit "meson setup failed"