* [PATCH] tools: mkeficapsule: use pkg-config for each lib separat
@ 2022-08-06 11:22 Heiko Thiery
2022-08-20 5:48 ` Heinrich Schuchardt
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Thiery @ 2022-08-06 11:22 UTC (permalink / raw)
To: u-boot
Cc: AKASHI Takahiro, Tom Rini, Heiko Thiery, Pali Roh??r,
Stefan Roese, Simon Glass, Chris Packham, Marek Beh??n,
Samuel Holland, Heinrich Schuchardt
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
As suggested by AKASHI Takahiro but unfortunatly missed for respin. Thus
I do this commit afterwards.
tools/Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index 005e7362a3..3626919633 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -245,9 +245,13 @@ hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler
HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
HOSTCFLAGS_mkeficapsule.o += \
- $(shell pkg-config --cflags gnutls uuid 2> /dev/null || echo "")
+ $(shell pkg-config --cflags gnutls 2> /dev/null || echo "")
+HOSTCFLAGS_mkeficapsule.o += \
+ $(shell pkg-config --cflags uuid 2> /dev/null || echo "")
+HOSTLDLIBS_mkeficapsule += \
+ $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls")
HOSTLDLIBS_mkeficapsule += \
- $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid")
+ $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid")
hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
# We build some files with extra pedantic flags to try to minimize things
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tools: mkeficapsule: use pkg-config for each lib separat
2022-08-06 11:22 [PATCH] tools: mkeficapsule: use pkg-config for each lib separat Heiko Thiery
@ 2022-08-20 5:48 ` Heinrich Schuchardt
0 siblings, 0 replies; 2+ messages in thread
From: Heinrich Schuchardt @ 2022-08-20 5:48 UTC (permalink / raw)
To: Heiko Thiery
Cc: AKASHI Takahiro, Tom Rini, Pali Rohár, Stefan Roese,
Simon Glass, Chris Packham, Marek Beh??n, Samuel Holland, u-boot
On 8/6/22 13:22, Heiko Thiery wrote:
> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
This lacks a commit message. I will add the following when merging:
Call pkg-config for each library individually.
This improves fallback handling.
Suggested-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Fixes: 31a7688cbe0e ("tools: mkeficapsule: use pkg-config to get -luuid
and -lgnutls")
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> As suggested by AKASHI Takahiro but unfortunatly missed for respin. Thus
> I do this commit afterwards.
>
> tools/Makefile | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tools/Makefile b/tools/Makefile
> index 005e7362a3..3626919633 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -245,9 +245,13 @@ hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler
> HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
>
> HOSTCFLAGS_mkeficapsule.o += \
> - $(shell pkg-config --cflags gnutls uuid 2> /dev/null || echo "")
> + $(shell pkg-config --cflags gnutls 2> /dev/null || echo "")
> +HOSTCFLAGS_mkeficapsule.o += \
> + $(shell pkg-config --cflags uuid 2> /dev/null || echo "")
> +HOSTLDLIBS_mkeficapsule += \
> + $(shell pkg-config --libs gnutls 2> /dev/null || echo "-lgnutls")
> HOSTLDLIBS_mkeficapsule += \
> - $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid")
> + $(shell pkg-config --libs uuid 2> /dev/null || echo "-luuid")
> hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
>
> # We build some files with extra pedantic flags to try to minimize things
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-20 5:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-06 11:22 [PATCH] tools: mkeficapsule: use pkg-config for each lib separat Heiko Thiery
2022-08-20 5:48 ` Heinrich Schuchardt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox