From patchwork Tue Aug 25 08:34:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735223 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 54EE7722 for ; Tue, 25 Aug 2020 08:46: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 2921D2065F for ; Tue, 25 Aug 2020 08:46:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LAxygP3K" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2921D2065F 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]:44244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAUaz-0004q5-56 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 04:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAUQR-0007NV-IQ for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:27 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:44876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAUQP-0000vz-Np for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:27 -0400 Received: by mail-pg1-x529.google.com with SMTP id m34so6312140pgl.11 for ; Tue, 25 Aug 2020 01:35:25 -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=LAxygP3KPu5ccm2WqUqL7j9A9bug2PsQCac6/0FabO6ypidONU9c52EFjHB8Zqr0p2 kfR5SGd73frAIjgzFwx57nC7m480UlAo2i3Nwdac7H0ro++AVjMa/KYqiOa+fGMXOagG wzP905EsSyIp4JQFRMU3ctsN9vh5cNW89OCTkHJc/aJs/E61W5Dm+vPgApQAXZSSiXDX vsNflBol9z8oIiuFzPsp5jh8/r4es4ur2F4L8N/5TT/7fi2Bxev57bDZC1FIJM4x82Z5 RkbBPanvWMZDJUHSGc4UQwZ600h4Ay5L3ZbMl9maNZtaMFrujSaSeVszty/+HM5qwrtt jaSQ== 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=hZ8K92qgqQ8ADGLtsHiXnEv6oDpp7nSjFQg26yLg/MXl7Ak+QEc1XPQ7mzYO5ZLFIb 0/bgKO6ISfhhL5Dnw/6l72Wm1AV+NedatZLYM0uzyfOTXEp21vRJ37im68x/Ph+PX3Ge X86loNJSZ8HtIoE3V8AvWQxQlAcvnE11lTyKZ0hafzXQT7etA/lotFsJFWJzBMGeW6OY oaLLX6kCUBYjDlxHcWpyhwIo5S01UJlJxDzlQBFyW7zqbWrUXGYMHMGSk3sb2Pwp3R2S j2+unyxmEmWpBUHX5Ox/myjhSf/42hRk85PcmI5Eabopn26+5u//B+bSCeDCjUUAtW7N 7NVQ== X-Gm-Message-State: AOAM531+tKz38NXjOfA6jfRFIf8OrLBTcl35xblCGa04dj9ve4FZFjRR PhUcbdGpONsTNzXRBH+X51/+3j+IECWVVfeK X-Google-Smtp-Source: ABdhPJxhSpeK580wP94VnW0fXEe22qFKcduMg/NDYvLOJ8xxLIyuMp9hnh8Gaww03RB2UqedK0000w== X-Received: by 2002:a65:60ce:: with SMTP id r14mr6174044pgv.85.1598344523557; Tue, 25 Aug 2020 01:35:23 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id bn14sm1146683pjb.0.2020.08.25.01.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 01:35:22 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 1/5] meson: 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 16:34:56 +0800 Message-Id: <20200825083500.359-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::529; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x529.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 08:34:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735219 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 7769C739 for ; Tue, 25 Aug 2020 08:45: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 4E4332065F for ; Tue, 25 Aug 2020 08:45:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="faZbjc9K" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E4332065F 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]:40140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAUaH-00037b-FB for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 04:45:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAUQl-00086t-18 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:47 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:41967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAUQh-00010K-F1 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:46 -0400 Received: by mail-pf1-x431.google.com with SMTP id t9so2590298pfq.8 for ; Tue, 25 Aug 2020 01:35:43 -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=faZbjc9KpzRCNppP5iiWIh9cjaI4/rLkD82RKbX4NJFQLIj2PKF/D7fbQruN8JtD+q zfnIBcz21sQ7YQ4SmQC8J8hjOq1o5QR4x6PkdGJgM3oDVw9pwk2S8kRSd8+NdN6jnhQz EB5IAfJVXS31QrCNV9Jr1NuAsMmhEjV30KRxJzZ9FxZU+dSFip1MRkSQrcg3mEXeSKRV HsaOFFQKKeCeRpBHBUGm8fFHqtsqhFsIvegXrHA14gZfCBl20WmLxHIZWAV5B+4pFZ+9 eTa6m6dIc8oIRrntn9aDNy04+/qoS4J13qXKmO9FJfWGqqh6syeWWIMa8BOVCxO2u7PD symw== 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=HdQ89eaDbX6Bu+s+a83HUj7DUAG+cKUwEt80+I/ikQettvojnFOr2jqZHnw4HoY07z Kltfkn4COAR6okk8vm5fCTXQTwabYxHTmvIVP7R2pkfgSbom97oYdlMEcgpi8NfoJllX whX9nhz1NONncFApOuVCU6kdstO/HtTM4hKuyjp8CmMH4uvgZYoe1JogdbuayTziNYaE DDxpq0x1voOALbdVeEnpEKJTLLQ4xXXxIDQiHWRF0CCmHaSgVJSxHV8dfTInKWBEPnZv 0AbkW3rLbiZLfRFeWme3/w9EKB5o62f4ohR33E1EBdEfFerm8pUR7X9q5a2Q5xG2qfwO 73dw== X-Gm-Message-State: AOAM530AWIq+c9FpVAiyp4hSg52OJX7GRdgTCaoGd0evvxH8WNrV17Gs 8cWK4OJ80xpu+KHB54/9ar46jSRlZRXaJ3nK X-Google-Smtp-Source: ABdhPJzlWxsMwAmPYmI8F5bJGHsvKN8v3XSABZtgkEVsSCbc/iKOpLQAXbJHzf2yZF5nq+azp85UjA== X-Received: by 2002:a65:5849:: with SMTP id s9mr6322324pgr.145.1598344541468; Tue, 25 Aug 2020 01:35:41 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id bn14sm1146683pjb.0.2020.08.25.01.35.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 01:35:40 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 2/5] meson: fixes relpath may fail on win32. for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail. Date: Tue, 25 Aug 2020 16:34:57 +0800 Message-Id: <20200825083500.359-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825083500.359-1-luoyonggang@gmail.com> References: <20200825083500.359-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x431.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 08:34:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735227 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 6832E722 for ; Tue, 25 Aug 2020 08:47:11 +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 3DDF42071E for ; Tue, 25 Aug 2020 08:47:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cMqB7tx6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DDF42071E 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]:48232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAUbm-0006VX-F8 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 04:47:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAUQm-00089t-8V for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:48 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:39102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAUQk-00011h-CS for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:47 -0400 Received: by mail-pg1-x535.google.com with SMTP id v15so6316063pgh.6 for ; Tue, 25 Aug 2020 01:35: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=htMtb1NzKhLangZNeh4fyVQE1LaLJL7zHAVE3XWM2KA=; b=cMqB7tx6vU9uaTDHrEaPkZZHXhQ2xUynCgUO7vzFEk7/xoweBtz2J0y/ZON6XMFNLK UAjQLulaxsAj5a0vjvRjAUhJ5FkJ0Jzyga5E4gfyDiHMMnKyZ3RD21AARLwKi1EznpJS 9CWExvEpm+pYDBBnbo+Ef+zXsOpj3TCRug5QfheHxXlU9Q/Z++1FGDsM1oDsVcdwjYcO ZxaTI8dk8Veb1boKIHu65Q5JUAZhCm7/4Mc3nNM/0GXSYLG8gb4ClQBruDpj5C81WkQT yWehB7Z1ire3QeXZ3Ri7rBlc2uNWKao7yCrM1TPd0S4sPCWJNugKmeddAAY2j5LYkZfS 7K5Q== 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=PavrD5XKUnQqiBoZr8ZRPTzpVTRBf2rB8+FEAccpFPUwsrlR7GNWr9IR2OAlFaxlsW EFIiHtNUsjDqXN01jZs6vids+4mSn/mOb5d+3NRwnMr1VQPaxbPAMKje4cH9nKtlEYTh LV0RuGSozr55rCsuZDhvaDiGpjeNCaShPShFi5YmPAQNThGxTn9wOeSWRh9ioToZQTF4 Cg0OpT4H5NWCIpMKvaddt2B7FDXiQ3qyw023Lh07ci7Fcy5DY2kzKT3quvxvumphoJN4 bRdmsRoEp+xeMcj6RvuIQPRZkvItpUgQhGjXLNA2UgZ+dITgNwo38Bz1+aajlzseCgoq KynA== X-Gm-Message-State: AOAM5332oh7i0aqVEQ0hE8CeYPdDSZrW842cINyJIgutjRII93EcF6br FKMM3snDuBi5TFswit8f9HbNFR25W2eUJcc7 X-Google-Smtp-Source: ABdhPJxbvr7/AnBoZcHyhsW0W12ecYhAkPOLPxHO5o9UAm5fH+F+qXKhj+2i+WaiwgQOkytgV7QdZQ== X-Received: by 2002:aa7:989e:: with SMTP id r30mr7131267pfl.205.1598344544576; Tue, 25 Aug 2020 01:35:44 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id bn14sm1146683pjb.0.2020.08.25.01.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 01:35:43 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 3/5] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Date: Tue, 25 Aug 2020 16:34:58 +0800 Message-Id: <20200825083500.359-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825083500.359-1-luoyonggang@gmail.com> References: <20200825083500.359-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x535.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 08:34:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735243 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 EBF34739 for ; Tue, 25 Aug 2020 08:55:28 +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 C29472068E for ; Tue, 25 Aug 2020 08:55:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jjTorMIy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C29472068E 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]:44356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAUjo-0000GL-1u for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 04:55:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAUQp-0008I0-8t for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:51 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:44890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAUQn-00012l-JZ for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:50 -0400 Received: by mail-pg1-x536.google.com with SMTP id m34so6312824pgl.11 for ; Tue, 25 Aug 2020 01:35:49 -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=OhF7DmqPnZElocDCHxwQ+SG0m4lR629MaEFLfhtxWUY=; b=jjTorMIylr5hvt3mAXy7m+XO00ETHIL0fggSqWJtI/gKe0lSybaGUkuJjaid15z8bV YSI8XVcr9PedRk9OXvbocWWSb6M1i/XBInvjezvJu8VatTQlHe4KcHMH6yiur/LF9eaT WvTENnW5VqkafiaOBvwstUNol0ohI9e5xMiq94bA0iKvl16t2uyhMQgQqCdFHZs5yMlE y2Z1SYCzZr0QG81+thOqkN7e+s4ylyWku8z46UN01sHhzS7WFAziNjUZMeeaizUKuKJv Rd1amAeWgFYjSd1/EaG/bWfN2ve6BBXKMpRHa1AZUEbsDayl3Q19b80MzYfmxll15wnp MJSg== 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=OhF7DmqPnZElocDCHxwQ+SG0m4lR629MaEFLfhtxWUY=; b=IhwXd3mstUpY3PG8nFHd39QexaJueGc+9zAEqCV/hNi5ANrU9GHUKyyyytWqIO7l20 UbG9Ct8KYY21RlsBMnTvKg4zq3XzKnxjFWW0FOOSY46l9EK9+RufYg/HBbnlOXkLQg4H vx/mfZSkNKNyX1BtIaYXpdenbMt40J1Ysl8g7E5VcVj/9/2dTNVx72oPR95GikMl+uCq n2kTYfO5+WsnIhBoJ1Gnb8RnajRQZt4dLWIlIuVR73EC2rplVPfbbmC8bupInovn3UTS YKWrkjA/OTDF6zAb1EEfxoR4+I+DB1qz1hXVfs1t616tm3PVirFlb+vpjE+qx5h7ZaYP EbYg== X-Gm-Message-State: AOAM5310JfnQVBYTnm84W7Skwx2K/4SWR4YXOhG8leqBAZ1Fkx0lZlXa Zpyo56kZJNkx+O1/5BEm9UK42muxof72UADl X-Google-Smtp-Source: ABdhPJwC6h1Q2mXUxxwA4Ehc6zViZA79CnpE4rLpyEqHHlWQgkhs0tPElA+Yh+s/vh+kHL4jnY1jxg== X-Received: by 2002:a17:902:bd45:: with SMTP id b5mr6780810plx.22.1598344547699; Tue, 25 Aug 2020 01:35:47 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id bn14sm1146683pjb.0.2020.08.25.01.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 01:35:47 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 4/5] meson: !/bin/sh are msys2 friendly. Date: Tue, 25 Aug 2020 16:34:59 +0800 Message-Id: <20200825083500.359-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825083500.359-1-luoyonggang@gmail.com> References: <20200825083500.359-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x536.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/undefsym.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh index b9ec332e95..8189308b2c 100755 --- a/scripts/undefsym.sh +++ b/scripts/undefsym.sh @@ -1,4 +1,4 @@ -#! /usr/bin/env bash +#!/bin/sh # Before a shared module's DSO is produced, a static library is built for it # and passed to this script. The script generates -Wl,-u options to force From patchwork Tue Aug 25 08:35:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11735245 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 E10F3739 for ; Tue, 25 Aug 2020 08:56: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 B7A162068F for ; Tue, 25 Aug 2020 08:56:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WPqLpzhA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7A162068F 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]:46446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAUke-0001Ep-0Q for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Aug 2020 04:56:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAUQs-0008Rz-7k for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:54 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:34566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAUQq-000139-69 for qemu-devel@nongnu.org; Tue, 25 Aug 2020 04:35:53 -0400 Received: by mail-pj1-x1031.google.com with SMTP id n3so516284pjq.1 for ; Tue, 25 Aug 2020 01:35:51 -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=WPqLpzhAUGWwISLhNeRDdooWOP6rGepR2wI0ilOjDjz6cr2GgPk5oecinY7N1tHqBq GHk0MbawMDpSlMOJXXWtZusEL0HKvcM4S6FepdFDvaQGSqf0brlctxxISa4Ei00utmdU O+1MRC7GmM+HRlBKVyXRRp3pi0KIWXJV4d1EVV90lubP+ZAOswrC1oZQnq43rkjm2CQD 0YmrLaksZY714wnU6hdHZeUcEJvIsJEBC8Qa13C/95M30w5fMExRfG0ac50v+xXyA6jU S+32l4iFTDymSevm7rUWb57jMxFLslSkrw8wJJNsDdFeIl5Oa/Nk0u7SJNJGA4f+mB+c tkzw== 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=mS2IBuV3An1/vk15YuWkbeyEdDS0wGqNqJcw8/pXbQD220+xmjYNwR/0pwb0GoLAxJ E98A5nMlvi5rhofjR0L2KLYZ+SXAmGTEYHwGozhJ5ZM7HYQgcbLvLv1C8dZPdEHNrO6W ys4Gst99lugudrcpgNiCde57mroXL2QUIsnG2b6WZW9kIp+T0mVxmMpAU3L56eXVtSZ3 yQJfjuVssV5CDNoVGvoVQowDVo1cjqI8BityWgstbVq4bC3Bl67euYyg5CHYHtW+ssPw ovtsZQq9WQcCwZqwvpJI0MjqvIeuo7h61+QpE3irc2Zp2BRenwGeB82QKClGdUTSlok4 HeIw== X-Gm-Message-State: AOAM532YFwDD9v+P19jneo2X0fWqLY1XDONsU/9CNmyAQJm1aNByO8W4 YgY4WliRzpUPBuIRpxmUyEnuEK3ej+d+oafn X-Google-Smtp-Source: ABdhPJyKVK5ZHJRA6UX4Hc/mbkXky5NWQwmwc00098qtNJuLlPsc3nrcrAwtoSjeKxiPkj2HgJlcgA== X-Received: by 2002:a17:90a:a590:: with SMTP id b16mr716865pjq.131.1598344550285; Tue, 25 Aug 2020 01:35:50 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id bn14sm1146683pjb.0.2020.08.25.01.35.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 01:35:49 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 5/5] configure: replace all $PWD with $build_path that can handling msys2 properly Date: Tue, 25 Aug 2020 16:35:00 +0800 Message-Id: <20200825083500.359-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825083500.359-1-luoyonggang@gmail.com> References: <20200825083500.359-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 --- 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"