threads / patch / 42604

patchgnome-keyring: Don't hard-code pkg-config executable

Subject: [PATCH] gnome-keyring: Don't hard-code pkg-config executable

## tl;dr

3 messages between Jun 16, 2016 and Jun 16, 2016. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Heiko Becker· Jun 14, 2016, 11:27 UTC · lore

Helpful if your pkg-config executable has a prefix based on the architecture, for example.

Signed-off-by: Heiko Becker <heirecka@exherbo.org>
---
 contrib/credential/gnome-keyring/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Show changes to contrib/credential/gnome-keyring/Makefile +3 −2

diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile
index c3c7c98..22c19df 100644
--- a/contrib/credential/gnome-keyring/Makefile
+++ b/contrib/credential/gnome-keyring/Makefile
@@ -4,12 +4,13 @@ all:: $(MAIN)
 CC = gcc
 RM = rm -f
 CFLAGS = -g -O2 -Wall
+PKG_CONFIG = pkg-config
 
 -include ../../../config.mak.autogen
 -include ../../../config.mak
 
-INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0)
-LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0)
+INCS:=$(shell $(PKG_CONFIG) --cflags gnome-keyring-1 glib-2.0)
+LIBS:=$(shell $(PKG_CONFIG) --libs gnome-keyring-1 glib-2.0)
 
 SRCS:=$(MAIN).c
 OBJS:=$(SRCS:.c=.o)

-- 
2.9.0

Jeff King· Jun 16, 2016, 09:50 UTC · re: Heiko Becker · lore

Re: [PATCH] gnome-keyring: Don't hard-code pkg-config executable

On Tue, Jun 14, 2016 at 01:27:05PM +0200, Heiko Becker wrote:

> Helpful if your pkg-config executable has a prefix based on the
> architecture, for example.
> 
> Signed-off-by: Heiko Becker <heirecka@exherbo.org>

Sounds like a reasonable thing to want to do...

Show 17 quoted lines

> diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile
> index c3c7c98..22c19df 100644
> --- a/contrib/credential/gnome-keyring/Makefile
> +++ b/contrib/credential/gnome-keyring/Makefile
> @@ -4,12 +4,13 @@ all:: $(MAIN)
>  CC = gcc
>  RM = rm -f
>  CFLAGS = -g -O2 -Wall
> +PKG_CONFIG = pkg-config
>  
>  -include ../../../config.mak.autogen
>  -include ../../../config.mak
>  
> -INCS:=$(shell pkg-config --cflags gnome-keyring-1 glib-2.0)
> -LIBS:=$(shell pkg-config --libs gnome-keyring-1 glib-2.0)
> +INCS:=$(shell $(PKG_CONFIG) --cflags gnome-keyring-1 glib-2.0)
> +LIBS:=$(shell $(PKG_CONFIG) --libs gnome-keyring-1 glib-2.0)

...and the implementation looks obviously correct.

Thanks.

-Peff

Brandon Casey· Jun 16, 2016, 18:56 UTC · re: Jeff King · lore

Re: [PATCH] gnome-keyring: Don't hard-code pkg-config executable

On Thu, Jun 16, 2016 at 2:50 AM, Jeff King <peff@peff.net> wrote:

Show 8 quoted lines

> On Tue, Jun 14, 2016 at 01:27:05PM +0200, Heiko Becker wrote:
>
>> Helpful if your pkg-config executable has a prefix based on the
>> architecture, for example.
>>
>> Signed-off-by: Heiko Becker <heirecka@exherbo.org>
>
> Sounds like a reasonable thing to want to do...

ditto.

> ...and the implementation looks obviously correct.

ditto.

> Thanks.

ditto.

See I'm still alive, really!

-Brandon