From nobody Fri Sep 20 22:14:58 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597944773; cv=none; d=zohomail.com; s=zohoarc; b=DSBmy59IKqT/Ixg4qElknMRnmASFLUqmZZIcqvUB1rUNUDdHWi0WTkxG6DmUsDVBQZ7w7R425oUDnAJtfzmepklkqgqETUHlFG/cIw+YWSyR6l04B82oIRAaQHe8kHSmlS7DgC3iXDI35Tg6Sg6PGmTOOuGMX+yoCaepTffkPEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597944773; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=hwdCj++4maqtO3vCDtbGw5gqBj0kLsbaTVG11rYWovk=; b=OVfbe3CFjIvT7GurVDwJmLJqmxRyUNo7WNr32aWC0m0KGnx36J418+7zS6Rc1ldfWljaQuyvXvXFcluRM4Y09jZVlt7yavVbCe0HAVSXUod3oH2ANm7xhzSaClTTbhC0a7Yxne3XXPUgUEbKG2AfsKtzWv1eg7BlFfPXxw/8eBA= 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 1597944773983102.63351134054733; Thu, 20 Aug 2020 10:32:53 -0700 (PDT) Received: from localhost ([::1]:56094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8oQm-0006v2-CZ for importer@patchew.org; Thu, 20 Aug 2020 13:32:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8oQ3-0006MC-B4 for qemu-devel@nongnu.org; Thu, 20 Aug 2020 13:32:07 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:30555 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 1k8oQ0-00026o-Vd for qemu-devel@nongnu.org; Thu, 20 Aug 2020 13:32:07 -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-108-qZxhCBMiPm2MIUZ-PlTWVA-1; Thu, 20 Aug 2020 13:32:01 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DF333186A574; Thu, 20 Aug 2020 17:32:00 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77F217B8F4; Thu, 20 Aug 2020 17:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597944723; 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; bh=hwdCj++4maqtO3vCDtbGw5gqBj0kLsbaTVG11rYWovk=; b=AB8gf5zyV1Uam+H9tdo80IfWmVuUVolvhjgrPT05bgYkfeSdGc54MGZ1BABM+elg4KIbER whi6OMlVe9pQo1KABQknyBTYWjnBNp0JX1W5jN4Nu88FeOuWr/hy2Ihv7j3nsEwGutGdJp ZgZxHvMqi23w+QrT+mf7H0LR4rlp4oc= X-MC-Unique: qZxhCBMiPm2MIUZ-PlTWVA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2] configure: add support for pseudo-"in source tree" builds Date: Thu, 20 Aug 2020 18:31:25 +0100 Message-Id: <20200820173124.243984-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@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=berrange@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/20 03:03:34 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: Kevin Wolf , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- This is a simple integration of Eric's proposal from https://lists.gnu.org/archive/html/qemu-devel/2020-03/msg07290.html with a bit of configure magic. It is enough to enable ./configure make make check I've not tested it beyond that. Note it blows away the "build/" dir each time ./configure is run so it is pristine each time. We could optionally symlink binaries from build/ into $PWD if people think that is important, eg by changing GNUmakefile to have: recurse: all for bin in `find build -maxdepth 1 -type f -executable | grep -v -E= '(ninjatool|config.status)'`; \ do \ ln -f -s $$bin . ; \ done and some cleanup logic to purge the symlinks for "make clean" This goes on top of Paolo's most recent meson port v175 posting, or whatever number it is upto now :-) In v2: - Use a marker file so we don't blow away a build/ dir we didn't create - Silence the distclean rule - Fix broken use of error_exit that's not defined yet - Add comment to GNUmakefile .gitignore | 2 ++ configure | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 92311284ef..4ccb9ed975 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/GNUmakefile +/build/ /.doctrees /config-devices.* /config-all-devices.* diff --git a/configure b/configure index cc5f58f31a..cdffe221c7 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