diff mbox

[7/7] package/upmpdcli: use pkg-config for libupnpp

Message ID 20160914114146.3796-8-joerg.krause@embedded.rocks
State Changes Requested
Headers show

Commit Message

Jörg Krause Sept. 14, 2016, 11:41 a.m. UTC
Use the provided pkg-config file of libupnpp to get the correct LIBS.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
 package/upmpdcli/upmpdcli.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Thomas Petazzoni Sept. 14, 2016, 12:05 p.m. UTC | #1
Hello,

On Wed, 14 Sep 2016 13:41:46 +0200, Jörg Krause wrote:
> Use the provided pkg-config file of libupnpp to get the correct LIBS.
> 
> Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
> ---
>  package/upmpdcli/upmpdcli.mk | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk
> index 3f521cf..208aa8f 100644
> --- a/package/upmpdcli/upmpdcli.mk
> +++ b/package/upmpdcli/upmpdcli.mk
> @@ -17,12 +17,10 @@ UPMPDCLI_AUTORECONF = YES
>  ifeq ($(BR2_STATIC_LIBS),y)
>  # Upmpdcli forgets to take the dependencies of libupnpp into
>  # consideration, breaking static linking, so help it.
> -# Libupnpp unfortunately doesn't provide a .pc file, so manually
> -# handle the dependencies here.
>  # The build system doesn't expand LIBS from the configure step, so
>  # manually pass it to make.
>  UPMPDCLI_MAKE_OPTS = \
> -	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs expat libcurl libupnp`"
> +	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libupnpp`"
>  endif

Thanks to your patches, upmpdcli now uses pkg-config, so why do we
still need to pass this custom LIBS value ?

Best regards,

Thomas
Jörg Krause Sept. 14, 2016, 12:46 p.m. UTC | #2
On Wed, 2016-09-14 at 14:05 +0200, Thomas Petazzoni wrote:
> Hello,
> 
> On Wed, 14 Sep 2016 13:41:46 +0200, Jörg Krause wrote:
> > 
> > Use the provided pkg-config file of libupnpp to get the correct
> > LIBS.
> > 
> > Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
> > ---
> >  package/upmpdcli/upmpdcli.mk | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/package/upmpdcli/upmpdcli.mk
> > b/package/upmpdcli/upmpdcli.mk
> > index 3f521cf..208aa8f 100644
> > --- a/package/upmpdcli/upmpdcli.mk
> > +++ b/package/upmpdcli/upmpdcli.mk
> > @@ -17,12 +17,10 @@ UPMPDCLI_AUTORECONF = YES
> >  ifeq ($(BR2_STATIC_LIBS),y)
> >  # Upmpdcli forgets to take the dependencies of libupnpp into
> >  # consideration, breaking static linking, so help it.
> > -# Libupnpp unfortunately doesn't provide a .pc file, so manually
> > -# handle the dependencies here.
> >  # The build system doesn't expand LIBS from the configure step, so
> >  # manually pass it to make.
> >  UPMPDCLI_MAKE_OPTS = \
> > -	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs expat libcurl
> > libupnp`"
> > +	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libupnpp`"
> >  endif
> 
> Thanks to your patches, upmpdcli now uses pkg-config, so why do we
> still need to pass this custom LIBS value ?

Right, this is not needed anymore. Thanks!

Jörg
diff mbox

Patch

diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk
index 3f521cf..208aa8f 100644
--- a/package/upmpdcli/upmpdcli.mk
+++ b/package/upmpdcli/upmpdcli.mk
@@ -17,12 +17,10 @@  UPMPDCLI_AUTORECONF = YES
 ifeq ($(BR2_STATIC_LIBS),y)
 # Upmpdcli forgets to take the dependencies of libupnpp into
 # consideration, breaking static linking, so help it.
-# Libupnpp unfortunately doesn't provide a .pc file, so manually
-# handle the dependencies here.
 # The build system doesn't expand LIBS from the configure step, so
 # manually pass it to make.
 UPMPDCLI_MAKE_OPTS = \
-	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs expat libcurl libupnp`"
+	LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libupnpp`"
 endif
 
 # Upmpdcli only runs if user upmpdcli exists