| Message ID | 20220806112252.15056-1-heiko.thiery@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 2a4fb47533318f26702a8e8a38a002433e75202b |
| Delegated to: | Heinrich Schuchardt |
| Headers | show |
| Series | tools: mkeficapsule: use pkg-config for each lib separat | expand |
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
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
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(-)