Patchwork [PATCHv6,5/5] iw: pkg-config cleanup

login
register
mail settings
Submitter Gustavo Zacarias
Date Oct. 23, 2012, 1:47 a.m.
Message ID <1350956875-1726-5-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/193311/
State Superseded
Headers show

Comments

Gustavo Zacarias - Oct. 23, 2012, 1:47 a.m.
We no longer need to specify PKG_CONFIG_PATH since it's handled by the
host-pkgconf wrapper.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/iw/iw.mk |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Thomas Petazzoni - Oct. 24, 2012, 10:52 p.m.
Dear Gustavo Zacarias,

On Mon, 22 Oct 2012 22:47:55 -0300, Gustavo Zacarias wrote:
> We no longer need to specify PKG_CONFIG_PATH since it's handled by the
> host-pkgconf wrapper.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

but a followup patch might be useful:

> -IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
> -	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
> +IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
>  	GIT_DIR=$(IW_DIR)

I think the PKG_CONFIG variable can be removed as well. All packages
are being compiled with TARGET_MAKE_ENV, which includes
PATH=$(TARGET_PATH), which ensures that $(HOST_DIR)/usr/bin is in the
PATH before all other directories in your PATH. So 'iw' should
automatically pick up the right pkg-config without having to specify
this PKG_CONFIG variable.

Best regards,

Thomas
Arnout Vandecappelle - Oct. 25, 2012, 9:30 p.m.
On 25/10/12 00:52, Thomas Petazzoni wrote:
>> >  -IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
>> >  -	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
>> >  +IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
>> >    	GIT_DIR=$(IW_DIR)
> I think the PKG_CONFIG variable can be removed as well. All packages
> are being compiled with TARGET_MAKE_ENV, which includes

  iw.mk doesn't use TARGET_MAKE_ENV, but it probably should.

  Regards,
  Arnout

Patch

diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 7633124..651a2ca 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -9,8 +9,7 @@  IW_SOURCE = iw-$(IW_VERSION).tar.bz2
 IW_SITE = http://wireless.kernel.org/download/iw
 IW_DEPENDENCIES = host-pkgconf libnl
 IW_CONFIG = $(IW_DIR)/.config
-IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
+IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)