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: Yonggang Luo X-Patchwork-Id: 11735813 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 37739722 for ; Tue, 25 Aug 2020 14:50:31 +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 0B2CE2075F for ; Tue, 25 Aug 2020 14:50:31 +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 0B2CE2075F 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]:35170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaHO-00075g-7w for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:50:30 -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+patchwork-qemu-devel=patchwork.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:49:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735815 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 23D1A722 for ; Tue, 25 Aug 2020 14:50: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 ECAD12075F for ; Tue, 25 Aug 2020 14:50:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dFfugg3j" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECAD12075F 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]:35686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaHU-0007IM-2h for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:50:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaGb-0005iC-LA for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:41 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:35799) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaGZ-0008RQ-H3 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:41 -0400 Received: by mail-pj1-x1033.google.com with SMTP id g6so1362966pjl.0 for ; Tue, 25 Aug 2020 07:49:39 -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=s3dYOgA7GkXXyUyxgB9kFfNBkj2FaL3vO8uRc/sluZg=; b=dFfugg3jvpd19ezcWaHDtjTFFFgGqRqfE1hCnT72Al0h9R0SgxnAIeSLezovhE6UFH 95zfNRGBTI9WC1EWGEnAoyTStPDUth03/PdOpxIcK2uxmBIbaV6AWnxahx+AI+fOXWtf a0+paZr3TcfZcXnHs3I+wbFBO46EKZtIpQOlk6Vc82UhO+QRHlBqTf5EtU6UP+xiSpo3 IxiBWr3mp1P4VJs7V+giOeEWEljI6pUPUJ2l2QZ7SNCM9qd3GYyQuWKSmIcz3qCx8Ph1 ReJq7sDylwkL6M7hf7Otk78comq0p54N62agWVfhqVVabEM7TsV1dUID92Qw2GFS4faI y6uQ== 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=s3dYOgA7GkXXyUyxgB9kFfNBkj2FaL3vO8uRc/sluZg=; b=kVZh3M/ag6ASy8Mf3ORwZmZAQBtOXlbZ3xRhxvaob2q/tFOzm5+1Je9NWtaNhNz29d lcI8t0sejSuJypfgiwvMtSrk19h0dIvbVReK9SiBoR0Zol1Z3YqlhRJRnxA9K7AJ7kqp 1oZ1/rkVxtA3p1MfxAcm7qmhsq2i7d2lb7pzhO1yRGhLPQlaKnkwOQVXwdHNHhCQRhLR NdV7/pTPlNTqcCs5gSwyaqMs+xiyLJoCccEfCr5yBqTaHYqqsYF6egyfgFGFaE2iEA0K RsO9uZSrlRppFqr/CpLW87OzI7yCAdyet7N4XhGY1alnpHToHqaXt+0lpKk21W8sun7E Xx9g== X-Gm-Message-State: AOAM531ofIoAzyZUPpeBfVOnRZXYU9g5/oJ3v1Io9j1hO2/2HWR7c+k3 drarY1x49xbaPkCvEyI78B3L3TA50YVXPBh5 X-Google-Smtp-Source: ABdhPJyJ2EUcZMaICoz0B1SMqd08XP1sObBzNFw7pYBVvGxg8HxP9rPZdX5DpfNifGQEQuhu2IMLZw== X-Received: by 2002:a17:90b:3197:: with SMTP id hc23mr1904911pjb.60.1598366977597; Tue, 25 Aug 2020 07:49:37 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id s198sm3093188pgc.4.2020.08.25.07.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:49:36 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 2/4] meson: fixes relpath may fail on win32. 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 Date: Tue, 25 Aug 2020 22:49:17 +0800 Message-Id: <20200825144919.1217-2-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::1033; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1033.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 --- 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: Yonggang Luo X-Patchwork-Id: 11735817 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 8019A722 for ; Tue, 25 Aug 2020 14:50: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 566342075F for ; Tue, 25 Aug 2020 14:50:40 +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 566342075F 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]:36138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaHX-0007Xu-Hy for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:50:39 -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+patchwork-qemu-devel=patchwork.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 From patchwork Tue Aug 25 14:49:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735819 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 1E465722 for ; Tue, 25 Aug 2020 14:50: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 E3EDB2075F for ; Tue, 25 Aug 2020 14:50:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F0JwzT9e" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3EDB2075F 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]:36408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAaHg-0007fr-4N for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 10:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAaGh-0005tu-BB for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:47 -0400 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]:39002) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAaGf-0008SZ-JH for qemu-devel@nongnu.org; Tue, 25 Aug 2020 10:49:47 -0400 Received: by mail-pj1-x1041.google.com with SMTP id j13so1352802pjd.4 for ; Tue, 25 Aug 2020 07:49:45 -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=8JoKO1thaAqKsTf3f5rAMl9LzUzAtabeXMato26tyMU=; b=F0JwzT9eTnpMk451+EVU9tycqripvO2s4bSh1KXZmt8l+xj7dzfBq8uq/LxULE7bwv YYbVIVDN6LzKnYl6kiR7s+kZmM64n0g2Ipd2ZD8Np+BvDVwBX05aCakKa4kIeqfkHf+T oIxqzFWwew4XmuwMu9ukE8kF6jhO7Sq/EBFyf6/fZv7oeaeoNGEnMle6lsd1T84Tmgpr GCdkhJblRqDZaDX4wkv6ma97q9uLNRATSb7ThmFTFj4p+V2uKw2UThrfDDyq+9n9ZV8n gaMHZd4dqDHfG2o7RUug7vlMWdjflWzaZc/jcYEUQey8XEFmr2r0BjmXlZcDsRlWwBJC W9Hw== 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=8JoKO1thaAqKsTf3f5rAMl9LzUzAtabeXMato26tyMU=; b=kN9rhzbMz10tj1p4X9l0BFjby2EX2XQdkqnNBRz1SmB9wIGyiToPCtn9X15jXO+2et vXDBBYJyyq+q1DJbjL+yjH6426SoWf/xb0YALYCYtwi8qxAWqbrxd9aoU6cDhnT8h3t2 rWU5l3mysBj1/D6sXCP85QEOXMfpqvBfI1aBM4V5Vp7w1Ptr+3Rq7nhT2xn/Z0MIN5dq e+fTxofUGVrNK+J8zH8pt9gk2nxM3AxYcVwwIa2cXYpOalKMyqVjp/WVPvlGgQQU1Z1b 5MEfCb8riiRqkRKkjFNgYGjr0hgTH3jucCfDd8qZf0E0H3u3991ZB67yeD6RTEHhc0an OkHg== X-Gm-Message-State: AOAM532HMQk9qriVQ7KmRXSokPvzK+lr2HofDlzjGf71YUvnYbBXDX0+ 7Q1L/b9pMiUAG/pvvO4jO+4in6w/mTKZmIYV X-Google-Smtp-Source: ABdhPJzTfH92S+Jv+8qq70CLt5Ht7tAaMWSq28qybYkLUb2Vc+I3zUX9AvKzjWs3Wk+ptwrkGFG2Wg== X-Received: by 2002:a17:90a:eb17:: with SMTP id j23mr1847780pjz.151.1598366983881; Tue, 25 Aug 2020 07:49:43 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id s198sm3093188pgc.4.2020.08.25.07.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 07:49:43 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 4/4] configure: Fix include and linkage issue on msys2 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 Date: Tue, 25 Aug 2020 22:49:19 +0800 Message-Id: <20200825144919.1217-4-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::1041; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1041.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 --- 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"