configure: add support for psuedo-"in source tree" builds
PATCH 1/1 configure: add support for psuedo-"in source tree" builds
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/.
---
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 poeople 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 :-)
.gitignore | 2 ++ configure | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-)
.gitignore +2 -0
@@ -1,3 +1,5 @@ +/GNUmakefile +/build/ /.doctrees /config-devices.* /config-all-devices.*
configure +32 -8
@@ -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 <<EOF + +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 +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"
Signature · 1 line
2.26.2
Quoted 9 lines · Daniel P. Berrangé
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/.
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 25
Quoted 5 lines
configure +5
-0+if test "$PWD" == "$source_path" +then + echo "Using './build' as the directory for build output" + rm -rf build + mkdir -p build
Can we put in a mollyguard here so we only blow away build/ if we previously auto-created it? Something like
if ! -e build || -e build/created-by-configure; then
rm -rf build
mkdir -p build
touch build/created-by-configure
else
echo "some helpful error message here"
fi
(shell syntax probably wrong but you get the idea)
My current setup has multiple build-directories like build/x86, build/clang, ... and I'd like a guard against configure blowing them all away if I accidentally run it from the source tree some day.
thanks
-- PMM
Quoted 27 lines · Peter Maydell
Quoted 9 lines · Daniel P. Berrangé
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/.
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 25
Quoted 5 lines
configure +5
-0+if test "$PWD" == "$source_path" +then + echo "Using './build' as the directory for build output" + rm -rf build + mkdir -p buildCan we put in a mollyguard here so we only blow away build/ if we previously auto-created it? Something like
if ! -e build || -e build/created-by-configure; then
rm -rf build
mkdir -p build
touch build/created-by-configure
else
echo "some helpful error message here"
fi
Quoted 6 lines
(shell syntax probably wrong but you get the idea)
My current setup has multiple build-directories like build/x86, build/clang, ... and I'd like a guard against configure blowing them all away if I accidentally run it from the source tree some day.
Sure, that makes sense.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 67 lines · Daniel P. Berrangé
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é <[email protected]>---
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 checkI'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 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 . ; \ doneand 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(-).gitignore +2
-0@@ -1,3 +1,5 @@ +/GNUmakefile +/build/ /.doctrees /config-devices.* /config-all-devices.*configure +4
-0@@ -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
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 27
Quoted 10 lines
configure +10
-0+ 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 <<EOF +
Since this created file ends up in the source directory it would be useful to have it start with a brief comment saying
(a) that it's autogenerated by configure (b) what it's for.
thanks
-- PMM
Typo "pseudo" in subject.
Quoted 14 lines · Daniel P. Berrangé
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é <[email protected]>---
This is a simple integration of Eric's proposal from
Quoted 7 lines
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 :)
Quoted 6 lines
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".
Quoted 48 lines
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 . ; \ doneand 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(-).gitignore +2
-0@@ -1,3 +1,5 @@ +/GNUmakefile +/build/ /.doctrees /config-devices.* /config-all-devices.*configure +13
-0@@ -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 <<EOF
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 36
Quoted 10 lines
configure +10
-0+ +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:
Quoted 28 lines
configure +9
-8+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"
Quoted 11 lines · Daniel P. Berrangé
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é <[email protected]>---
In addition to reviews you already have,
Quoted 2 lines
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.
I definitely like the idea of only blowing away what we created - but if we created build, then recreating it for each new configure run is nice.
Quoted 7 lines
We could optionally symlink binaries from build/ into $PWD if poeople 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)'`; \
Using -maxdepth gets rid of the need to pre-create empty directories for nested binaries, but also loses out on binaries such as x86_64-softmmu/qemu-system-x86_64. Oh, it looks like meson creates qemu-system-x86_64 as a binary in the top level, then a symlink in its old location. Populating symlinks to ALL old locations is thus trickier than what you are proposing here, so it is fine to save that for a followup patch (let's get the bare minimum in first, so that at least ./configure && make works, before we worry about back-compat symlinks).
Quoted 3 lines
This goes on top of Paolo's most recent meson port v175 posting, or whatever number it is upto now :-)
Nice comment for reviewers, but doesn't quite need to be preserved in git.
Quoted 20 lines
.gitignore | 2 ++ configure | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-).gitignore +2
-0@@ -1,3 +1,5 @@ +/GNUmakefile +/build/ /.doctrees /config-devices.* /config-all-devices.*configure +0
-0
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 14
Quoted 4 lines
configure +1
-0@@ -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)
This behaves wrong if CDPATH is set in the environment. We should really include CDPATH in our environment sanitization at the top of the file.
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 21
Quoted 7 lines
configure +7
-0+ +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"
bashism; s/==/=/ or you will break configure on dash systems
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 23
Quoted 2 lines
configure +2
-0+then + echo "Using './build' as the directory for build output"
Do we want a way for a user to type './configure builddir=build/' and 'make builddir=build/' so they can specify different builddir overrides per invocation (of course, where builddir defaults to 'build/' if not specified)? But hardcoding to _just_ ./build/ for getting this patch in quickly is fine.
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 26
Quoted 3 lines
configure +3
-0+ rm -rf build + mkdir -p build + cat > GNUmakefile <<EOF
If you use 'EOF' or \EOF here, then...
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 28
Quoted 2 lines
configure +2
-0+ +ifeq (\$(MAKECMDGOALS),)
you wouldn't have to escape all these $. Looking through the file...
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 41
Quoted 13 lines
configure +13
-0+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 +force: ; +.PHONY: force +GNUmakefile: ; + +EOF
...I didn't see any use of $ that was not supposed to be literally in the generated GNUmakefile.
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 48
Quoted 7 lines
configure +4
-0+ 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
Now that we are guaranteeing configure is run in a build directory, this part of configure might have some cleanups possible. But that can be a separate patch.
Quoted 6 lines
configure +0
-1@@ -297,14 +329,6 @@ ld_has() { $ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 } -# make source path absolute
configure ld_has() { · line 334
Quoted 10 lines
configure +0
-7-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"
Looking forward to v2.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Quoted 5 lines · Eric Blake
Quoted 4 lines · Daniel P. Berrangé
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.
Quoted 7 lines
Quoted 7 lines
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é <[email protected]>---
[*]
Quoted 29 lines
In addition to reviews you already have,
Quoted 2 lines
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.
I definitely like the idea of only blowing away what we created - but if we created build, then recreating it for each new configure run is nice.
Quoted 8 lines
We could optionally symlink binaries from build/ into $PWD if poeople think that is important, eg by changing GNUmakefile to have:
recurse: all
for bin infind build -maxdepth 1 -type f -executable | grep -v -E '(ninjatool|config.status)'; \Using -maxdepth gets rid of the need to pre-create empty directories for nested binaries, but also loses out on binaries such as x86_64-softmmu/qemu-system-x86_64. Oh, it looks like meson creates qemu-system-x86_64 as a binary in the top level, then a symlink in its old location. Populating symlinks to ALL old locations is thus trickier than what you are proposing here, so it is fine to save that for a followup patch (let's get the bare minimum in first, so that at least ./configure && make works, before we worry about back-compat symlinks).
Quoted 1 line
Quoted 4 lines
Quoted 2 lines
This goes on top of Paolo's most recent meson port v175 posting, or whatever number it is upto now :-)
Nice comment for reviewers, but doesn't quite need to be preserved in git.
Already below '---' in [*] ;)
Quoted 107 lines
Quoted 22 lines
.gitignore | 2 ++
configure | 40 ++++++++++++++++++++++++++++++++--------2 files changed, 34 insertions(+), 8 deletions(-).gitignore +2
-0@@ -1,3 +1,5 @@ +/GNUmakefile +/build//.doctrees
/config-devices.*
/config-all-devices.*configure +0
-0@@ -11,6 +11,38 @@ unset CLICOLOR_FORCE GREP_OPTIONS # Don't allow CCACHE, if present, to use cached results of compileQuoted 3 lines
tests!
export CCACHE_RECACHE=yes
+source_path=$(cd "$(dirname -- "$0")"; pwd)This behaves wrong if CDPATH is set in the environment. We should really include CDPATH in our environment sanitization at the top of the file.
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 21
Quoted 7 lines
configure +7
-0+ +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"bashism; s/==/=/ or you will break configure on dash systems
Quoted 2 lines
+then
+ echo "Using './build' as the directory for build output"Do we want a way for a user to type './configure builddir=build/' and 'make builddir=build/' so they can specify different builddir overrides per invocation (of course, where builddir defaults to 'build/' if not specified)? But hardcoding to _just_ ./build/ for getting this patch in quickly is fine.
Quoted 3 lines
+ rm -rf build
+ mkdir -p build
+ cat > GNUmakefile <<EOFIf you use 'EOF' or \EOF here, then...
configure
Quoted 2 lines
configure +2
-0+ +ifeq (\$(MAKECMDGOALS),)you wouldn't have to escape all these $. Looking through the file...
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 41
Quoted 13 lines
configure +13
-0+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 +force: ; +.PHONY: force +GNUmakefile: ; + +EOF...I didn't see any use of $ that was not supposed to be literally in the generated GNUmakefile.
Quoted 7 lines
+ cd build
+ exec $source_path/configure "$@"configure +2
-0+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 itNow that we are guaranteeing configure is run in a build directory, this part of configure might have some cleanups possible. But that can be a separate patch.
Quoted 11 lines
configure +0
-0@@ -297,14 +329,6 @@ ld_has() {$ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 }
-# make source path absoluteconfigure +0
-7-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 -Quoted 4 lines
# default parameters cpu="" iasl="iasl"Looking forward to v2.
Quoted 5 lines · Eric Blake
Quoted 3 lines
This goes on top of Paolo's most recent meson port v175 posting, or whatever number it is upto now :-)
Nice comment for reviewers, but doesn't quite need to be preserved in git.
I for one don't mind. :)
Paolo
Quoted 63 lines · Eric Blake
Quoted 11 lines · Daniel P. Berrangé
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é <[email protected]>---
In addition to reviews you already have,
Quoted 2 lines
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.
I definitely like the idea of only blowing away what we created - but if we created build, then recreating it for each new configure run is nice.
Quoted 7 lines
We could optionally symlink binaries from build/ into $PWD if poeople 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)'`; \Using -maxdepth gets rid of the need to pre-create empty directories for nested binaries, but also loses out on binaries such as x86_64-softmmu/qemu-system-x86_64. Oh, it looks like meson creates qemu-system-x86_64 as a binary in the top level, then a symlink in its old location. Populating symlinks to ALL old locations is thus trickier than what you are proposing here, so it is fine to save that for a followup patch (let's get the bare minimum in first, so that at least ./configure && make works, before we worry about back-compat symlinks).
Quoted 3 lines
This goes on top of Paolo's most recent meson port v175 posting, or whatever number it is upto now :-)
Nice comment for reviewers, but doesn't quite need to be preserved in git.
Quoted 18 lines
.gitignore | 2 ++ configure | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-).gitignore +2
-0@@ -1,3 +1,5 @@ +/GNUmakefile +/build/ /.doctrees /config-devices.* /config-all-devices.*configure +0
-1--- a/configure
Quoted 8 lines
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 13
Quoted 5 lines
+++ b/configure
configure +1
-0@@ -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)This behaves wrong if CDPATH is set in the environment. We should really include CDPATH in our environment sanitization at the top of the file.
This code is pre-existing, so any fixes wrt CDPATH can be done by a different patch.
Quoted 11 lines
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 21
Quoted 8 lines
configure +7
-0+ +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"bashism; s/==/=/ or you will break configure on dash systems
Quoted 8 lines
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 22
Quoted 2 lines
configure +2
-0+then + echo "Using './build' as the directory for build output"Do we want a way for a user to type './configure builddir=build/' and 'make builddir=build/' so they can specify different builddir overrides per invocation (of course, where builddir defaults to 'build/' if not specified)? But hardcoding to _just_ ./build/ for getting this patch in quickly is fine.
Adding "builddir=build" as an option would be introducing new functionality that doesn't already exist. The goal is just to do some minimal work to preserve existing functionality. If people want control over the name of their build dir, then they can do that by using a out-of-source tree build already.
Quoted 11 lines
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 26
Quoted 4 lines
configure +3
-0+ rm -rf build + mkdir -p build + cat > GNUmakefile <<EOFIf you use 'EOF' or \EOF here, then...
configure unset CLICOLOR_FORCE GREP_OPTIONS · line 27
Quoted 2 lines
configure +2
-0+ +ifeq (\$(MAKECMDGOALS),)you wouldn't have to escape all these $. Looking through the file...
Ah, subtle, but nice.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Am 20.08.2020 um 19:42 hat Eric Blake geschrieben:
Quoted 13 lines · Daniel P. Berrangé
Quoted 11 lines
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é <[email protected]>---
Quoted 8 lines
In addition to reviews you already have,
Quoted 2 lines
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.
I definitely like the idea of only blowing away what we created - but if we created build, then recreating it for each new configure run is nice.
I think I actually wouldn't automatically remove anything on configure. It can be surprising behaviour for configure to delete directories, and the old setup didn't do an automatic "make clean" either. By having a separate build directory, manually emptying as needed has already become easier.
Quoted 7 lines
Quoted 6 lines
We could optionally symlink binaries from build/ into $PWD if poeople 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)'`; \
Quoted 8 lines
Using -maxdepth gets rid of the need to pre-create empty directories for nested binaries, but also loses out on binaries such as x86_64-softmmu/qemu-system-x86_64. Oh, it looks like meson creates qemu-system-x86_64 as a binary in the top level, then a symlink in its old location. Populating symlinks to ALL old locations is thus trickier than what you are proposing here, so it is fine to save that for a followup patch (let's get the bare minimum in first, so that at least ./configure && make works, before we worry about back-compat symlinks).
Having the system emulator symlinks in the top level would be a change, but even more convenient than the original places. I'd vote for adding the auto-symlinking at least for the tools; if the top-level symlinks for system emulators get also symlinked by this, that's fine, too.
I was actually surprised that Dan reports "make check" from the source tree to be working without the symlinks. Some code must be cleverer than I thought!
Kevin
Quoted 20 lines · Kevin Wolf
Am 20.08.2020 um 19:42 hat Eric Blake geschrieben:
Quoted 19 lines · Daniel P. Berrangé
Quoted 11 lines
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é <[email protected]>---
In addition to reviews you already have,
Quoted 2 lines
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.
Quoted 8 lines
Quoted 2 lines
I definitely like the idea of only blowing away what we created - but if we created build, then recreating it for each new configure run is nice.
I think I actually wouldn't automatically remove anything on configure. It can be surprising behaviour for configure to delete directories, and the old setup didn't do an automatic "make clean" either. By having a separate build directory, manually emptying as needed has already become easier.
The issue is that previously you could do
./configure
make
./configure
make
This isn't possible with the new system because meson will refuse to use the "build/" directory if it already contains a previous configured build.
Doing "rm -rf build" in configure lets the above sequence work.
I can remove the "rm -rf biuld" in configure if we are happy to require
./configure
make
make distclean
./configure
make
because the "GNUmakefile" wires up "distclean" to purge the build/ directory.
Quoted 16 lines
Quoted 7 lines
Quoted 6 lines
We could optionally symlink binaries from build/ into $PWD if poeople 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)'`; \Quoted 8 lines
Using -maxdepth gets rid of the need to pre-create empty directories for nested binaries, but also loses out on binaries such as x86_64-softmmu/qemu-system-x86_64. Oh, it looks like meson creates qemu-system-x86_64 as a binary in the top level, then a symlink in its old location. Populating symlinks to ALL old locations is thus trickier than what you are proposing here, so it is fine to save that for a followup patch (let's get the bare minimum in first, so that at least ./configure && make works, before we worry about back-compat symlinks).
Quoted 8 lines
Having the system emulator symlinks in the top level would be a change, but even more convenient than the original places. I'd vote for adding the auto-symlinking at least for the tools; if the top-level symlinks for system emulators get also symlinked by this, that's fine, too.
I was actually surprised that Dan reports "make check" from the source tree to be working without the symlinks. Some code must be cleverer than I thought!
That's because "make check" is not actually running from the source tree. When you run "make check" in the source tree, what's acutally happening is
cd build
make check
so it is actually running from build-dir context.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Am 21.08.2020 um 12:14 hat Daniel P. Berrangé geschrieben:
Quoted 32 lines · Kevin Wolf
Quoted 20 lines
Am 20.08.2020 um 19:42 hat Eric Blake geschrieben:
Quoted 19 lines · Daniel P. Berrangé
Quoted 11 lines
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é <[email protected]>---
In addition to reviews you already have,
Quoted 2 lines
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.
Quoted 8 lines
Quoted 2 lines
I definitely like the idea of only blowing away what we created - but if we created build, then recreating it for each new configure run is nice.
I think I actually wouldn't automatically remove anything on configure. It can be surprising behaviour for configure to delete directories, and the old setup didn't do an automatic "make clean" either. By having a separate build directory, manually emptying as needed has already become easier.
The issue is that previously you could do
Quoted 8 lines
./configure
make
./configure
makeThis isn't possible with the new system because meson will refuse to use the "build/" directory if it already contains a previous configured build.
Oh. So now you always have to create a new build directory if you want to change configure options?
Quoted 5 lines
Doing "rm -rf build" in configure lets the above sequence work.
I can remove the "rm -rf biuld" in configure if we are happy to require
Quoted 8 lines
./configure
make
make distclean
./configure
makebecause the "GNUmakefile" wires up "distclean" to purge the build/ directory.
Hm, I see. Then maybe better keep the 'rm'.
Quoted 25 lines
Quoted 16 lines
Quoted 7 lines
Quoted 6 lines
We could optionally symlink binaries from build/ into $PWD if poeople 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)'`; \Quoted 8 lines
Using -maxdepth gets rid of the need to pre-create empty directories for nested binaries, but also loses out on binaries such as x86_64-softmmu/qemu-system-x86_64. Oh, it looks like meson creates qemu-system-x86_64 as a binary in the top level, then a symlink in its old location. Populating symlinks to ALL old locations is thus trickier than what you are proposing here, so it is fine to save that for a followup patch (let's get the bare minimum in first, so that at least ./configure && make works, before we worry about back-compat symlinks).
Quoted 8 lines
Having the system emulator symlinks in the top level would be a change, but even more convenient than the original places. I'd vote for adding the auto-symlinking at least for the tools; if the top-level symlinks for system emulators get also symlinked by this, that's fine, too.
I was actually surprised that Dan reports "make check" from the source tree to be working without the symlinks. Some code must be cleverer than I thought!
Quoted 8 lines
That's because "make check" is not actually running from the source tree. When you run "make check" in the source tree, what's acutally happening is
cd build
make checkso it is actually running from build-dir context.
Yup, I wasn't aware that it would do this.
Kevin
Quoted 4 lines · Daniel P. Berrangé
I can remove the "rm -rf biuld" in configure if we are happy to require
Quoted 9 lines
./configure
make
make distclean
./configure
makebecause the "GNUmakefile" wires up "distclean" to purge the build/ directory.
I have already included this version in v8 of the meson pull request, actually (to place it early in the series). Any other refinements[1] and bugfixes can be done on top.
Paolo
[1] such as requiring --i-really-want-intree-builds :D
Quoted 5 lines · Daniel P. Berrangé
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.
Quoted 7 lines
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é <[email protected]>---
Oh, one more minor thing: 'make distclean' should remove the created GNUMakefile (and also build/ if configure created it? dunno).
thanks
-- PMM
Quoted 11 lines · Peter Maydell
Quoted 10 lines · Daniel P. Berrangé
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/.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Daniel P. Berrangé <[email protected]>---
Oh, one more minor thing: 'make distclean' should remove the created GNUMakefile (and also build/ if configure created it? dunno).
Yes, I mistakenly put that logic for "make clean" in this v1. My v2 has fixed this, and in v3 i'll remove the "GNUMakefile" too.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|