tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
PATCH v3 1/2 tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
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.
---
v3:
- added reviewed-by
v2:
- also add cflags detection via pkg-config (Thanks Pali)
tools/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/Makefile +4 -1
@@ -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
Signature · 1 line
2.30.2
PATCH v3 2/2 tools: kwboot: use pkg-config to get -ltinfo
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.
---
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(-)
tools/Makefile +3 -1
@@ -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
Signature · 1 line
2.30.2
Re: [PATCH v3 2/2] tools: kwboot: use pkg-config to get -ltinfo
Quoted 8 lines · 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 <[email protected]>Signed-off-by Heiko Thiery <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 23 lines · 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 <[email protected]>Signed-off-by Heiko Thiery <[email protected]>---
v3:
- added reviewed-byv2:
- also add cflags detection via pkg-config (Thanks Pali)tools/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)tools/Makefile +0
-0
tools/Makefile hostprogs-$(CONFIG_MIPS) += mips-relocs · line 248
Quoted 8 lines
tools/Makefile +4
-1@@ -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
Quoted 6 lines
tools/Makefile +0
-0hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule # We build some files with extra pedantic flags to try to minimize thingsSignature · 1 line
2.30.2
Quoted 8 lines · 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 <[email protected]>Signed-off-by Heiko Thiery <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 5 lines · Tom Rini
Quoted 3 lines · Heiko Thiery
Instead of hardcoding -luuid -lgnutls as the flags needed to build mkeficapsule, use pkg-config when available.
Quoted 7 lines
Quoted 5 lines
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 <[email protected]>Signed-off-by Heiko Thiery <[email protected]>Applied to u-boot/master, thanks!
I made this comment before.
https://lists.denx.de/pipermail/u-boot/2022-July/489310.html
-Takahiro Akashi
Quoted 2 lines
Signature · 1 line
Tom
Hi Akashi,
Am Sa., 6. Aug. 2022 um 08:12 Uhr schrieb AKASHI Takahiro <[email protected]>:
Quoted 10 lines · Tom Rini
Quoted 8 lines · Heiko Thiery
Quoted 7 lines
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.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Reviewed-by Heinrich Schuchardt <[email protected]>Signed-off-by Heiko Thiery <[email protected]>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.
Signature · 1 line
Heiko
Quoted 7 lines
-Takahiro Akashi
Quoted 2 lines
--
Tom