From nobody Tue Oct 28 12:00:05 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599066400; cv=none; d=zohomail.com; s=zohoarc; b=A+RX+x6p2TFRabw4WzjRrdUgYBoRNtPT4yFiTUHiR3xyvjNgMDAisxquwDTxOLCCa5V5fvf7EJjFF19soY3Hl3qH7z3EekMPLm1wRNLaUpT8lHu1QA1ZznRiB6KI84rCxA70pCDrm4rG95uT5s7cmOY283bRCXE7nyYbVAqlcgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599066400; 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=iVIr1leFc3liAehHnInLxU7v1tQQv57KF6dosXo9DWU=; b=DN85TA45kSd6M8C1IPd+kvJs4bz0QDaaBZ8RPMBzADxCWGKrvndeBeu3cr3hoX3xKOroqSRxGYS4IJIytNVDSTiTw7mVu6pRrDVixhO9WUnPQGd8jZ5GNKd2hNhg/+yY5qeW+wdYtP9zMVANAQw7d8jo3qS0Tg/R2416t/BfEAk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1599066400410872.0270814982506; Wed, 2 Sep 2020 10:06:40 -0700 (PDT) Received: from localhost ([::1]:47658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDWDX-0001T5-L4 for importer@patchew.org; Wed, 02 Sep 2020 13:06:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDW8X-0000Th-3W for qemu-devel@nongnu.org; Wed, 02 Sep 2020 13:01:29 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:45402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDW8U-0000Ip-Vj for qemu-devel@nongnu.org; Wed, 02 Sep 2020 13:01:28 -0400 Received: by mail-pg1-x541.google.com with SMTP id 67so2830529pgd.12 for ; Wed, 02 Sep 2020 10:01:26 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id x4sm40527pfm.86.2020.09.02.10.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 10:01:24 -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=iVIr1leFc3liAehHnInLxU7v1tQQv57KF6dosXo9DWU=; b=e0wloF29eJMTj3wTueKCAESHD4nyDOm/YMY6FtpSl1xIwHFNTzqJ0X/hZysx9OKSEz 19YkfMWoJMO2Hesn4Jp+mYpZxYO09nqM+FoOjh5hFWWBIujZwx0JvkseQceEBOoHZepk AWPOFGqgVHnY9g8NHm9R+IXUpcvk5jhB5DDzeboQHYH0MDWdCP8XGEnzsE0PSROMj7e+ 0pU4uoGtGBHMaDOHTFOhFg/xGUWYvE2odwLKCAaRgaJCyS2+MHUZ+AWnmNkA4L01LeJC 7Ktk4pBbmIb9l3d/ICkUP3PE4aOWGqVio71QuuMPpGc8oir7It2voWsek1W1VfVYvWc4 +xNA== 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=iVIr1leFc3liAehHnInLxU7v1tQQv57KF6dosXo9DWU=; b=UwnqWeYFafoWR+h3J/um32q/rxGmBF1XU6121P6GwExQOIX066DStbDJFiLzTC+n2/ 3B2vybYybXxwEmOXxEbgWWJ8LcGxPIwQVVlzuT+7QbiK+bFoII8gse0xSSQxLo1VfT8K JBQVzPEazxApm4Lrcgeyqb5Q76WqtNfTZfMkyB7gb8ictDeKC69fZrY7xo2bmSgVD3DB Pqk/rwQu4YhVEw2mVYp6Q8Ae0j5tJSg/uOBAYMV9OSTe8UgLZg76WTRWddBESFVS2gR4 oSb0HD++a05+R2eg0/qmVw/iujA1wrlGpk6EWstA7ccB6anvS03gcVqpQy6HnBd24nI+ wweg== X-Gm-Message-State: AOAM533JR3sEPtdXN96f6uOQlWuZlgBJgIRFo2aHSO056FVpW6BjGwTW cZLag2esZZpBmZB9Y+7xEyWUJiQ0ft8= X-Google-Smtp-Source: ABdhPJwN5f03lmx6uJjRtRqfTuaSqQI02+hKhCoz1pUPpnIXzm6IQG20poKABb3CfPZk49GDOAuSMw== X-Received: by 2002:a63:fa45:: with SMTP id g5mr2546012pgk.448.1599066085048; Wed, 02 Sep 2020 10:01:25 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH 6/6] configure: Fix include and linkage issue on msys2 Date: Thu, 3 Sep 2020 01:00:54 +0800 Message-Id: <20200902170054.810-7-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200902170054.810-1-luoyonggang@gmail.com> References: <20200902170054.810-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::541; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x541.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" 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 30f8c4db29..5f2bcc4b57 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 @@ -943,7 +953,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 @@ -4259,7 +4269,7 @@ EOF fdt=3Dgit mkdir -p dtc 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 @@ -5244,7 +5254,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 @@ -6244,8 +6254,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 @@ -8190,7 +8200,7 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs -NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ +NINJA=3D${ninja:-${build_path}/ninjatool} $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ @@ -8212,7 +8222,7 @@ NINJA=3D${ninja:-$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 -Du2f=3D$u2f\ $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