Re: [PATCH] meson: use override_find_program/override_dependency

David Gibson <[email protected]> Thu, 12 Jun 2025 16:34:37 +1000

Newsgroups	org.kernel.vger.devicetree-compiler
Message-ID	<aEp0_c6ctFQKmfYB@zatzit>

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 <[email protected]>

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

signature.asc (application/pgp-signature, 833 B)