From nobody Tue Feb 10 13:18:12 2026 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598006177; cv=none; d=zohomail.com; s=zohoarc; b=m6aO2GhLw0Of6BkR6JPdFA3kVOUAKry1rHAv0GGLgMqeX+R5SoJsWU4vhWOZIBn1pCGeVYDtjydiV3GhNjJK2O/qlXDXqUfER1Ksk4W5TGdmylvfM8q8otE3zmcLeSaOe5DxNgh5++swK6zBh0bDM+9v2nuDmPk1p2EG0zd5mLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598006177; h=Content-Type: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=pyogagIogekxmBEBJdMiIgfbzL4q1hqCl4ySl4yEPBY=; b=jCOP6b1cnKwiukSTAV4UsiJwzQTb6YWZnA7AXtB7QcsjxBLRaJXu4TyJgO7oVWlH1Tl+4Zw/wcksLhJeNfvZgS4vy076GBi+62A6mYVholctwYCWqEranDA+iUSVcgJ0nuRp42wSHxLV4E2XntAvRxKPnThvozDBHwyyBaNIkTY= 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 1598006177892333.4726217339726; Fri, 21 Aug 2020 03:36:17 -0700 (PDT) Received: from localhost ([::1]:60158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k94PA-0007gp-Kr for importer@patchew.org; Fri, 21 Aug 2020 06:36:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k94D7-0000e1-PE for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:23:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37738 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k94D5-0001Ri-2h for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:23:49 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-372-_mQYiIYgOLChbPuFpXm2Pw-1; Fri, 21 Aug 2020 06:23:44 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E2C3B873081 for ; Fri, 21 Aug 2020 10:23:43 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id A02465DA78; Fri, 21 Aug 2020 10:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598005426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pyogagIogekxmBEBJdMiIgfbzL4q1hqCl4ySl4yEPBY=; b=EZyhjK8mWVw0fMcnoQGDMGGL4ALhf1k6MDT6BoJMyNgieBbRHdNZVvPDtv/HGVibw3PzaT 2IeISB3JaF3ONEjPIIYBleZtc1vKbJl8xPRw8hM9kDu/RP/0Qrocb0Vn3RAGMyQFoiwpes AgXRIDq+WgQlvZ4R9s/5EJc2Pn0Hqfs= X-MC-Unique: _mQYiIYgOLChbPuFpXm2Pw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v8 012/152] configure: do not include $(...) variables in config-host.mak Date: Fri, 21 Aug 2020 06:21:09 -0400 Message-Id: <20200821102329.29777-13-pbonzini@redhat.com> In-Reply-To: <20200821102329.29777-1-pbonzini@redhat.com> References: <20200821102329.29777-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/20 23:41:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) This ensures that Meson will be able to reuse the results of the tests that are performed in the configure script. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 625c14c500..606c327cca 100755 --- a/configure +++ b/configure @@ -610,8 +610,8 @@ QEMU_CFLAGS=3D"-fno-strict-aliasing -fno-common -fwrapv= -std=3Dgnu99 $QEMU_CFLAGS" QEMU_CFLAGS=3D"-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CF= LAGS" QEMU_CFLAGS=3D"-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS" QEMU_CFLAGS=3D"-D_GNU_SOURCE -D_FILE_OFFSET_BITS=3D64 -D_LARGEFILE_SOURCE = $QEMU_CFLAGS" -QEMU_INCLUDES=3D"-iquote . -iquote \$(SRC_PATH) -iquote \$(SRC_PATH)/accel= /tcg -iquote \$(SRC_PATH)/include" -QEMU_INCLUDES=3D"$QEMU_INCLUDES -iquote \$(SRC_PATH)/disas/libvixl" +QEMU_INCLUDES=3D"-iquote . -iquote ${source_path} -iquote ${source_path}/a= ccel/tcg -iquote ${source_path}/include" +QEMU_INCLUDES=3D"$QEMU_INCLUDES -iquote ${source_path}/disas/libvixl" if test "$debug_info" =3D "yes"; then CFLAGS=3D"-g $CFLAGS" fi @@ -911,7 +911,7 @@ Linux) linux=3D"yes" linux_user=3D"yes" kvm=3D"yes" - QEMU_INCLUDES=3D"-isystem \$(SRC_PATH)/linux-headers -isystem $PWD/linux= -headers $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -I$PWD/linux-head= ers $QEMU_INCLUDES" supported_os=3D"yes" libudev=3D"yes" ;; @@ -4397,8 +4397,8 @@ EOF if [ "$pwd_is_source_path" !=3D "y" ] ; then symlink "$source_path/dtc/Makefile" "dtc/Makefile" fi - fdt_cflags=3D"-I\$(SRC_PATH)/dtc/libfdt" - fdt_ldflags=3D"-L\$(BUILD_DIR)/dtc/libfdt" + fdt_cflags=3D"-I${source_path}/dtc/libfdt" + fdt_ldflags=3D"-L$PWD/dtc/libfdt" fdt_libs=3D"$fdt_libs" elif test "$fdt" =3D "yes" ; then # Not a git build & no libfdt found, prompt for system install @@ -5385,13 +5385,13 @@ case "$capstone" in git_submodules=3D"${git_submodules} capstone" fi mkdir -p capstone - QEMU_CFLAGS=3D"$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include" + QEMU_CFLAGS=3D"$QEMU_CFLAGS -I${source_path}/capstone/include" if test "$mingw32" =3D "yes"; then LIBCAPSTONE=3Dcapstone.lib else LIBCAPSTONE=3Dlibcapstone.a fi - libs_cpu=3D"-L\$(BUILD_DIR)/capstone -lcapstone $libs_cpu" + libs_cpu=3D"-L$PWD/capstone -lcapstone $libs_cpu" ;; =20 system) @@ -6414,8 +6414,8 @@ case "$slirp" in git_submodules=3D"${git_submodules} slirp" fi mkdir -p slirp - slirp_cflags=3D"-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" - slirp_libs=3D"-L\$(BUILD_DIR)/slirp -lslirp" + slirp_cflags=3D"-I${source_path}/slirp/src -I$PWD/slirp/src" + slirp_libs=3D"-L$PWD/slirp -lslirp" if test "$mingw32" =3D "yes" ; then slirp_libs=3D"$slirp_libs -lws2_32 -liphlpapi" fi @@ -7909,19 +7909,19 @@ if test "$secret_keyring" =3D "yes" ; then fi =20 if test "$tcg_interpreter" =3D "yes"; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/tci $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/tci $QEMU_INCLUDES" elif test "$ARCH" =3D "sparc64" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/sparc $QEMU_INCLUDES" elif test "$ARCH" =3D "s390x" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/s390 $QEMU_INCLUDES" elif test "$ARCH" =3D "x86_64" || test "$ARCH" =3D "x32" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/i386 $QEMU_INCLUDES" elif test "$ARCH" =3D "ppc64" ; then - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/ppc $QEMU_INCLUDES" elif test "$ARCH" =3D "riscv32" || test "$ARCH" =3D "riscv64" ; then - QEMU_INCLUDES=3D"-I\$(SRC_PATH)/tcg/riscv $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-I${source_path}/tcg/riscv $QEMU_INCLUDES" else - QEMU_INCLUDES=3D"-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" + QEMU_INCLUDES=3D"-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES" fi =20 echo "HELPERS=3D$helpers" >> $config_host_mak --=20 2.26.2