Skip to contentSkip to conversation

tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls

PATCH Superseded Heiko Thiery 1 participant 2 messages Jul 19, 2022

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

---
v2:
- also add cflags detection via pkg-config (Thanks Pali)

 tools/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/Makefile +4 -1
index 9f2339666a..aab06aec93 100644
@@ -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
#1 lore raw

PATCH v2 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.

---
v2:
- also add cflags detection via pkg-config (Thanks Pali)

 tools/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tools/Makefile +5 -1
index aab06aec93..55d7ea7476 100644
@@ -198,7 +198,11 @@ hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl
 HOSTCFLAGS_mkexynosspl.o := -pedantic
 
 HOSTCFLAGS_kwboot.o += -pthread
-HOSTLDLIBS_kwboot += -pthread -ltinfo
+HOSTCFLAGS_kwboot.o += \
+	$(shell pkg-config --cflags tinfo 2> /dev/null || echo "")
+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