Re: [PATCH] configure: remove DIRS

[Peter Maydell <peter.maydell@linaro.org>]

On Fri, 10 Dec 2021 at 10:01, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> DIRS is used to create the directory in which the LINKS symbolic links
> reside, or to create directories for object files.  The former can
> be done directly in the symlinking loop, while the latter is done
> by Meson already, so DIRS is not necessary.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  configure | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/configure b/configure
> index 80b5d0c148..4f7ed2ad1a 100755
> --- a/configure
> +++ b/configure
> @@ -3794,7 +3794,6 @@ if test "$safe_stack" = "yes"; then
>  fi
>
>  # If we're using a separate build tree, set it up now.
> -# DIRS are directories which we simply mkdir in the build tree;
>  # LINKS are things to symlink back into the source tree
>  # (these can be both files and directories).
>  # Caution: do not add files or directories here using wildcards. This
> @@ -3806,12 +3805,6 @@ fi
>  # UNLINK is used to remove symlinks from older development versions
>  # that might get into the way when doing "git update" without doing
>  # a "make distclean" in between.
> -DIRS="tests tests/tcg tests/qapi-schema tests/qtest/libqos"
> -DIRS="$DIRS tests/qtest tests/qemu-iotests tests/vm tests/fp tests/qgraph"
> -DIRS="$DIRS docs docs/interop fsdev scsi"
> -DIRS="$DIRS pc-bios/optionrom pc-bios/s390-ccw"
> -DIRS="$DIRS roms/seabios"
> -DIRS="$DIRS contrib/plugins/"
>  LINKS="Makefile"
>  LINKS="$LINKS tests/tcg/Makefile.target"
>  LINKS="$LINKS pc-bios/optionrom/Makefile"
> @@ -3840,9 +3833,9 @@ for bios_file in \
>  do
>      LINKS="$LINKS pc-bios/$(basename $bios_file)"
>  done
> -mkdir -p $DIRS
>  for f in $LINKS ; do
>      if [ -e "$source_path/$f" ]; then
> +        mkdir -p `dirname ./$f`
>          symlink "$source_path/$f" "$f"
>      fi
>  done

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Ideally at some point we should move the LINKS stuff into
meson too, and get rid of the wildcarding. pc-bios/meson.build
already has to have an explicit list of the blobs that we
here are handling via wildcards.

thanks
-- PMM