[PATCH] meson: use override_find_program/override_dependency

[PATCH] meson: use override_find_program/override_dependency

[Paolo Bonzini]

Allow projects that use dtc as a subproject to find the tools and
library via find_program() and dependency().  This way, for those
projects there is no different between system dtc and subproject dtc.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 libfdt/meson.build | 1 +
 meson.build        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/libfdt/meson.build b/libfdt/meson.build
index 9c6ef54..68d4c1d 100644
--- a/libfdt/meson.build
+++ b/libfdt/meson.build
@@ -40,6 +40,7 @@ libfdt_dep = declare_dependency(
   include_directories: libfdt_inc,
   link_with: libfdt,
 )
+meson.override_dependency('libfdt', libfdt_dep)
 
 if not wheel_only
   install_headers(
diff --git a/meson.build b/meson.build
index ed4a39d..66b44e8 100644
--- a/meson.build
+++ b/meson.build
@@ -118,6 +118,10 @@ if get_option('tools') and not wheel_only
   )
 endif
 
+foreach e: dtc_tools
+  meson.override_find_program(e.name(), e)
+endforeach
+
 if pylibfdt_enabled
   subdir('pylibfdt')
 endif
-- 
2.49.0

Re: [PATCH] meson: use override_find_program/override_dependency

[David Gibson]

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

On Thu, Jun 12, 2025 at 07:38:29AM +0200, Paolo Bonzini wrote:
> Allow projects that use dtc as a subproject to find the tools and
> library via find_program() and dependency().  This way, for those
> projects there is no different between system dtc and subproject dtc.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Applied, thanks.

> ---
>  libfdt/meson.build | 1 +
>  meson.build        | 4 ++++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/libfdt/meson.build b/libfdt/meson.build
> index 9c6ef54..68d4c1d 100644
> --- a/libfdt/meson.build
> +++ b/libfdt/meson.build
> @@ -40,6 +40,7 @@ libfdt_dep = declare_dependency(
>    include_directories: libfdt_inc,
>    link_with: libfdt,
>  )
> +meson.override_dependency('libfdt', libfdt_dep)
>  
>  if not wheel_only
>    install_headers(
> diff --git a/meson.build b/meson.build
> index ed4a39d..66b44e8 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -118,6 +118,10 @@ if get_option('tools') and not wheel_only
>    )
>  endif
>  
> +foreach e: dtc_tools
> +  meson.override_find_program(e.name(), e)
> +endforeach
> +
>  if pylibfdt_enabled
>    subdir('pylibfdt')
>  endif

-- 
David Gibson (he or they)	| 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 --]