[PATCH] ARM: i.MX25: image: consult pkg-config for openssl cflags

[PATCH] ARM: i.MX25: image: consult pkg-config for openssl cflags

[Ahmad Fatoum]

For i.MX HABv3, we already ask pkg-config about the flags
to link the image generation utility against OpenSSL, but we assumed
that the headers would be found in the toolchain's default system header
search path. This may not always be the case, so explicitly ask
pkg-config about the CFLAGS as well.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 scripts/imx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/imx/Makefile b/scripts/imx/Makefile
index 9544974d523f..739641b47707 100644
--- a/scripts/imx/Makefile
+++ b/scripts/imx/Makefile
@@ -15,7 +15,7 @@ HOSTCFLAGS_imx-image.o = -I$(srctree) -I$(srctree)/include/mach
 HOSTCFLAGS_imx-usb-loader.o += -I$(srctree) -I$(srctree)/include/mach
 imx-usb-loader-target-userccflags += -I$(srctree) -I$(srctree)/include/mach
 ifdef CONFIG_ARCH_IMX_IMXIMAGE_SSL_SUPPORT
-HOSTCFLAGS_imx-image.o += -DIMXIMAGE_SSL_SUPPORT
+HOSTCFLAGS_imx-image.o += -DIMXIMAGE_SSL_SUPPORT `$(PKG_CONFIG) --cflags openssl`
 HOSTLDLIBS_imx-image  = `$(PKG_CONFIG) --libs openssl`
 endif
 
-- 
2.39.2

Re: [PATCH] ARM: i.MX25: image: consult pkg-config for openssl cflags

[Sascha Hauer]

On Mon, Aug 07, 2023 at 09:44:45AM +0200, Ahmad Fatoum wrote:
> For i.MX HABv3, we already ask pkg-config about the flags
> to link the image generation utility against OpenSSL, but we assumed
> that the headers would be found in the toolchain's default system header
> search path. This may not always be the case, so explicitly ask
> pkg-config about the CFLAGS as well.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  scripts/imx/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/imx/Makefile b/scripts/imx/Makefile
> index 9544974d523f..739641b47707 100644
> --- a/scripts/imx/Makefile
> +++ b/scripts/imx/Makefile
> @@ -15,7 +15,7 @@ HOSTCFLAGS_imx-image.o = -I$(srctree) -I$(srctree)/include/mach
>  HOSTCFLAGS_imx-usb-loader.o += -I$(srctree) -I$(srctree)/include/mach
>  imx-usb-loader-target-userccflags += -I$(srctree) -I$(srctree)/include/mach
>  ifdef CONFIG_ARCH_IMX_IMXIMAGE_SSL_SUPPORT
> -HOSTCFLAGS_imx-image.o += -DIMXIMAGE_SSL_SUPPORT
> +HOSTCFLAGS_imx-image.o += -DIMXIMAGE_SSL_SUPPORT `$(PKG_CONFIG) --cflags openssl`
>  HOSTLDLIBS_imx-image  = `$(PKG_CONFIG) --libs openssl`
>  endif
>  
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |