From nobody Tue Feb 10 02:00:39 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=1598005533; cv=none; d=zohomail.com; s=zohoarc; b=bpsw8htg+DbPg+Cq1qyTR4zh+d+oeO86SsyB3tkAToFxC1akqJEEG5eE5HKTjusy+umG01/LKfK5YMHJRlTZbu0FosLyMkhjwLYZxAWEgQj9yEz3cPFgfv600SZoU4jytiZutfOmXb0zzMjadOcBDqG/BYvEMC6W7MWGhMlxGNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598005533; 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=scXZbLfGf2wuLlYsTEFEHQHZT8J5ASPx+w+nFJSVsro=; b=heT6erK/DF18FVT6+hLixsBDfgYvmcsFnD2AUEOOKwVRNtGsXdpTZbrep7oH6u9DfbMXLjgOZeFUox1DJKZrY0Qc9hUvQ4+/3MQWIpd2NY96Z9+NmpHFww08ySVttoQlOBuYlymiAPXibyJD/u5sgjAPgAl3plB0jfkRjm2iMYg= 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 159800553347419.35698510107204; Fri, 21 Aug 2020 03:25:33 -0700 (PDT) Received: from localhost ([::1]:36108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k94El-0002s3-UR for importer@patchew.org; Fri, 21 Aug 2020 06:25:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k94DC-0000og-5G for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:23:54 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28419 helo=us-smtp-delivery-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 1k94D9-0001Sa-FV for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:23:53 -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-182--3cG4pP0P5-fKu97H3DxsA-1; Fri, 21 Aug 2020 06:23:49 -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 2EFBA10082E7 for ; Fri, 21 Aug 2020 10:23:48 +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 DF1925DA74; Fri, 21 Aug 2020 10:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598005430; 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=scXZbLfGf2wuLlYsTEFEHQHZT8J5ASPx+w+nFJSVsro=; b=fIrU5Eb5Y7BTOcRrJ6e5VVUUdiy75OCM2r8MlR7WNrT5CeZ3x/cjGmWDxGJjK08Dubs00b TmV3v/oLLBAkHxzukGlPct6BQBl+r9UzbJ4c5QQ9S/zsnS2Qo6cYlD3gxQBbCZMZxIu39q xWIoaG42mWdaSvV8FguX0bWEukKVj6E= X-MC-Unique: -3cG4pP0P5-fKu97H3DxsA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v8 016/152] configure: add support for pseudo-"in source tree" builds Date: Fri, 21 Aug 2020 06:21:13 -0400 Message-Id: <20200821102329.29777-17-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.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/21 01:00:15 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?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Daniel P. Berrang=C3=A9 Meson requires the build dir to be separate from the source tree. Many people are used to just running "./configure && make" though and the meson conversion breaks that. This introduces some backcompat support to make it appear as if an "in source tree" build is being done, but with the the results in the "build/" directory. This allows "./configure && make" to work as it did historically, albeit with the output binaries staying under build/. Signed-off-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- .gitignore | 2 ++ configure | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f8b3cd6fd5..d1e5e06242 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/GNUmakefile +/build/ /.doctrees /config-devices.* /config-all-devices.* diff --git a/configure b/configure index 35d6492343..cc04a560a0 100755 --- a/configure +++ b/configure @@ -11,6 +11,51 @@ unset CLICOLOR_FORCE GREP_OPTIONS # Don't allow CCACHE, if present, to use cached results of compile tests! export CCACHE_RECACHE=3Dyes =20 +# make source path absolute +source_path=3D$(cd "$(dirname -- "$0")"; pwd) + +if test "$PWD" =3D=3D "$source_path" +then + echo "Using './build' as the directory for build output" + + MARKER=3Dbuild/auto-created-by-configure + + if test -e build + then + if test -f $MARKER + then + rm -rf build + else + echo "ERROR: ./build dir already exists and was not previously create= d by configure" + exit 1 + fi + fi + + mkdir build + touch $MARKER + + cat > GNUmakefile </dev/null | grep ".$1" >/dev/null 2>&1 } =20 -# make source path absolute -source_path=3D$(cd "$(dirname -- "$0")"; pwd) - if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; then error_exit "main directory cannot contain spaces nor colons" --=20 2.26.2