[ptxdist] [PATCH] u-boot: Use host pkg-config to find host tool dependencies

[ptxdist] [PATCH] u-boot: Use host pkg-config to find host tool dependencies

[Alexander Dahl]

Since U-Boot version 2015.07 U-Boot host tools might require
host-openssl, depending on options set in U-Boot Kconfig.

An option to depend on host openssl was added to ptxdist with commit
0c779a60e50c ("u-boot: Add option to depend on host-openssl") already.
This is not enough however, because 'sysroot-cross/bin/pkg-config' is
used instead of 'sysroot-host/bin/pkg-config' to discover libssl
dependencies.  This might not lead to build failures right away because
U-Boot has a fallback in its tools/Makefile masking the problem.  The
problem might also be masked if a libssl-dev is installed on the build
host (outside of ptxdist).

Using the same approach as barebox package template does since commit
1d7a4f8374d0 ("template-barebox-make: make sure the correct pkg-config
is used") lets ptxdist call the correct pkg-config.

Note: you can not backport this change to ptxdist lower than 2018.09.0,
see link below for detailed discussion.

Signed-off-by: Alexander Dahl <ada@thorsis.com>
Link: https://lore.ptxdist.org/ptxdist/10086649.DBdDmKp7kz@ada/T/#t
---
 rules/u-boot.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/u-boot.make b/rules/u-boot.make
index ac5a7786b..cadca4a6b 100644
--- a/rules/u-boot.make
+++ b/rules/u-boot.make
@@ -49,6 +49,9 @@ U_BOOT_ENV_IMAGE_CUSTOM_SRC := $(call ptx/in-platformconfigdir, \
 $(call ptx/cfghash-file, U_BOOT, $(U_BOOT_ENV_IMAGE_CUSTOM_SRC))
 endif
 
+# use host pkg-config for host tools
+U_BOOT_PATH		:= PATH=$(HOST_PATH)
+
 U_BOOT_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 

base-commit: faf247a8448d4d9caae487beb54d285ac3a6a1b8
-- 
2.30.2

Re: [ptxdist] [APPLIED] u-boot: Use host pkg-config to find host tool dependencies

[Michael Olbrich]

Thanks, applied as 3964c01e6b5f0ba1076742cb5207966c10d8fda3.

Michael

[sent from post-receive hook]

On Fri, 05 Aug 2022 09:51:04 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Since U-Boot version 2015.07 U-Boot host tools might require
> host-openssl, depending on options set in U-Boot Kconfig.
> 
> An option to depend on host openssl was added to ptxdist with commit
> 0c779a60e50c ("u-boot: Add option to depend on host-openssl") already.
> This is not enough however, because 'sysroot-cross/bin/pkg-config' is
> used instead of 'sysroot-host/bin/pkg-config' to discover libssl
> dependencies.  This might not lead to build failures right away because
> U-Boot has a fallback in its tools/Makefile masking the problem.  The
> problem might also be masked if a libssl-dev is installed on the build
> host (outside of ptxdist).
> 
> Using the same approach as barebox package template does since commit
> 1d7a4f8374d0 ("template-barebox-make: make sure the correct pkg-config
> is used") lets ptxdist call the correct pkg-config.
> 
> Note: you can not backport this change to ptxdist lower than 2018.09.0,
> see link below for detailed discussion.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Link: https://lore.ptxdist.org/ptxdist/10086649.DBdDmKp7kz@ada/T/#t
> Message-Id: <20220803131114.6722-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index ac5a7786bc64..cadca4a6bc92 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -49,6 +49,9 @@ U_BOOT_ENV_IMAGE_CUSTOM_SRC := $(call ptx/in-platformconfigdir, \
>  $(call ptx/cfghash-file, U_BOOT, $(U_BOOT_ENV_IMAGE_CUSTOM_SRC))
>  endif
>  
> +# use host pkg-config for host tools
> +U_BOOT_PATH		:= PATH=$(HOST_PATH)
> +
>  U_BOOT_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>