Skip to contentSkip to conversation

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

PATCH Applied Thomas Huth 5 participants 5 messages Jan 18, 2022 – Jan 19, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson.build: Use a function from libfdt 1.5.1 for the library check

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

---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
index 762d7cee85..d1cc04c7a2 100644
@@ -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'
Signature · 1 line
2.27.0
Reviewed-by Philippe Mathieu-Daudé on v1 1/1
#1 lore raw
Quoted 9 lines · 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

---
  meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by on v1 1/1
#2 lore raw
In reply to Thomas Huth
Quoted 7 lines · 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

Alistair

Quoted 21 lines
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -2
index 762d7cee85..d1cc04c7a2 100644
@@ -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

Reviewed-by on v1 1/1
#3 lore raw
In reply to Thomas Huth
Quoted 6 lines · 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

Quoted 17 lines
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
index 762d7cee85..d1cc04c7a2 100644
@@ -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'
Signature · 4 lines
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
#4 lore raw
In reply to Thomas Huth
Quoted 15 lines · 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

---
  meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +0 -0
index 762d7cee85..d1cc04c7a2 100644

meson.build if have_system · line 2282

Quoted 8 lines
meson.build +1 -1
@@ -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