From patchwork Tue Aug 25 16:53:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1351167 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=RRFNh/Ch; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4BbZpW72gpz9sTY for ; Wed, 26 Aug 2020 02:54:27 +1000 (AEST) Received: from localhost ([::1]:54704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAcDJ-00016x-VC for incoming@patchwork.ozlabs.org; Tue, 25 Aug 2020 12:54:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAcCz-00016d-MI for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:05 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:36585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAcCy-0003eQ-4w for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:05 -0400 Received: by mail-pg1-x542.google.com with SMTP id p37so7238471pgl.3 for ; Tue, 25 Aug 2020 09:54:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MU1D0gcoO3ZaMdBitGLyuB0vQmL5fSRzDQyIOcmupWk=; b=RRFNh/ChKXSx1pXId/0QVXP/LMduMWDUJIHuK6jYKuSZ2EzJrIgJi3qIeWTFfYUn1+ lWaJ36Vu8r+3BoSvtZcD2FNMxnR/7TZe/hfdedT8HlI9Pfu6LIFcNuMP8xUCasJLnQLF gACyQkw+YfEuRzGJFcb68Ls2DbdijzL9e5rdAtNRLi40oLKFZGXNM2klN6NrmJHS6VLT SwDBPiHrZpqTxVYU0GKxMSCt+FVEbE2UY7gfy6F0nzrgB6JCbvCAaRXqpwBXgEHF7cKm qipeusQN/EzlTBNeacItXBURg+jKvrSJvqEGuLbNVPVXohaphJqfx9DvJbFnSraaz0FQ NrbA== 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=fcdRNDnbjSjxgCaZNR7u/2ajsxgZexP0PRoM1b+8aS7zqAsO1vo9RYmACo0F7utANt nLKkoTJfAwtH4KFtht/BABtJvFViwP7vyvwihmzEZITykGXUnv7jyBqLEdb0OhnlpqaM TOUeIvFxRcO3wiXRrqRf97ECalniO3olz99+jj6Ae843PXGavUMQoYfreTEBT6AtNNqo VAv/dsxMjlWSBLDXJ0k6M7vWmH4SOfS5amcaOEKDNrAAWTet5X9jlAwiYGM5gEIRUn2c HTgkgQU8moRKnlxCVzrDkgGgpt4eYjqZ8QB3BW8WiqHJHB/IukYsMJXOeKP0ZeY1jYYu T3DA== X-Gm-Message-State: AOAM530h60fOQ3p+KE4zCMkJVzgPEVNz9DjHycLRMQeYhlKzLQrBNsi8 wdAjT5soqbRRrrnDMzwmbwvGse00Taw407c7y+A= X-Google-Smtp-Source: ABdhPJyQXihYc/eTsNGoXFyGE7HRBDtkIBYc3lNGwLBK2AuqdSQhiOthiH5tZqFKR3ANjo34pgw2FA== X-Received: by 2002:a05:6a00:15cb:: with SMTP id o11mr8477923pfu.263.1598374441891; Tue, 25 Aug 2020 09:54:01 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 193sm15988527pfu.169.2020.08.25.09.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 09:54:01 -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: Wed, 26 Aug 2020 00:53:38 +0800 Message-Id: <20200825165341.520-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::542; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?b?RGFuaWVsIFAgLiBCZXJyYW5n6IyF?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 16:53:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1351168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qL+3KK6v; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4BbZpZ2bvYz9sTK for ; Wed, 26 Aug 2020 02:54:30 +1000 (AEST) Received: from localhost ([::1]:54760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAcDM-00018h-DV for incoming@patchwork.ozlabs.org; Tue, 25 Aug 2020 12:54:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAcD1-00017Q-PT for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:07 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:40815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAcD0-0003fb-6Q for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:07 -0400 Received: by mail-pg1-x52d.google.com with SMTP id h12so7229681pgm.7 for ; Tue, 25 Aug 2020 09:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5EU+iN7Rjwb8vHvybFENyYEoG6wKKZBygxn/P8M+ZLw=; b=qL+3KK6vayAx6K/Q77UmCkwnlV98CpiYY87x4B0bLtt4pUsgn8B29N2MkFYizRYI2w f+IYMotUh9O3lpuhEfWWf5xaZz04tjioRkqxyRFM8lBmHrN3Adji0Kr0T/g0AzftdH9S uqy4VNhgyZUCI25BZNBXuEgi+t9EPnGKLPGTG4amKSGBVHWpMun2wAspKMeiPnGFH0aq IKbFz9zMD6eMdji1lsvhRFQWJDVBCF7OGN7eYNj3QQqeOwrBrVvWJjWVyRSeBGUcfUJg IgnaY1pdXjaSvGQf90b72S3xub6TKjU6mCumVa7K4JCo5BRqC7URJLkwn5309iPV0Yg/ pz4w== 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=N8gT3unX78ntFXiuNbDJseYlvImLfVXBByUyFk61crE7NCVKzyzuinxQJZpRVlD8Ah giNmu1d9YLQP6Za7TkKN7pEb6MtDSS1WD6rfaTlgTGmnde02VH4RW4JrlHf5Wot7BuJc FaFLWrXbdPEIXGAvs3Ty3HMmizGh6pk6PZsrPNIou1zgSIFituZsvmMWgXIz/cVo0+bm aJavkrnRYL6XDdgpkZLIQXoB8eB7S5Vi+Mvrs9uyS4S/isEP2NkdoXCEKSWC4i1xeg02 k3DH7y2EtR4S0WVXqw3I8c473Uet+qdp1+C0CZkIGcQnpWWUjZTKeH8GpgVc128Zb4F+ 3dSQ== X-Gm-Message-State: AOAM5314hmeGtGEYaYLJgw26cIHahjCR7tmy4ZZ/Y+qXpiuOo6Rr+5JL bY8S3knz8CYRFCZ1Y+tdh61MT5vnzNXruuACnqk= X-Google-Smtp-Source: ABdhPJxqwDwpHYF2VPB+TT8sCBC9YW7f4tqBjlFFpNbVkn4HbXTdEjDBQuyr9evHPWBD4ZaCdv8OGw== X-Received: by 2002:a17:902:d341:: with SMTP id l1mr7497165plk.36.1598374444231; Tue, 25 Aug 2020 09:54:04 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 193sm15988527pfu.169.2020.08.25.09.54.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 09:54:03 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 2/4] meson: fixes relpath may fail on win32. Date: Wed, 26 Aug 2020 00:53:39 +0800 Message-Id: <20200825165341.520-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825165341.520-1-luoyonggang@gmail.com> References: <20200825165341.520-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x52d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?b?RGFuaWVsIFAgLiBCZXJyYW5n6IyF?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 16:53:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1351170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=UW0PYfH+; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4BbZr326TBz9sTK for ; Wed, 26 Aug 2020 02:55:45 +1000 (AEST) Received: from localhost ([::1]:60618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAcEX-0003a6-SN for incoming@patchwork.ozlabs.org; Tue, 25 Aug 2020 12:55:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAcD4-0001BJ-5J for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:10 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:39837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAcD2-0003g0-KY for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:09 -0400 Received: by mail-pj1-x1029.google.com with SMTP id j13so1535513pjd.4 for ; Tue, 25 Aug 2020 09:54:08 -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=XRpRfNQbgoJsRKfqSFaFNZt4aTrq25ysudP80W63BlA=; b=UW0PYfH+4Do+KZru0RhDAA+O3sqo0zCdVS37UudBs67TdAPFOtT4hX/Iq61zYezTwx /t1xRbeWNuwdBEzRSNbM1WhedDGt9gwhRyPOanrY1GU8e3Qqbvfa7mtDPYDc5F4Nv+B7 2T3WgxAFDLKpVYKegC4sLSGWuKm++JFrqekSmtrVEzkTUoUi7V+66sFzH/dXErzxeX/e fNyfKkGIV/MFlauEGwENu5HW6nJiOSfSUM72ffmnP4eTQBojtjbKHQqSO6XDWZ3E+L1b ze5m0+RWlqaW91FufIkP6BtTEXpLzCFCKmIMAlQx/EQPgQ4rsSXnZiRn2dTx0Qttr8Po HjKA== 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=XRpRfNQbgoJsRKfqSFaFNZt4aTrq25ysudP80W63BlA=; b=uRnq+hV08IJlEs5r3l8S9IEB0VM0sz8bh61HSo8NftDOdPUlcaT1dOYZdwEB4FIViH I6OYDKCtKTcMGDTot5y3LFotqFpGWNsveHZbStsfS4LU7DYS1DZfitt+jeUB6SZ/WM8T 6gKB9tVbljjUoSyRPCyraZHxl8ilByyUJtbUO5md1I55po/3fNNaOZ0Kaw6QIOVtmeNC xsXLTq6syK+xLZLaswb/Q+77faQCu+sWq41Y6LMxcUVdf/GLGWGVSUQNldTJ5KxA3wcM v/Tl/bHuhE87WPfnxVyKZR1t/D9p4mhar7bjfoBN+gU9eBkdl3xYLGl5RxzP9woKV31w ggog== X-Gm-Message-State: AOAM530Ns/CV0Fawh3j/oLfcGvfzCGfQCFAVix+iJgUGeCtI6RiMA9ZA kOTvE+tCB7MmPTVwInEw0Ehb4OEblCLMFKueGiM= X-Google-Smtp-Source: ABdhPJxJLGxml9TkEdamMlVcmGc4DQuf8MMVUhQB0FGY41LxKOoG6TIBwhXHsLVmr5pK3OwwevZeHQ== X-Received: by 2002:a17:90a:a61:: with SMTP id o88mr2369044pjo.201.1598374446648; Tue, 25 Aug 2020 09:54:06 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 193sm15988527pfu.169.2020.08.25.09.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 09:54:05 -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: Wed, 26 Aug 2020 00:53:40 +0800 Message-Id: <20200825165341.520-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825165341.520-1-luoyonggang@gmail.com> References: <20200825165341.520-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1029.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?b?RGFuaWVsIFAgLiBCZXJyYW5n6IyF?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 f0fe5f8799..1644bbd83c 100644 --- a/meson.build +++ b/meson.build @@ -224,8 +224,7 @@ if 'CONFIG_BRLAPI' in config_host brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split()) endif -sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static, - include_type: 'system') +sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static) sdl_image = not_found if sdl.found() # work around 2.0.8 bug From patchwork Tue Aug 25 16:53:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1351169 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=oOHrNjqj; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4BbZph3vtKz9sTK for ; Wed, 26 Aug 2020 02:54:36 +1000 (AEST) Received: from localhost ([::1]:55156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAcDS-0001JF-8M for incoming@patchwork.ozlabs.org; Tue, 25 Aug 2020 12:54:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAcD6-0001Fj-GT for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:12 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:45541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAcD4-0003gG-Rk for qemu-devel@nongnu.org; Tue, 25 Aug 2020 12:54:12 -0400 Received: by mail-pf1-x444.google.com with SMTP id k15so1340716pfc.12 for ; Tue, 25 Aug 2020 09:54:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bzrUXWXJ2P4FPb4Z7Y3jIG7wAqzpJKqykSmKTUKfTsk=; b=oOHrNjqjLxIlvODn6hHVZ0ptZCsU3Yxnup8VcCLSxqCnxWC+VFFbAMk/oQmjLKUJX2 qP5Qy2DiUAaTmwhr3DNsOkrl42YNWHJwhCAphi7YbV1JbHWjKKeBsA6tOLArK+qigfb8 Mmj5zN+ypOwg+7UIn7gJ/p6be3bmnLUM36hEsICpVE4FBFo0jea6mZALSSEvHfirvgsS IshkTxESUo8V/kVd0LX+lf9eUPSV9tTogvedZ4sql6iLraDIabRq8pJqcpIZdhA6TxTc QqVlBJ77rgRiRAU0hci/BYyPsVcFB+8cJfBkLLy9Qv+T/mNelAV4YQGNyFOhjuW5HTdj 4q4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bzrUXWXJ2P4FPb4Z7Y3jIG7wAqzpJKqykSmKTUKfTsk=; b=hC1/2rr6lrDT3NMRRA2wC5JzMaE9HzRCgrkCS90GoakiTLVWYFFDcmGjwuvNDsuQJH 7DbG3G6iwAcFhKiSqkJRxoVECU36/m4WObi1Rtl3M5tDxZhFOYVdaDiviO2EWE9vPN3B nZBk67wxbudeC19M6c87sYecFlwnH+6nMXXFi/KTaodL/y0mp5CRy8+brbNg5KdtRN/O S5H6I/Qjb5Oe2SCysFP28qC/SXkE8w53lwPcTJdqELRkBgDOIW9QdWqz9CwPJ1ZiHHWx TQyh8eiUyb5T4ygfrmH9/gHiLPcyBsMlsJDKE3O3//fB56VT9vdqY/sPBiHck7rvHGMB j3OA== X-Gm-Message-State: AOAM533NQGvDcU//0a9p177Of3+St6UIhC8obxNUmgoYZR/iGPIL9Dmx Oar4vHWtaKmLHVsW/H/cxewSuZq8kUe0awBJTxA= X-Google-Smtp-Source: ABdhPJw7MMBTBkAMI4hCR53aQrxZ31YCKUkBEAWah2Tfg1yVhwecSp1pQRUbnW/JojZvxtd+0zU5Ng== X-Received: by 2002:a17:902:e901:: with SMTP id k1mr8896107pld.189.1598374448962; Tue, 25 Aug 2020 09:54:08 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 193sm15988527pfu.169.2020.08.25.09.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 09:54:08 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH 4/4] configure: Fix include and linkage issue on msys2 Date: Wed, 26 Aug 2020 00:53:41 +0800 Message-Id: <20200825165341.520-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200825165341.520-1-luoyonggang@gmail.com> References: <20200825165341.520-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::444; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yonggang Luo , =?utf-8?b?RGFuaWVsIFAgLiBCZXJyYW5n6IyF?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yonggang Luo On msys2, the -I/e/path/to/qemu -L/e/path/to/qemu are not recognized by the compiler Cause $PWD are result posix style path such as /e/path/to/qemu that can not be recognized by mingw gcc, and `pwd -W` are result Windows style path such as E:/path/to/qemu that can be recognized by the mingw gcc. So we replace all $PWD with $build_path that can building qemu under msys2/mingw environment. Signed-off-by: Yonggang Luo --- configure | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/configure b/configure index b1e11397a8..3b9e79923d 100755 --- a/configure +++ b/configure @@ -13,8 +13,13 @@ export CCACHE_RECACHE=yes # make source path absolute source_path=$(cd "$(dirname -- "$0")"; pwd) +build_path=$PWD +if [ "$MSYSTEM" = "MINGW64" -o "$MSYSTEM" = "MINGW32" ]; then +source_path=$(cd "$(dirname -- "$0")"; pwd -W) +build_path=`pwd -W` +fi -if test "$PWD" = "$source_path" +if test "$build_path" = "$source_path" then echo "Using './build' as the directory for build output" @@ -346,7 +351,12 @@ ld_has() { $ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 } -if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; +check_valid_build_path="[[:space:]:]" +if [ "$MSYSTEM" = "MINGW64" -o "$MSYSTEM" = "MINGW32" ]; then +check_valid_build_path="[[:space:]]" +fi + +if printf %s\\n "$source_path" "$build_path" | grep -q "$check_valid_build_path"; then error_exit "main directory cannot contain spaces nor colons" fi @@ -942,7 +952,7 @@ Linux) linux="yes" linux_user="yes" kvm="yes" - QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I$PWD/linux-headers $QEMU_INCLUDES" + QEMU_INCLUDES="-isystem ${source_path}/linux-headers -I${build_path}/linux-headers $QEMU_INCLUDES" libudev="yes" ;; esac @@ -4283,7 +4293,7 @@ EOF symlink "$source_path/dtc/Makefile" "dtc/Makefile" fi fdt_cflags="-I${source_path}/dtc/libfdt" - fdt_ldflags="-L$PWD/dtc/libfdt" + fdt_ldflags="-L${build_path}/dtc/libfdt" fdt_libs="$fdt_libs" elif test "$fdt" = "yes" ; then # Not a git build & no libfdt found, prompt for system install @@ -5268,7 +5278,7 @@ case "$capstone" in else LIBCAPSTONE=libcapstone.a fi - capstone_libs="-L$PWD/capstone -lcapstone" + capstone_libs="-L${build_path}/capstone -lcapstone" capstone_cflags="-I${source_path}/capstone/include" ;; @@ -6268,8 +6278,8 @@ case "$slirp" in git_submodules="${git_submodules} slirp" fi mkdir -p slirp - slirp_cflags="-I${source_path}/slirp/src -I$PWD/slirp/src" - slirp_libs="-L$PWD/slirp -lslirp" + slirp_cflags="-I${source_path}/slirp/src -I${build_path}/slirp/src" + slirp_libs="-L${build_path}/slirp -lslirp" if test "$mingw32" = "yes" ; then slirp_libs="$slirp_libs -lws2_32 -liphlpapi" fi @@ -8212,7 +8222,7 @@ fi mv $cross config-meson.cross rm -rf meson-private meson-info meson-logs -NINJA=$PWD/ninjatool $meson setup \ +NINJA="${build_path}/ninjatool" $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ @@ -8232,7 +8242,7 @@ NINJA=$PWD/ninjatool $meson setup \ -Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \ -Dgettext=$gettext -Dxkbcommon=$xkbcommon \ $cross_arg \ - "$PWD" "$source_path" + "$build_path" "$source_path" if test "$?" -ne 0 ; then error_exit "meson setup failed"