From nobody Sat May 18 21:45:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1598504827; cv=none; d=zohomail.com; s=zohoarc; b=f1XGriui83Dmy4mMm37dXYLtw0iy0JUMDy+WmgRM0l0yUK1aC6BaCyfZNcBoiSibg2Wvy61/w1dhXu1tFFJ1rTIT0u1GpXybC8P37UNoq2VtI7yi4Ze4GnRRqRwCTC6aFUZKhItyBlMo/n/lnd1f+5FnxulR5JnCXADiFZ8YTZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598504827; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nHEmWVZQoKiBv31d0b1nWAUGSiNgf5i9gDUSz3OTqd8=; b=GjwDh8n1o5VeZ0/UeA+C9CkIcUkezwW2VMn6FhpbLxm3OAprOf557draZOppzQxSjgWWpupMRjnOTXoJQkJQowZPLkQ4MeYN/ZLIYkX4PMeHUwGeRs0KsdGeFHZPDD5ayHyuiDdMxFMN8/7tGrxr+Q2dzRkQCGLeU8qzyRGqLrs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598504827912889.5697557113084; Wed, 26 Aug 2020 22:07:07 -0700 (PDT) Received: from localhost ([::1]:43510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBA7u-0004VO-E3 for importer@patchew.org; Thu, 27 Aug 2020 01:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBA6x-0002vv-Eo for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:07 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:43394) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBA6t-0005e7-O0 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:07 -0400 Received: by mail-pg1-x542.google.com with SMTP id d19so2483370pgl.10 for ; Wed, 26 Aug 2020 22:06:03 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id u3sm724213pjn.29.2020.08.26.22.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 22:06:00 -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=nHEmWVZQoKiBv31d0b1nWAUGSiNgf5i9gDUSz3OTqd8=; b=YsLcjvRX+WcK6eYyQRSaanX+IZhHcI5T0+N+EkuDFA/XgBL1wUT0v2qtab52rcEz32 BluOivHgKqkFGzVstEKM1sFXCyeHoKR+XqA0CVU87AUitr+ZbIuyGXx4EREpI34uv35E mj3TxbEprXtZlZb5qehgDVzyR9AGp2FxH/Zd6YzztNcr8iNKUq3jEdeyW4uRDsefwfVu emHPoyyzdMDQKh3+V7PtWYJ/dgh2NROrvdjzhL1K1gSX+9/dNbBai7EZo+vibRdDWnTa BGptbtcKpxkD+qVBfcGCJ0RR9LWkUZHZZghnGlXokjRszq+4Ef+MKnD1lOR/uzaTJr15 zAqA== 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=nHEmWVZQoKiBv31d0b1nWAUGSiNgf5i9gDUSz3OTqd8=; b=Uk83Z7rGD2clMaXGir3XQWichT9WZMS39bojcIcUbku9fQhjzWp5JgFnUsz0PGjMyv jkQsO3QV705tSKwEJ1LxbfyQGFTLYj18AVJY3y9z6ycRnAO9hJC3hxZSQP72/c7eO1nY x6aYevCPxDsxVqKNvMNMm3pwl2wZkeSLOWGUR/i4/SMFGG4fXNI7T/wRwsv9vhd459gX z4o/jsmj54hLL5A3iZoXR/XGKJkMXWZtAy0lnuCy2D+TEgRIfLtG2uKA0g5iTrp3oy4K Ffk4tBBgMXaheapcNKIzSnEgZln7U+9b5jPtIBExSuFP7dyAmWv4gxuDAGTPa+nvTDac yi6w== X-Gm-Message-State: AOAM532R4NBS1bwnB0WiI092PhG8eq/v4W77XMBMfu03wx5eXQqlmiKJ jqCHWXTWPqTAFx6ZUKe/vDp26K1Ez6JAXm9CMUE= X-Google-Smtp-Source: ABdhPJyyOwff+ERLih2sCkkfjAaEHr8X/PeBp3LipdcXvTxUVItcCl4i8F9hQbAlzVb8OwASse6MPg== X-Received: by 2002:a63:ca4e:: with SMTP id o14mr13594865pgi.213.1598504761754; Wed, 26 Aug 2020 22:06:01 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v2 1/6] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja Date: Thu, 27 Aug 2020 13:05:38 +0800 Message-Id: <20200827050543.44-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200827050543.44-1-luoyonggang@gmail.com> References: <20200827050543.44-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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?q?Daniel=20P=20=2E=20Berrang=E8=8C=85?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 wi= th C:/ and E:/ Signed-off-by: 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: =20 PATH_RE =3D r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" =20 -SIMPLE_PATH_RE =3D re.compile(r"[^$\s:|]+") +SIMPLE_PATH_RE =3D re.compile(r"^[^$\s:|]+$") IDENT_RE =3D re.compile(r"[a-zA-Z0-9_.-]+$") STRING_RE =3D re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.") TOPLEVEL_RE =3D re.compile(r"([=3D:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|= .") --=20 2.27.0.windows.1 From nobody Sat May 18 21:45:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1598504827; cv=none; d=zohomail.com; s=zohoarc; b=UG+WgfWswuahdQI3MDK0/s8Ed0PzqfPhJ1f/3rbsvNkun4cEjg/q9s5a5jXCvz7O9osbgYkqRZIrx/ltgQphAyxSpd1vBN33xr84gL27RUsbJ67y8t12LLQXa5f1zjyI2GIzAl3d9Zx3Hv9BIRxlTl8mMFS9+P00y53fuWN1/7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598504827; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7+MsaJjYLlKc/kuo4dhCFuDpn67NQClb7RmuHL3RlA8=; b=OsqCXpUlQVazqcugV4G8+cyskg4wR5ZqIQFvG4XfHhqMSLl+2lNqq6vntvqYYbR4NvMnANgUQRU7+0Qjql2kRLqbmSoNIqLqixQN0Wyre7p6ed9+okzL0ymd/JdhS7XvB1isIieRjdr2QuxhUQHo/d89xxo1a93Ye4yCZhko/To= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598504827594133.98110460967143; Wed, 26 Aug 2020 22:07:07 -0700 (PDT) Received: from localhost ([::1]:43450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBA7u-0004Tq-1D for importer@patchew.org; Thu, 27 Aug 2020 01:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBA6x-0002wU-Rn for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:07 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:34033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBA6w-0005eR-CF for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:07 -0400 Received: by mail-pg1-x536.google.com with SMTP id i10so2505361pgk.1 for ; Wed, 26 Aug 2020 22:06:06 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id u3sm724213pjn.29.2020.08.26.22.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 22:06: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=7+MsaJjYLlKc/kuo4dhCFuDpn67NQClb7RmuHL3RlA8=; b=QwGxgV3DwW4Gqh6cTpNyIQNVr1PFP/aqnbfRYl7USE5FcwLjenD5+M8iFkq6Si7dEP i8Bi0ARPPVvlkkilAkP2Ydor18D2kgXdsGmhOhSgYfNEVv2MKbuq9thsMRPJTeMZbS6j FrK3zB+cpDtvdLKft/VuI/sUWzVvrzT8pGuUlQ8fBsYNF2Vi9t2nSF9SIRUs/39k1vX5 rdLoHGRz0juAjdY1qmmKymuwQ831oNBWe/Zo6A6HGHGhzTdgQE7HAa+i4ETCEmeWB6jE 9L8xeDK0XJrTMQnJZioR9aJXUty6kZh47k45sYvlklJtwsZTo+vyWzSU3BvMwJf12KdB qjfw== 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=7+MsaJjYLlKc/kuo4dhCFuDpn67NQClb7RmuHL3RlA8=; b=qAmpd3UQfmrgF6lwUfb8krGbcBNLLLKeL96xcawPml2wdPM6hfPd0T4Ilz2YdO10HT tBFxY0tebiXFYqorZUrWA7HTODiKUC7V8kNomhe1J428IOqwymCLsRLksQ+iElOl61HN ZAd8hfQoinJT1ciQxIp6yUY5rQhwoKaBaH9Jnk5IePUlzZAvTvsWYPO/2N5nJP3/E9iS 68FCeLT+krCeHHSaKRPilc1qdk16c/5/g64OWuPnUSd+jxT4DZJ/5h85modYiw+uey74 e47AONyVxXYDNnWyX0i8d0w1oZbzWl9DphhxWk+2H1N7Ae0pCFsujJ1+PxsMOKT3VY4F EkhA== X-Gm-Message-State: AOAM532EJYmgqqATXbhHiGZYjnoT2lEfWz3Q7vveJOPBbLhsR6+z7g0Z kObRnp6k84GD8jcI9gsPUvYRoZYc+yp+gDFGCoc= X-Google-Smtp-Source: ABdhPJwUwogKFyngGRwqRTTqva0L4MpZuRuZ4gZmaJf4YOfBPlEEQgQzDdK4eYS+VXB0aBfEJl/Lbg== X-Received: by 2002:a63:920e:: with SMTP id o14mr13184291pgd.367.1598504764477; Wed, 26 Aug 2020 22:06:04 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v2 2/6] meson: fixes relpath may fail on win32. Date: Thu, 27 Aug 2020 13:05:39 +0800 Message-Id: <20200827050543.44-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200827050543.44-1-luoyonggang@gmail.com> References: <20200827050543.44-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=E8=8C=85?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo On win32, os.path.relpath would raise exception when do the following relpa= th: 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 Signed-off-by: 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 =3D 0 for test in json.load(sys.stdin): env =3D ' '.join(('%s=3D%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) - executable =3D os.path.relpath(test['cmd'][0]) + executable =3D test['cmd'][0] + try: + executable =3D os.path.relpath(executable) + except: + pass if test['workdir'] is not None: - test['cmd'][0] =3D os.path.relpath(test['cmd'][0], test['workdir']) + try: + test['cmd'][0] =3D os.path.relpath(executable, test['workdir']) + except: + test['cmd'][0] =3D executable else: test['cmd'][0] =3D executable cmd =3D '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in= test['cmd']))) --=20 2.27.0.windows.1 From nobody Sat May 18 21:45:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1598504900; cv=none; d=zohomail.com; s=zohoarc; b=bU3wHnBmuE/t7u95CN6PiTtWTOqF54KPoDvz11Y0dskXGf5QtfOalTuSX9OPaenW+pPFsyaiVrncQIs+jWm6sffXNI40PyRVNOT/anycBJQ+k1+IpgrQg8AnVsA4XG6efBC51tvZ4jWmxVyQKmuZ7SROzZSbisD4Q/xd2MlQmRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598504900; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rIP9TCfc3oqvA8Vp/R/E5MTUabOcrCowAJuIfVAgJrs=; b=ZO/oOG4ZnBGiDnZxLf21GeIg0Gn0c4umkfBhzxYZy4yx5AUcfqeRFXJWffsnu11FSGyZEGMg1uX3qBS1pp2cGc6Zp3xeCqGSCnSnPPYbBX79I3dfwNIiqgxLer0u1eASKU7dGZMk0yJv/X34cgB/YAyRaVmN44FToe3tKOJ1New= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598504900883986.0992423393085; Wed, 26 Aug 2020 22:08:20 -0700 (PDT) Received: from localhost ([::1]:50968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBA95-0007VY-IO for importer@patchew.org; Thu, 27 Aug 2020 01:08:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBA70-00031Y-Dv for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:10 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:36068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBA6y-0005ej-R1 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:10 -0400 Received: by mail-pf1-x429.google.com with SMTP id m8so2565896pfh.3 for ; Wed, 26 Aug 2020 22:06:08 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id u3sm724213pjn.29.2020.08.26.22.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 22:06:06 -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=rIP9TCfc3oqvA8Vp/R/E5MTUabOcrCowAJuIfVAgJrs=; b=TkDDcUg2GU/8UeZcEWahaO+7zHC5uhjvAo5b8Ty6Pt1uxCM1L2/w9XS2Zlx10L4Z+S AkZjj63BqK8svVdTuxqVNRYOE/QtYQC9Mmd82Qax+JsdQj/k/HII4KPQVQaatzx2DLkb fn4wgwVB9sYlaz4uGwOhqgbjarsZO4hknC2lN3i/1lCU+Bju56AO/n5fsPGDhafQRl+H jDV4mFoCnXCFfm3bH6MYoHjQj3ZzZ7igWawc0gi/on89/XSSfXFcZHKTyQ1rkXKL43tK bkyuMyF4Rg6UvRqdRKvm9KU6/GrZ9ddV6AjFnOiHCgqcuc1yd1uIj9xrKivET384JweC niGA== 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=rIP9TCfc3oqvA8Vp/R/E5MTUabOcrCowAJuIfVAgJrs=; b=Q5narCu+jqJphJpNy7Vnp8zp0X0zZU/bK2a2gCAaWKmZQckiHDtkZ2PcwliZDND5Ot /LctKXuUm0LgNVgjaDL8FxOH0qE2iGWEkb77VHXWDEj6XIrcVnqRkmuz7WUlFdc9X99T jLZOxVXS7pqircNV689xuXYsMvo1AJbVa/KX/YDQV3qJiNjBfnTnatuoFBg7YT3waUm6 Kr1S74EqKbSfXo8vGar7XsLBmKaVBQuFRQ22TLAd+zPUITWhGi/Mzn5m/zUWvegeScpZ 2QDjVzGhAJiVMk0WpR5d7G8NevtzRxvjKbbvis72pQvdwNm/x8GmBfmCj5qYoNqcDj+K RG/w== X-Gm-Message-State: AOAM533V9bs5M0r0tzZ/1xtH8Ru5xEkQ2AwaUoD6T2k8Qaobeq85vEZy tQH8L6YDVBrAOcxLkzMvj/lLaf2VQrps8Vgqe3k= X-Google-Smtp-Source: ABdhPJxzzIC0pwcJzoBcpsJCC5d/Kfk0Y63gjUnGLvYfxsgmvSniX91t8/Cej2ZwZzINyHkMakXl+Q== X-Received: by 2002:a63:471b:: with SMTP id u27mr13149500pga.139.1598504766932; Wed, 26 Aug 2020 22:06:06 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v2 3/6] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Date: Thu, 27 Aug 2020 13:05:40 +0800 Message-Id: <20200827050543.44-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200827050543.44-1-luoyonggang@gmail.com> References: <20200827050543.44-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x429.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?q?Daniel=20P=20=2E=20Berrang=E8=8C=85?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo Fixes this for msys2/mingw64 by remove the include_type for sdl2 discovery = in meson Signed-off-by: Yonggang Luo --- 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 =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) endif =20 -sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_sta= tic, - include_type: 'system') +sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_sta= tic) sdl_image =3D not_found if sdl.found() # work around 2.0.8 bug --=20 2.27.0.windows.1 From nobody Sat May 18 21:45:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1598504961; cv=none; d=zohomail.com; s=zohoarc; b=LECbaVrsl64QR8meKnOyVORsBNFNh8nm1gV+cB4/bp7GSJlqQodR40QjN+6mwSw2ONDGzQzXD86trJOKQRx00HnKLnMh83hvok4+fBn1TuWhxoKRu4+fs1nSfROoXOv6pdUxIFiyKLW3Z7tSG7Uie2Q+olSKSpSln2Elh4CRGI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598504961; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bzrUXWXJ2P4FPb4Z7Y3jIG7wAqzpJKqykSmKTUKfTsk=; b=KBnhzzMIgtnjg3qLI3+gJ/3m5Hkq39aArtZqJK4hBIrE+xHYLfi78x7o25IPRzdSje4o+it8VGV5UBsYSkhPdJ+jK6bqZ9eG8g7ukurpEOaFsXmDDbyMLMLfWGrElVmIxrajeqsfF0q3saCinRIrK49GO3rZnhOvhzXhsrwa4k8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598504961772920.9659694150232; Wed, 26 Aug 2020 22:09:21 -0700 (PDT) Received: from localhost ([::1]:54778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBAA4-0000dP-K0 for importer@patchew.org; Thu, 27 Aug 2020 01:09:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBA74-0003A1-4A for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:14 -0400 Received: from mail-pj1-x1043.google.com ([2607:f8b0:4864:20::1043]:51984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBA72-0005ew-0I for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:13 -0400 Received: by mail-pj1-x1043.google.com with SMTP id ds1so2002448pjb.1 for ; Wed, 26 Aug 2020 22:06:11 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id u3sm724213pjn.29.2020.08.26.22.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 22:06:09 -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=AMd/hRnBoOadugRFtgVRMLrx0hyZKTwfLbPCxXHDOWfKE8m1vuUUD6yG1xe6yOFS7f BS14D9XlW2eMKNFmie7kpv+whUkSECg2hp9415H4/6gfiR7UlRxjzCgJTrISsRl1ZTxi uStB1dt/HRUZXRHFDaxk7YzAgIQPmLsNn5MNWjRaCuxvDsS5y70DCsXdA+QS2ZQnePb+ buthdH+p6dIxhotfaH6mT1uhTc0I295YDELF0otQIYAe2LNKmf8G5P39D29BhkHDnpVX CWZPdAdj8RMj/4G77UG5WnflwGkByc7/1WHr1kX0E13NYAcukbOoozP6y71AmNszrRMq URGw== 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=ofMGQV9f5Ijrbl/RA7+jZgV2kG0lwAyteDY0lct+il8WGwLwXYBrR7RBxC8D/WzL1w 9EI7/ZuUpvxbyhGIu3+CmHEryHSghHSTPUI+bxNRNEDT3cjhC3xFciB0HP7XtPlrxS8y G71v76nJMBIkxUIKFvCDuYTeFhehKYEkaPXzyL/DomGdfwf7auLqxkLx3ZyG/ArHtgpA zg32DERH5AzUF4ok0790I8XtHNw6oK55F/g24xcoIYYPqaeYjAFAQ7GB7CHR30CGLvmI XIjFDybJJ9MbKCtqDdeEJgCT7UZaLqPk1CoH+zw9+yNdzETTe2C4lrQZKqD0+cffPvuM 0C+g== X-Gm-Message-State: AOAM531HzRpTm+9pjUarcciF1ZkvPPtOpzaKhkx/aEfFubhAFWERYhRB /KMUAO72psVTZ7RQpSGsQ/npN7x4sQu29broWWg= X-Google-Smtp-Source: ABdhPJyDwzFx2odXZNgsEF9/GtG8aRfRE5Q+J+xPklSrtv/SADuoAeJ9gMQE9UpJj5jzuKV4xg68lA== X-Received: by 2002:a17:90b:3108:: with SMTP id gc8mr9574340pjb.159.1598504770135; Wed, 26 Aug 2020 22:06:10 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v2 4/6] configure: Fix include and linkage issue on msys2 Date: Thu, 27 Aug 2020 13:05:41 +0800 Message-Id: <20200827050543.44-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200827050543.44-1-luoyonggang@gmail.com> References: <20200827050543.44-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1043; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1043.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?q?Daniel=20P=20=2E=20Berrang=E8=8C=85?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 tha= t 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=3Dyes =20 # make source path absolute source_path=3D$(cd "$(dirname -- "$0")"; pwd) +build_path=3D$PWD +if [ "$MSYSTEM" =3D "MINGW64" -o "$MSYSTEM" =3D "MINGW32" ]; then +source_path=3D$(cd "$(dirname -- "$0")"; pwd -W) +build_path=3D`pwd -W` +fi =20 -if test "$PWD" =3D "$source_path" +if test "$build_path" =3D "$source_path" then echo "Using './build' as the directory for build output" =20 @@ -346,7 +351,12 @@ ld_has() { $ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 } =20 -if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; +check_valid_build_path=3D"[[:space:]:]" +if [ "$MSYSTEM" =3D "MINGW64" -o "$MSYSTEM" =3D "MINGW32" ]; then +check_valid_build_path=3D"[[: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=3D"yes" linux_user=3D"yes" kvm=3D"yes" - QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -I$PWD/linux-head= ers $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -I${build_path}/l= inux-headers $QEMU_INCLUDES" libudev=3D"yes" ;; esac @@ -4283,7 +4293,7 @@ EOF symlink "$source_path/dtc/Makefile" "dtc/Makefile" fi fdt_cflags=3D"-I${source_path}/dtc/libfdt" - fdt_ldflags=3D"-L$PWD/dtc/libfdt" + fdt_ldflags=3D"-L${build_path}/dtc/libfdt" fdt_libs=3D"$fdt_libs" elif test "$fdt" =3D "yes" ; then # Not a git build & no libfdt found, prompt for system install @@ -5268,7 +5278,7 @@ case "$capstone" in else LIBCAPSTONE=3Dlibcapstone.a fi - capstone_libs=3D"-L$PWD/capstone -lcapstone" + capstone_libs=3D"-L${build_path}/capstone -lcapstone" capstone_cflags=3D"-I${source_path}/capstone/include" ;; =20 @@ -6268,8 +6278,8 @@ case "$slirp" in git_submodules=3D"${git_submodules} slirp" fi mkdir -p slirp - slirp_cflags=3D"-I${source_path}/slirp/src -I$PWD/slirp/src" - slirp_libs=3D"-L$PWD/slirp -lslirp" + slirp_cflags=3D"-I${source_path}/slirp/src -I${build_path}/slirp/src" + slirp_libs=3D"-L${build_path}/slirp -lslirp" if test "$mingw32" =3D "yes" ; then slirp_libs=3D"$slirp_libs -lws2_32 -liphlpapi" fi @@ -8212,7 +8222,7 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs -NINJA=3D$PWD/ninjatool $meson setup \ +NINJA=3D"${build_path}/ninjatool" $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ @@ -8232,7 +8242,7 @@ NINJA=3D$PWD/ninjatool $meson setup \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_png=3D$v= nc_png \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon \ $cross_arg \ - "$PWD" "$source_path" + "$build_path" "$source_path" =20 if test "$?" -ne 0 ; then error_exit "meson setup failed" --=20 2.27.0.windows.1 From nobody Sat May 18 21:45:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1598504836; cv=none; d=zohomail.com; s=zohoarc; b=G8e8xkqbiIUj2wUaASSv7vfqyeil8qSQ0r5O3T9aQbDhRPyjIHDFRFdemno5MRvjGLLPaF6oghgd6fVQ4x4V2+ya6S7WNsrhCVvnveJuxLCPsGluhQ778xsDi0F/YhnTdrC6x1vhd1QLkUkd9jEVvOvGfH/NMz76DQYd3DCpTkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598504836; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kZmgaDEBNjpxaFbsHI9krVOWSzauPOV79k08lIpZd10=; b=DgMqGYtLHm47E0ZArbyvUtKAX9DPbV+NwSJunEDW+VxNfJ9Cp+z15gc166Bw1HUmfDE6AoVg/joTW3zkbZtSfNRByfCJ/pRJZZZ73PulmdIRLDVICYvv5V/po1ZGmXjbAaMVRidaEh4LEiSKFHp9YB1Ik4baKTckP2nj1b8VyXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598504836203742.3811177251717; Wed, 26 Aug 2020 22:07:16 -0700 (PDT) Received: from localhost ([::1]:44462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBA82-0004sp-Tl for importer@patchew.org; Thu, 27 Aug 2020 01:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBA76-0003FT-CF for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:16 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:55620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBA74-0005f6-Ou for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:16 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 2so1994258pjx.5 for ; Wed, 26 Aug 2020 22:06:14 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id u3sm724213pjn.29.2020.08.26.22.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 22:06:12 -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=kZmgaDEBNjpxaFbsHI9krVOWSzauPOV79k08lIpZd10=; b=B3wBalM/yDYmUtfyBo1U/JZUa5rZT3EMGdbAd10MfTBZ+zwrKkWkllIQkl9/CO32RH TyOvL32luqe8bwdMqF0Ys8o9o6U3vyefVGx+r3dsR2yDs86fQ2efvqkKj4eTjtX+8nb6 0/zJqemfVaIvAJfGeZsMRCDgdoaX4yIIBsBqMNMFr8O28ASxV6d7TFhbyxM7LqR4dqh4 xO5AYA0/WLMpDbbn4Poy9YbdCvrRmUzMAkH53ypPrRWxV0HJEwxlKLqKrbqQg8Wqua5n hbJJKS7uVyThZ0xfBCUIgZYJsRJFcJxkCgmjj9NN9KEcZImueba+Q1utpgMk+lUUC4Qv HZPw== 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=kZmgaDEBNjpxaFbsHI9krVOWSzauPOV79k08lIpZd10=; b=c4mOc6devKTY7yzlAo5pXig8M3QWKbdTf13hMP28TIhfT4iAvksjskrYhVQXRrLZED lFmOs26uVw88Mu5mDaJm6rT8igsDABNC+6eKFfoayr62G7Zi+KDX3fE9Ik78l6evXG2y wYqyYr/Fupi1/7nDfqn7iPT+mTd1ze8OFNNt2pyJsKkuYzwJ8uA3+RAlixO7UmvdgJkh 4CnRkv8souL6VcuDJGJSexb03CqGH6wmBh9pZ2JI/TE2A772B3rpCyIVCRUAzxvYU/lY n0DFsSZuNU/hQfBXHq6A2gCDs9BECN9qNP5SjyK0Uv8Loo3I9OoB55qTLB8oL+mTriqy qnaw== X-Gm-Message-State: AOAM532b9uS+iVoLhoHOq7gdVMmWpfdUQCvJP5YuoQTbCarFbURpTl33 KUzwSv8Vahyotm0pGVFurPXRJWeBG76wIeMFdjo= X-Google-Smtp-Source: ABdhPJzox6zVI7SZ2VdIibKNtUHjdRTTqySlXPSzOJnAvPE5ZVJyCGjkLQJJ9jVaO65ED9YzGc6N2w== X-Received: by 2002:a17:90a:c505:: with SMTP id k5mr8718507pjt.188.1598504772817; Wed, 26 Aug 2020 22:06:12 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v2 5/6] meson: Fixes ninjatool can not be recognized as script under Window/MSYS2 Date: Thu, 27 Aug 2020 13:05:42 +0800 Message-Id: <20200827050543.44-6-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200827050543.44-1-luoyonggang@gmail.com> References: <20200827050543.44-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=E8=8C=85?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo use ninja instead ${build_path}/ninjatool Signed-off-by: Yonggang Luo --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 3b9e79923d..2ad0c58492 100755 --- a/configure +++ b/configure @@ -8222,7 +8222,7 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs -NINJA=3D"${build_path}/ninjatool" $meson setup \ +NINJA=3D"ninja" $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ --=20 2.27.0.windows.1 From nobody Sat May 18 21:45:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1598504906; cv=none; d=zohomail.com; s=zohoarc; b=YrlnEczwJhmwdlqhkwZ3lQjnDkAeHprzRsNtbgTsfCbNLcrCFnuWBLrYBUGPhs/2qOirZswIfQwaDsiVF3jkJbNQdK750LDx/Kv3LwZ5wryJvqHVTNonJsjh0Xka1KyNxAMOUrXxinq6OyGu8YjB+aCFPzCciJUX/5xgIlk3vrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598504906; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hAIHaNoFAufwAGE6KbRmUZ0ExbibwWjhonjd/BMqxdQ=; b=dDUrqdluJVGiGne05Zi9Mza2/tBFhdGIdBWKvC87z4LIFbOH8Q1fbK58CxS8fh5VZd36GJdZRgrSEadnc+U/Sq0Atz8cIobWr1zhyqSyUyMMEPzMUuPPgApgDDYgt236yL8AjczZEbD2HZ/zKWIZ7MzxPGoqAAZgmw2/rgMezT0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598504906236607.1883525850949; Wed, 26 Aug 2020 22:08:26 -0700 (PDT) Received: from localhost ([::1]:51524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBA9B-0007jE-18 for importer@patchew.org; Thu, 27 Aug 2020 01:08:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBA7A-0003PO-3i for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:20 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]:42848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBA78-0005fX-87 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 01:06:19 -0400 Received: by mail-pg1-x52a.google.com with SMTP id g1so2480578pgm.9 for ; Wed, 26 Aug 2020 22:06:17 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id u3sm724213pjn.29.2020.08.26.22.06.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 22:06:14 -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=hAIHaNoFAufwAGE6KbRmUZ0ExbibwWjhonjd/BMqxdQ=; b=coicLt5tS3ZGmOlZMjwXMwss6hh4duXrLnJ2tTo2GoJi7Vq3D5gTDVgSy0NDlR4dM7 /PzNHbKNbv09uV+zOpvWebJUwy6TfJo4V4x34e3l5o5nEw4vez9KJkZl7wg+Qf8N5trt YBnXcKujei6/MYEMtuTnXn74bNYmTDD8wWaiw4mTg7LP3AraBs8/AJ/06d7rrBeEcadi KdDY23vgHPIgasoKrYUyM2yzBbVnJjtKc4v57cD0WBn2gPBzwNf/KuNeZztHivpNklts RNlZ79Bqp8KvD+AcgXszbgldSV03RJ5bnltAWy0qnpr5lHWG0a80JRuOhkMqLtQIaezR E3gA== 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=hAIHaNoFAufwAGE6KbRmUZ0ExbibwWjhonjd/BMqxdQ=; b=pJHXAeBVTCHvwffbjtOaH7d8+pXv50x3rGM1uIwh40RC6wdmlzTHK/RE5pwLzDQyOi 0jOnJANmWTxLYrX40wHzx3BVeAacLPVT7Z9PUBblurmTFc263RDoPpWvYV1IIzw3fj8r UvuvmkKGabNqrcuSzi2b7qDSU7wWMXg0JmgjeoIJwDyx5TH7U/5P5+Nirw6iZ6NoHULj kcJ1CNpMMf/LVidOZb63sakxHNdpamNHUZZsPXJicMWtEQSzumitm7CaW+t1JsUgjeA5 d9OQNL2wLc2BvFT96d387sVWqceXSCTOmNi71o8Oc8r+PxzJ1gnJBxUtrPHW8DyezPbr Cuvw== X-Gm-Message-State: AOAM531xR1CsZICc+MMHo1vTxoQvFwPCWOITa+xf4Q7MPrAg4f1S+CZJ Oh2vtZULtBbIKCs2nTG+2ZtPM6jCj4Bc2n0HvDk= X-Google-Smtp-Source: ABdhPJymrNUFplPqIAk/ba4Itkf5ht7rujm9SaBdz9A45vrGbChKma+coDAQjzQjx/R/LLVdRol6tA== X-Received: by 2002:a17:902:be0f:: with SMTP id r15mr14964614pls.84.1598504775292; Wed, 26 Aug 2020 22:06:15 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] meson: Convert undefsym.sh to undefsym.py Date: Thu, 27 Aug 2020 13:05:43 +0800 Message-Id: <20200827050543.44-7-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200827050543.44-1-luoyonggang@gmail.com> References: <20200827050543.44-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=E8=8C=85?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo undefsym.sh are not msys2 compatible, convert it to python script Signed-off-by: Yonggang Luo --- meson.build | 2 +- scripts/undefsym.py | 57 +++++++++++++++++++++++++++++++++++++++++++++ scripts/undefsym.sh | 20 ---------------- 3 files changed, 58 insertions(+), 21 deletions(-) create mode 100644 scripts/undefsym.py delete mode 100755 scripts/undefsym.sh diff --git a/meson.build b/meson.build index 1644bbd83c..d6e3bcea7e 100644 --- a/meson.build +++ b/meson.build @@ -845,7 +845,7 @@ foreach d, list : modules endforeach =20 nm =3D find_program('nm') -undefsym =3D find_program('scripts/undefsym.sh') +undefsym =3D find_program('scripts/undefsym.py') block_syms =3D custom_target('block.syms', output: 'block.syms', input: [libqemuutil, block_mods], capture: true, diff --git a/scripts/undefsym.py b/scripts/undefsym.py new file mode 100644 index 0000000000..c690f88c7a --- /dev/null +++ b/scripts/undefsym.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# 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 +# the inclusion of symbol from libqemuutil.a if the shared modules need th= em, +# This is necessary because the modules may use functions not needed by the +# executable itself, which would cause the function to not be linked in. +# Then the DSO loading would fail because of the missing symbol. + + +""" +Compare the static library with the shared module for compute the symbol d= uplication +""" + +import sys +import subprocess + +def filter_lines_set(stdout, is_static =3D True): + linesSet =3D set() + for line in stdout.splitlines(): + tokens =3D line.split(b' ') + if len(tokens) >=3D 1: + if len(tokens) > 1: + if is_static and tokens[1] =3D=3D b'U': + continue + if not is_static and tokens[1] !=3D b'U': + continue + new_line =3D b'-Wl,-u,' + tokens[0] + if not new_line in linesSet: + linesSet.add(new_line) + return linesSet + +def main(args): + if len(args) <=3D 3: + sys.exit(0) + + nm =3D args[1] + staticlib =3D args[2] + pc =3D subprocess.run([nm, "-P", "-g", staticlib], stdout=3Dsubprocess= .PIPE) + if pc.returncode !=3D 0: + sys.exit(-1) + lines_set_left =3D filter_lines_set(pc.stdout) + + shared_modules =3D args[3:] + pc =3D subprocess.run([nm, "-P", "-g"] + shared_modules, stdout=3Dsubp= rocess.PIPE) + if pc.returncode !=3D 0: + sys.exit(-1) + lines_set_right =3D filter_lines_set(pc.stdout, False) + lines =3D [] + for line in sorted(list(lines_set_right)): + if line in lines_set_left: + lines.append(line) + sys.stdout.write(b'\n'.join(lines).decode()) + +if __name__ =3D=3D "__main__": + main(sys.argv) diff --git a/scripts/undefsym.sh b/scripts/undefsym.sh deleted file mode 100755 index b9ec332e95..0000000000 --- a/scripts/undefsym.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /usr/bin/env bash - -# 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 -# the inclusion of symbol from libqemuutil.a if the shared modules need th= em, -# This is necessary because the modules may use functions not needed by the -# executable itself, which would cause the function to not be linked in. -# Then the DSO loading would fail because of the missing symbol. - -if test $# -le 2; then - exit 0 -fi - -NM=3D$1 -staticlib=3D$2 -shift 2 -# Find symbols defined in static libraries and undefined in shared modules -comm -12 \ - <( $NM -P -g $staticlib | awk '$2!=3D"U"{print "-Wl,-u," $1}' | sort -u)= \ - <( $NM -P -g "$@" | awk '$2=3D=3D"U"{print "-Wl,-u," $1}' | sort -u) --=20 2.27.0.windows.1