From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.4 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7E4AC433E4 for ; Thu, 20 Aug 2020 17:19:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD647208E4 for ; Thu, 20 Aug 2020 17:19:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="A4T44HOG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD647208E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8oE1-0002ty-0q for qemu-devel@archiver.kernel.org; Thu, 20 Aug 2020 13:19:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8oDS-0002TW-TN for qemu-devel@nongnu.org; Thu, 20 Aug 2020 13:19:06 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:58047 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 1k8oDR-0000UG-0V for qemu-devel@nongnu.org; Thu, 20 Aug 2020 13:19:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597943943; 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:autocrypt:autocrypt; bh=5gs43e/IcZm/QLZ3fwbQN1kKsbrQHa5RRksOhRMr/8U=; b=A4T44HOGaksUY97bx1n56gEzRksosLzmRSg6BLmwP/VoRx6gvqgED9xOSxnOQssdqbLyai IXEv4fr1P5AQdRchjbaQkHSn/y9r1zVCT/iIAuBMs1Oq17JBKMfOChbB0x+a8V/dBCSZwV jJeLRtjF126SLh55d6+CvI0nHbMtO3E= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-71-do9w_eGNPDmvcguHOoDC2A-1; Thu, 20 Aug 2020 13:18:58 -0400 X-MC-Unique: do9w_eGNPDmvcguHOoDC2A-1 Received: by mail-wr1-f71.google.com with SMTP id r14so876616wrq.3 for ; Thu, 20 Aug 2020 10:18:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=5gs43e/IcZm/QLZ3fwbQN1kKsbrQHa5RRksOhRMr/8U=; b=j87OgylWK8vQaCjMJspwz8fAo+oohnIUJFvTYEY1/+vJr5cjTUJdJTzI/Kd/+boP8S MEHpBwzK4mdV+utPtD1iOfXqEMarenF/Yi+EIihwRPXpjdveHW9gAtiANEpsnQVsL0bA G/Aa1orfTdV3iEFo/lRw8ROrjZT1Jf9hdemlQMpsyKox7uUxlWlHb7W9YIvFElDfmcK5 7Wgb5r9GonN5AlW9yD8og2o7mh73ImQeC3XPfBB0kEeCV+wao3WkiyBTdO/xPJIQrvCV nuy6YyTlLY+dNUDJxZMRLhFelQGBUJ4/PSjMjvMJq7Q3yOB1iauL4MJMfKMtVRX7iRNE o83g== X-Gm-Message-State: AOAM532jJ/59ibYP9Dng2dKLufYFlxhNYtA8KhrPy22YKgtZNNihLa5i 6QDtAXIYRYXEftHbMeT6+7CXIW8zaD4YZlg9FiBpUmAZtKMTv79pFe0RwJtZF7AuP+0CMZGv16r Mi/pyc7Gs3PwsWfY= X-Received: by 2002:a5d:514e:: with SMTP id u14mr4081560wrt.20.1597943936428; Thu, 20 Aug 2020 10:18:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtWKzbfBYki35kPCVJOKyD0fY9rQBG6PhFLV6JeErvGUKGUap1gGeDkXOPf5z9rM9vUXPUlQ== X-Received: by 2002:a5d:514e:: with SMTP id u14mr4081541wrt.20.1597943936157; Thu, 20 Aug 2020 10:18:56 -0700 (PDT) Received: from [192.168.1.36] (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id u6sm5129671wmc.12.2020.08.20.10.18.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Aug 2020 10:18:55 -0700 (PDT) Subject: Re: [PATCH] configure: add support for psuedo-"in source tree" builds To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org References: <20200820165543.215372-1-berrange@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Autocrypt: addr=philmd@redhat.com; keydata= mQINBDXML8YBEADXCtUkDBKQvNsQA7sDpw6YLE/1tKHwm24A1au9Hfy/OFmkpzo+MD+dYc+7 bvnqWAeGweq2SDq8zbzFZ1gJBd6+e5v1a/UrTxvwBk51yEkadrpRbi+r2bDpTJwXc/uEtYAB GvsTZMtiQVA4kRID1KCdgLa3zztPLCj5H1VZhqZsiGvXa/nMIlhvacRXdbgllPPJ72cLUkXf z1Zu4AkEKpccZaJspmLWGSzGu6UTZ7UfVeR2Hcc2KI9oZB1qthmZ1+PZyGZ/Dy+z+zklC0xl XIpQPmnfy9+/1hj1LzJ+pe3HzEodtlVA+rdttSvA6nmHKIt8Ul6b/h1DFTmUT1lN1WbAGxmg CH1O26cz5nTrzdjoqC/b8PpZiT0kO5MKKgiu5S4PRIxW2+RA4H9nq7nztNZ1Y39bDpzwE5Sp bDHzd5owmLxMLZAINtCtQuRbSOcMjZlg4zohA9TQP9krGIk+qTR+H4CV22sWldSkVtsoTaA2 qNeSJhfHQY0TyQvFbqRsSNIe2gTDzzEQ8itsmdHHE/yzhcCVvlUzXhAT6pIN0OT+cdsTTfif MIcDboys92auTuJ7U+4jWF1+WUaJ8gDL69ThAsu7mGDBbm80P3vvUZ4fQM14NkxOnuGRrJxO qjWNJ2ZUxgyHAh5TCxMLKWZoL5hpnvx3dF3Ti9HW2dsUUWICSQARAQABtDJQaGlsaXBwZSBN YXRoaWV1LURhdWTDqSAoUGhpbCkgPHBoaWxtZEByZWRoYXQuY29tPokCVQQTAQgAPwIbDwYL CQgHAwIGFQgCCQoLBBYCAwECHgECF4AWIQSJweePYB7obIZ0lcuio/1u3q3A3gUCXsfWwAUJ KtymWgAKCRCio/1u3q3A3ircD/9Vjh3aFNJ3uF3hddeoFg1H038wZr/xi8/rX27M1Vj2j9VH 0B8Olp4KUQw/hyO6kUxqkoojmzRpmzvlpZ0cUiZJo2bQIWnvScyHxFCv33kHe+YEIqoJlaQc JfKYlbCoubz+02E2A6bFD9+BvCY0LBbEj5POwyKGiDMjHKCGuzSuDRbCn0Mz4kCa7nFMF5Jv piC+JemRdiBd6102ThqgIsyGEBXuf1sy0QIVyXgaqr9O2b/0VoXpQId7yY7OJuYYxs7kQoXI 6WzSMpmuXGkmfxOgbc/L6YbzB0JOriX0iRClxu4dEUg8Bs2pNnr6huY2Ft+qb41RzCJvvMyu gS32LfN0bTZ6Qm2A8ayMtUQgnwZDSO23OKgQWZVglGliY3ezHZ6lVwC24Vjkmq/2yBSLakZE 6DZUjZzCW1nvtRK05ebyK6tofRsx8xB8pL/kcBb9nCuh70aLR+5cmE41X4O+MVJbwfP5s/RW 9BFSL3qgXuXso/3XuWTQjJJGgKhB6xXjMmb1J4q/h5IuVV4juv1Fem9sfmyrh+Wi5V1IzKI7 RPJ3KVb937eBgSENk53P0gUorwzUcO+ASEo3Z1cBKkJSPigDbeEjVfXQMzNt0oDRzpQqH2vp apo2jHnidWt8BsckuWZpxcZ9+/9obQ55DyVQHGiTN39hkETy3Emdnz1JVHTU0Q== Message-ID: Date: Thu, 20 Aug 2020 19:18:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200820165543.215372-1-berrange@redhat.com> Content-Language: en-US Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 20:12:44 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 , Paolo Bonzini , Stefan Hajnoczi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Typo "pseudo" in subject. On 8/20/20 6:55 PM, Daniel P. Berrangé wrote: > 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é > --- > > 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 Lovely :) > > 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 poeople think that is important, eg by changing GNUmakefile Typo "people". > 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 :-) > > .gitignore | 2 ++ > configure | 40 ++++++++++++++++++++++++++++++++-------- > 2 files changed, 34 insertions(+), 8 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..a5c88ad1ac 100755 > --- a/configure > +++ b/configure > @@ -11,6 +11,38 @@ unset CLICOLOR_FORCE GREP_OPTIONS > # Don't allow CCACHE, if present, to use cached results of compile tests! > export CCACHE_RECACHE=yes > > +source_path=$(cd "$(dirname -- "$0")"; pwd) > + > +if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; > +then > + error_exit "main directory cannot contain spaces nor colons" > +fi > + > +if test "$PWD" == "$source_path" > +then > + echo "Using './build' as the directory for build output" > + rm -rf build > + mkdir -p build > + cat > GNUmakefile < + > +ifeq (\$(MAKECMDGOALS),) > +recurse: all > +endif > + > +.NOTPARALLEL: % > +%: force > + @echo 'changing dir to build for \$(MAKE) "\$(MAKECMDGOALS)"...' > + @\$(MAKE) -C build -f Makefile \$(MAKECMDGOALS) > + if test "\$(MAKECMDGOALS)" = "distclean" ; then rm -rf build ; fi Can we use '@' to silent the last line too? make[1]: Leaving directory '/tmp/qemu/build' if test "help" = "distclean" ; then rm -rf build ; fi Similarly to Peter, I also use the ./build/{conf1,conf2,...} each subdir ./configured differently, so I wouldn't like to blow my subdirs. Otherwise: Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé > +force: ; > +.PHONY: force > +GNUmakefile: ; > + > +EOF > + cd build > + exec $source_path/configure "$@" > +fi > + > # Temporary directory used for files created while > # configure runs. Since it is in the build directory > # we can safely blow away any previous version of it > @@ -297,14 +329,6 @@ ld_has() { > $ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 > } > > -# make source path absolute > -source_path=$(cd "$(dirname -- "$0")"; pwd) > - > -if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; > -then > - error_exit "main directory cannot contain spaces nor colons" > -fi > - > # default parameters > cpu="" > iasl="iasl" >