diff mbox series

[v5,01/11] Revert "configure: add --ninja option"

Message ID 20200905062333.1087-2-luoyonggang@gmail.com (mailing list archive)
State New, archived
Headers show
Series Green the msys2 CI make | expand

Commit Message

Yonggang Luo Sept. 5, 2020, 6:23 a.m. UTC
This reverts commit 48328880fddf0145bdccc499160fb24dfabfbd41.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 configure | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

Comments

Thomas Huth Sept. 5, 2020, 8:29 a.m. UTC | #1
On 05/09/2020 08.23, Yonggang Luo wrote:
> This reverts commit 48328880fddf0145bdccc499160fb24dfabfbd41.
> 
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  configure | 16 +---------------
>  1 file changed, 1 insertion(+), 15 deletions(-)

Please be a little bit more descriptive in the patch description: Why do
you have to revert this patch?

 Thomas
Mark Cave-Ayland Sept. 5, 2020, 8:45 a.m. UTC | #2
On 05/09/2020 09:29, Thomas Huth wrote:

> On 05/09/2020 08.23, Yonggang Luo wrote:
>> This reverts commit 48328880fddf0145bdccc499160fb24dfabfbd41.
>>
>> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
>> ---
>>  configure | 16 +---------------
>>  1 file changed, 1 insertion(+), 15 deletions(-)
> 
> Please be a little bit more descriptive in the patch description: Why do
> you have to revert this patch?

Indeed - I certainly still need this, although I will do another test once Paolo's
latest changes have been merged.


ATB,

Mark.
Paolo Bonzini Sept. 5, 2020, 8:48 a.m. UTC | #3
Il sab 5 set 2020, 10:29 Thomas Huth <thuth@redhat.com> ha scritto:

> On 05/09/2020 08.23, Yonggang Luo wrote:
> > This reverts commit 48328880fddf0145bdccc499160fb24dfabfbd41.
> >
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> >  configure | 16 +---------------
> >  1 file changed, 1 insertion(+), 15 deletions(-)
>
> Please be a little bit more descriptive in the patch description: Why do
> you have to revert this patch?
>

It shouldn't be reverted yet. The Windows issue that required the
introduction of --ninja is now fixed in upstream Meson, but we shouldn't
include the fix in the meson submodule until it's part of a released
version. We can then bump the required version (hopefully 0.55.2) and
decide whether to remove --ninja.

That said, we might also want to use ninja instead of make in the future to
build QEMU (leaving make to do the orchestration of the submodules etc.),
which would let us remove ninjatool altogether. I am not sure if that is
going to happen anytime soon, but it should be taken into account before
deciding to remove --ninja.

Paolo

>
diff mbox series

Patch

diff --git a/configure b/configure
index d3495e107f..5d8bf4d8bb 100755
--- a/configure
+++ b/configure
@@ -517,7 +517,6 @@  rng_none="no"
 secret_keyring=""
 libdaxctl=""
 meson=""
-ninja=""
 skip_meson=no
 gettext=""
 
@@ -984,8 +983,6 @@  for opt do
   ;;
   --meson=*) meson="$optarg"
   ;;
-  --ninja=*) ninja="$optarg"
-  ;;
   --smbd=*) smbd="$optarg"
   ;;
   --extra-cflags=*)
@@ -1758,7 +1755,6 @@  Advanced options (experts only):
   --python=PYTHON          use specified python [$python]
   --sphinx-build=SPHINX    use specified sphinx-build [$sphinx_build]
   --meson=MESON            use specified meson [$meson]
-  --ninja=NINJA            use specified ninja [$ninja]
   --smbd=SMBD              use specified smbd [$smbd]
   --with-git=GIT           use specified git [$git]
   --static                 enable static build [$static]
@@ -1995,16 +1991,6 @@  case "$meson" in
     *) meson=$(command -v meson) ;;
 esac
 
-# Probe for ninja (used for compdb)
-
-if test -z "$ninja"; then
-    for c in ninja ninja-build samu; do
-        if has $c; then
-            ninja=$(command -v "$c")
-            break
-        fi
-    done
-fi
 
 # Check that the C compiler works. Doing this here before testing
 # the host CPU ensures that we had a valid CC to autodetect the
@@ -7917,7 +7903,7 @@  fi
 mv $cross config-meson.cross
 
 rm -rf meson-private meson-info meson-logs
-NINJA=${ninja:-$PWD/ninjatool} $meson setup \
+NINJA=$PWD/ninjatool $meson setup \
         --prefix "${pre_prefix}$prefix" \
         --libdir "${pre_prefix}$libdir" \
         --libexecdir "${pre_prefix}$libexecdir" \