From nobody Sat May 18 23:14:41 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=1598441562; cv=none; d=zohomail.com; s=zohoarc; b=OCN+Hj2jiCB7qL0b3vzYhiOabmSFEYE8K5X5TqWj8KomcLnX0c8pPJ0mgJ+Bxahvfqk6cXQBijbnwlX5iqk2LH2/speMlh5VfdRqDLgo9O8MroSLp4TFV4SBKFyehEx7QodEm5gFztZqHjVKZARAIBYmoIpbfzpVYyrMmFNCtv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598441562; 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=kJ074sYRuXsQ5Ok7eU6ZMiwJKfpjYEektLQOyZNezc013ilInWa3OZ38ghAOnJ2/QNDWiQ3cz9LDlzPNplnd/mIL2Xr+HvoLIL8AOzyK6NZ4pPpKMg55v2AK3nTuMxWCNwVSlpeEA7Cn6UpsQTyZgefFjtG82qRxl0h3kKcNe2Q= 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 1598441562238894.3267234977145; Wed, 26 Aug 2020 04:32:42 -0700 (PDT) Received: from localhost ([::1]:49282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAtfU-0000cf-KW for importer@patchew.org; Wed, 26 Aug 2020 07:32:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAte4-0007Ul-MB for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:31:12 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:39320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kAte2-0006WN-LZ for qemu-devel@nongnu.org; Wed, 26 Aug 2020 07:31:12 -0400 Received: by mail-pl1-x641.google.com with SMTP id p15so751178pli.6 for ; Wed, 26 Aug 2020 04:31:10 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id v8sm2310878pju.1.2020.08.26.04.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:31:07 -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=OKNVOLFWkDR5n4LaUX4W+p0VZDvBap2faOy9r9+0mMyEKOLYqB9lR0xlvS4DgPsLyb gpJEorjUu0zfhjnEwNY7rnIngwIA+MdQj+2zBphtQwKyGc/tD7Wln2UxGjzUEtM4IkRb zHpDzDMyHJuGhrxI9ohzexAc3EsuPR2qk41NzgRaKpBjt1/z7XRNY8U2sQF0ORhUq94O 4tbNrtW5YPdKq6NnyYa8nGrFy0ARKjIUhKqCADI8lLUvUZCtti77aCdaLpUeo4XkGsNq NQTarGxfc+wTptlMIQ5FgIAjF8ivL+zRlzNC25NybsXCT9GimEaa7TYOJt0wKCKUMGSH 21sw== 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=mmxAcyHN7VWuAotAUJKNzxfEIgASVEAlJQPDmJnfti95cX2DGP8JoD3Ieowk7GxiIf wA0l5a254N6nx/a5ZI6nep9BlFgOk1UB1arLdSJu2szC7guwIUC+6R2NlKxyfuvt3FG7 52ldZNkPCT50lK42u/09cQ8AkxvkPY5DmxplIoUOlGPzO0wY1GkSbWpSCiP9R56uOkHx bV/TV1jP5DggJsZqu2ZwCe5A2kFkXIFzv6c5Mpv94BHEHPS6tw4lb6fCLit1bNDJPcdH TypKdktbl+MaBr8fZDKckKxcsbJTQio/QTi+72E5LV6IzvQEtbVRcwCOlZmAO31vYWaZ /gjw== X-Gm-Message-State: AOAM533L7lQQ7pBiAIggqy0grZ2sGalz8IYPmqSZkOw4YCX16n0aV+jL zJR53Ny/cfux6e9/11OZ6QvhdzF0z2NC13Po X-Google-Smtp-Source: ABdhPJzDQQSZnlj5kw0bmL0g2BMpQtHBbV62dcuxuWqKkZVOOwA+yMbJCcK3CpM98tRbekGdBxT3Tg== X-Received: by 2002:a17:90b:4acd:: with SMTP id mh13mr5867807pjb.147.1598441468800; Wed, 26 Aug 2020 04:31:08 -0700 (PDT) From: luoyonggang@gmail.com To: qemu-devel@nongnu.org Subject: [[PATCH v3] 4/5] configure: Fix include and linkage issue on msys2 Date: Wed, 26 Aug 2020 19:30:34 +0800 Message-Id: <20200826113035.1564-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20200826113035.1564-1-luoyonggang@gmail.com> References: <20200826113035.1564-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::641; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x641.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=C3=A9?= 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