* [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
@ 2022-07-20 10:31 Heiko Thiery
2022-07-20 10:31 ` [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo Heiko Thiery
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Heiko Thiery @ 2022-07-20 10:31 UTC (permalink / raw)
To: u-boot
Cc: Pali Rohár, Stefan Roese, Simon Glass, Chris Packham,
Marek Behún, AKASHI Takahiro, Samuel Holland,
Heinrich Schuchardt, Heiko Thiery
Instead of hardcoding -luuid -lgnutls as the flags needed to build
mkeficapsule, use pkg-config when available.
We gracefully fallback on the previous behavior of hardcoding -luuid
-lgnutls if pkg-config is not available or fails with an error.
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
v3:
- added reviewed-by
v2:
- also add cflags detection via pkg-config (Thanks Pali)
tools/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/Makefile b/tools/Makefile
index 9f2339666a..aab06aec93 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -242,7 +242,10 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs
hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler
HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
-HOSTLDLIBS_mkeficapsule += -lgnutls -luuid
+HOSTCFLAGS_mkeficapsule.o += \
+ $(shell pkg-config --cflags gnutls uuid 2> /dev/null || echo "")
+HOSTLDLIBS_mkeficapsule += \
+ $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid")
hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
# We build some files with extra pedantic flags to try to minimize things
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo
2022-07-20 10:31 [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls Heiko Thiery
@ 2022-07-20 10:31 ` Heiko Thiery
2022-08-04 20:53 ` Tom Rini
2022-07-20 10:55 ` [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls AKASHI Takahiro
2022-08-04 20:53 ` Tom Rini
2 siblings, 1 reply; 7+ messages in thread
From: Heiko Thiery @ 2022-07-20 10:31 UTC (permalink / raw)
To: u-boot
Cc: Pali Rohár, Stefan Roese, Simon Glass, Chris Packham,
Marek Behún, AKASHI Takahiro, Samuel Holland,
Heinrich Schuchardt, Heiko Thiery
Instead of hardcoding -ltinfo as the flags needed to build
kwboot, use pkg-config when available.
We gracefully fallback on the previous behavior of hardcoding -ltinfo
if pkg-config is not available or fails with an error.
Reviewed-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
v3:
- remove cflags detection again
- added reviewed-by
v2:
- also add cflags detection via pkg-config (Thanks Pali)
tools/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/Makefile b/tools/Makefile
index aab06aec93..005e7362a3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -198,7 +198,9 @@ hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl
HOSTCFLAGS_mkexynosspl.o := -pedantic
HOSTCFLAGS_kwboot.o += -pthread
-HOSTLDLIBS_kwboot += -pthread -ltinfo
+HOSTLDLIBS_kwboot += -pthread
+HOSTLDLIBS_kwboot += \
+ $(shell pkg-config --libs tinfo 2> /dev/null || echo "-ltinfo")
ifdtool-objs := $(LIBFDT_OBJS) ifdtool.o
hostprogs-$(CONFIG_X86) += ifdtool
--
2.30.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo
2022-07-20 10:31 ` [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo Heiko Thiery
@ 2022-08-04 20:53 ` Tom Rini
0 siblings, 0 replies; 7+ messages in thread
From: Tom Rini @ 2022-08-04 20:53 UTC (permalink / raw)
To: Heiko Thiery
Cc: u-boot, Pali Rohár, Stefan Roese, Simon Glass, Chris Packham,
Marek Behún, AKASHI Takahiro, Samuel Holland,
Heinrich Schuchardt
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
On Wed, Jul 20, 2022 at 12:31:35PM +0200, Heiko Thiery wrote:
> Instead of hardcoding -ltinfo as the flags needed to build
> kwboot, use pkg-config when available.
>
> We gracefully fallback on the previous behavior of hardcoding -ltinfo
> if pkg-config is not available or fails with an error.
>
> Reviewed-by: Pali Rohár <pali@kernel.org>
> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
2022-07-20 10:31 [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls Heiko Thiery
2022-07-20 10:31 ` [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo Heiko Thiery
@ 2022-07-20 10:55 ` AKASHI Takahiro
2022-08-04 20:53 ` Tom Rini
2 siblings, 0 replies; 7+ messages in thread
From: AKASHI Takahiro @ 2022-07-20 10:55 UTC (permalink / raw)
To: Heiko Thiery
Cc: u-boot, Pali Roh??r, Stefan Roese, Simon Glass, Chris Packham,
Marek Beh??n, Samuel Holland, Heinrich Schuchardt
On Wed, Jul 20, 2022 at 12:31:33PM +0200, Heiko Thiery wrote:
> Instead of hardcoding -luuid -lgnutls as the flags needed to build
> mkeficapsule, use pkg-config when available.
>
> We gracefully fallback on the previous behavior of hardcoding -luuid
> -lgnutls if pkg-config is not available or fails with an error.
>
> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
> ---
> v3:
> - added reviewed-by
>
> v2:
> - also add cflags detection via pkg-config (Thanks Pali)
>
> tools/Makefile | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/tools/Makefile b/tools/Makefile
> index 9f2339666a..aab06aec93 100644
> --- a/tools/Makefile
> +++ b/tools/Makefile
> @@ -242,7 +242,10 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs
> hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler
> HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
>
> -HOSTLDLIBS_mkeficapsule += -lgnutls -luuid
> +HOSTCFLAGS_mkeficapsule.o += \
> + $(shell pkg-config --cflags gnutls uuid 2> /dev/null || echo "")
> +HOSTLDLIBS_mkeficapsule += \
> + $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid")
It would be logically better to call pkg-config for each library, that is,
HOSTLDLIBS_mkeficapsule += \
$(shell pkg-config --libs gnutls 2> /dev/null || echo " -lgnutls")
HOSTLDLIBS_mkeficapsule += \
$(shell pkg-config --libs uuid 2> /dev/null || echo " -luuid")
Thanks,
-Takahiro Akashi
> hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule
>
> # We build some files with extra pedantic flags to try to minimize things
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
2022-07-20 10:31 [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls Heiko Thiery
2022-07-20 10:31 ` [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo Heiko Thiery
2022-07-20 10:55 ` [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls AKASHI Takahiro
@ 2022-08-04 20:53 ` Tom Rini
2022-08-06 6:12 ` AKASHI Takahiro
2 siblings, 1 reply; 7+ messages in thread
From: Tom Rini @ 2022-08-04 20:53 UTC (permalink / raw)
To: Heiko Thiery
Cc: u-boot, Pali Rohár, Stefan Roese, Simon Glass, Chris Packham,
Marek Behún, AKASHI Takahiro, Samuel Holland,
Heinrich Schuchardt
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
On Wed, Jul 20, 2022 at 12:31:33PM +0200, Heiko Thiery wrote:
> Instead of hardcoding -luuid -lgnutls as the flags needed to build
> mkeficapsule, use pkg-config when available.
>
> We gracefully fallback on the previous behavior of hardcoding -luuid
> -lgnutls if pkg-config is not available or fails with an error.
>
> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
2022-08-04 20:53 ` Tom Rini
@ 2022-08-06 6:12 ` AKASHI Takahiro
2022-08-06 11:24 ` Heiko Thiery
0 siblings, 1 reply; 7+ messages in thread
From: AKASHI Takahiro @ 2022-08-06 6:12 UTC (permalink / raw)
To: Tom Rini
Cc: Heiko Thiery, u-boot, Pali Roh??r, Stefan Roese, Simon Glass,
Chris Packham, Marek Beh??n, Samuel Holland, Heinrich Schuchardt
[-- Attachment #1: Type: text/plain, Size: 696 bytes --]
On Thu, Aug 04, 2022 at 04:53:09PM -0400, Tom Rini wrote:
> On Wed, Jul 20, 2022 at 12:31:33PM +0200, Heiko Thiery wrote:
>
> > Instead of hardcoding -luuid -lgnutls as the flags needed to build
> > mkeficapsule, use pkg-config when available.
> >
> > We gracefully fallback on the previous behavior of hardcoding -luuid
> > -lgnutls if pkg-config is not available or fails with an error.
> >
> > Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
>
> Applied to u-boot/master, thanks!
I made this comment before.
https://lists.denx.de/pipermail/u-boot/2022-July/489310.html
-Takahiro Akashi
> --
> Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
2022-08-06 6:12 ` AKASHI Takahiro
@ 2022-08-06 11:24 ` Heiko Thiery
0 siblings, 0 replies; 7+ messages in thread
From: Heiko Thiery @ 2022-08-06 11:24 UTC (permalink / raw)
To: AKASHI Takahiro, Tom Rini, Heiko Thiery, u-boot, Pali Roh??r,
Stefan Roese, Simon Glass, Chris Packham, Marek Beh??n,
Samuel Holland, Heinrich Schuchardt
Hi Akashi,
Am Sa., 6. Aug. 2022 um 08:12 Uhr schrieb AKASHI Takahiro
<takahiro.akashi@linaro.org>:
>
> On Thu, Aug 04, 2022 at 04:53:09PM -0400, Tom Rini wrote:
> > On Wed, Jul 20, 2022 at 12:31:33PM +0200, Heiko Thiery wrote:
> >
> > > Instead of hardcoding -luuid -lgnutls as the flags needed to build
> > > mkeficapsule, use pkg-config when available.
> > >
> > > We gracefully fallback on the previous behavior of hardcoding -luuid
> > > -lgnutls if pkg-config is not available or fails with an error.
> > >
> > > Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> > > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
> >
> > Applied to u-boot/master, thanks!
>
> I made this comment before.
> https://lists.denx.de/pipermail/u-boot/2022-July/489310.html
Just send a new patch that fixes that.
--
Heiko
>
> -Takahiro Akashi
>
> > --
> > Tom
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-08-06 11:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-20 10:31 [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls Heiko Thiery
2022-07-20 10:31 ` [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo Heiko Thiery
2022-08-04 20:53 ` Tom Rini
2022-07-20 10:55 ` [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls AKASHI Takahiro
2022-08-04 20:53 ` Tom Rini
2022-08-06 6:12 ` AKASHI Takahiro
2022-08-06 11:24 ` Heiko Thiery
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox