Next round of Meson fixes and cleanups

[PATCH 01/39] configure: Add system = 'linux' for meson when cross-compiling

Posted by Paolo Bonzini 5 years, 5 months ago

From: Thomas Huth <thuth@redhat.com>

Meson needs the "system = xyz" line when cross-compiling. We are already
adding a "system = 'windows'" for the MinGW cross-compilation case here,
so let's add a "system = 'linux'" now for Linux hosts, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20200823111757.72002-2-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure b/configure
index 8a3acef89d..b58627f4aa 100755
--- a/configure
+++ b/configure
@@ -8163,6 +8163,9 @@ if test -n "$cross_prefix"; then
             ?:*) pre_prefix=/ ;;
         esac
     fi
+    if test "$linux" = "yes" ; then
+        echo "system = 'linux'" >> $cross
+    fi
     case "$ARCH" in
         i386|x86_64)
             echo "cpu_family = 'x86'" >> $cross
-- 
2.26.2

Re: [PATCH 01/39] configure: Add system = 'linux' for meson when cross-compiling

Posted by Alex Bennée 5 years, 5 months ago

Paolo Bonzini <pbonzini@redhat.com> writes:

> From: Thomas Huth <thuth@redhat.com>
>
> Meson needs the "system = xyz" line when cross-compiling. We are already
> adding a "system = 'windows'" for the MinGW cross-compilation case here,
> so let's add a "system = 'linux'" now for Linux hosts, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Message-Id: <20200823111757.72002-2-thuth@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  configure | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/configure b/configure
> index 8a3acef89d..b58627f4aa 100755
> --- a/configure
> +++ b/configure
> @@ -8163,6 +8163,9 @@ if test -n "$cross_prefix"; then
>              ?:*) pre_prefix=/ ;;
>          esac
>      fi
> +    if test "$linux" = "yes" ; then
> +        echo "system = 'linux'" >> $cross
> +    fi
>      case "$ARCH" in
>          i386|x86_64)
>              echo "cpu_family = 'x86'" >> $cross


-- 
Alex Bennée