public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Heiko Thiery <heiko.thiery@gmail.com>
To: u-boot@lists.denx.de
Cc: "Pali Rohár" <pali@kernel.org>, "Stefan Roese" <sr@denx.de>,
	"Simon Glass" <sjg@chromium.org>,
	"Chris Packham" <judge.packham@gmail.com>,
	"Marek Behún" <marek.behun@nic.cz>,
	"AKASHI Takahiro" <takahiro.akashi@linaro.org>,
	"Samuel Holland" <samuel@sholland.org>,
	"Heinrich Schuchardt" <xypron.glpk@gmx.de>,
	"Heiko Thiery" <heiko.thiery@gmail.com>
Subject: [PATCH v3 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls
Date: Wed, 20 Jul 2022 12:31:33 +0200	[thread overview]
Message-ID: <20220720103133.601566-1-heiko.thiery@gmail.com> (raw)

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


             reply	other threads:[~2022-07-20 10:31 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-20 10:31 Heiko Thiery [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220720103133.601566-1-heiko.thiery@gmail.com \
    --to=heiko.thiery@gmail.com \
    --cc=judge.packham@gmail.com \
    --cc=marek.behun@nic.cz \
    --cc=pali@kernel.org \
    --cc=samuel@sholland.org \
    --cc=sjg@chromium.org \
    --cc=sr@denx.de \
    --cc=takahiro.akashi@linaro.org \
    --cc=u-boot@lists.denx.de \
    --cc=xypron.glpk@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox