[PATCH] meson.build: Use a function from libfdt 1.5.1 for the library check

[PATCH] meson.build: Use a function from libfdt 1.5.1 for the library check

[Thomas Huth]

The fdt version test in meson.build uses a function from libfdt v1.4.7,
but we require version 1.5.1 nowadays. Thus use a function that has
been introduced in that version instead.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/822
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 762d7cee85..d1cc04c7a2 100644
--- a/meson.build
+++ b/meson.build
@@ -2276,7 +2276,7 @@ if have_system
     if fdt.found() and cc.links('''
        #include <libfdt.h>
        #include <libfdt_env.h>
-       int main(void) { fdt_check_full(NULL, 0); return 0; }''',
+       int main(void) { fdt_find_max_phandle(NULL, NULL); return 0; }''',
          dependencies: fdt)
       fdt_opt = 'system'
     elif fdt_opt == 'system'
-- 
2.27.0

Re: [PATCH] meson.build: Use a function from libfdt 1.5.1 for the library check

[Philippe Mathieu-Daudé via]

On 18/1/22 18:05, Thomas Huth wrote:
> The fdt version test in meson.build uses a function from libfdt v1.4.7,
> but we require version 1.5.1 nowadays. Thus use a function that has
> been introduced in that version instead.
> 
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/822
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH] meson.build: Use a function from libfdt 1.5.1 for the library check

[Alistair Francis]

On Wed, Jan 19, 2022 at 3:42 AM Thomas Huth <thuth@redhat.com> wrote:
>
> The fdt version test in meson.build uses a function from libfdt v1.4.7,
> but we require version 1.5.1 nowadays. Thus use a function that has
> been introduced in that version instead.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/822
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 762d7cee85..d1cc04c7a2 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2276,7 +2276,7 @@ if have_system
>      if fdt.found() and cc.links('''
>         #include <libfdt.h>
>         #include <libfdt_env.h>
> -       int main(void) { fdt_check_full(NULL, 0); return 0; }''',
> +       int main(void) { fdt_find_max_phandle(NULL, NULL); return 0; }''',
>           dependencies: fdt)
>        fdt_opt = 'system'
>      elif fdt_opt == 'system'
> --
> 2.27.0
>
>

Re: [PATCH] meson.build: Use a function from libfdt 1.5.1 for the library check

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]

On Tue, Jan 18, 2022 at 06:05:48PM +0100, Thomas Huth wrote:
> The fdt version test in meson.build uses a function from libfdt v1.4.7,
> but we require version 1.5.1 nowadays. Thus use a function that has
> been introduced in that version instead.
> 
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/822
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 762d7cee85..d1cc04c7a2 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2276,7 +2276,7 @@ if have_system
>      if fdt.found() and cc.links('''
>         #include <libfdt.h>
>         #include <libfdt_env.h>
> -       int main(void) { fdt_check_full(NULL, 0); return 0; }''',
> +       int main(void) { fdt_find_max_phandle(NULL, NULL); return 0; }''',
>           dependencies: fdt)
>        fdt_opt = 'system'
>      elif fdt_opt == 'system'

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] meson.build: Use a function from libfdt 1.5.1 for the library check

[Paolo Bonzini]

On 1/18/22 18:05, Thomas Huth wrote:
> The fdt version test in meson.build uses a function from libfdt v1.4.7,
> but we require version 1.5.1 nowadays. Thus use a function that has
> been introduced in that version instead.
> 
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/822
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   meson.build | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 762d7cee85..d1cc04c7a2 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2276,7 +2276,7 @@ if have_system
>       if fdt.found() and cc.links('''
>          #include <libfdt.h>
>          #include <libfdt_env.h>
> -       int main(void) { fdt_check_full(NULL, 0); return 0; }''',
> +       int main(void) { fdt_find_max_phandle(NULL, NULL); return 0; }''',
>            dependencies: fdt)
>         fdt_opt = 'system'
>       elif fdt_opt == 'system'

Queued, thanks.

Paolo