Skip to contentSkip to conversation

package/linux-tools: set PKG_CONFIG for tmon builds

PATCH New Markus Mayer 2 participants 2 messages Sep 26, 2017

lore
Share & tools
lore

Markus Mayer

author
#0 lore raw

PATCH 1/1 package/linux-tools: set PKG_CONFIG for tmon builds

From: Markus Mayer <[email protected]>

We ensure that PKG_CONFIG is set to buildroot's host version of pkg-config. This is done by passing TARGET_CONFIGURE_OPTS instead of TARGET_MAKE_ENV to make. The former includes

    PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)"

while the latter doesn't.

Signed-off-by Markus Mayer <[email protected]>
---
 package/linux-tools/linux-tool-tmon.mk.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
package/linux-tools/linux-tool-tmon.mk.in +3 -4
index 15931c3..b62f547 100644
@@ -8,8 +8,7 @@ LINUX_TOOLS += tmon
 
 TMON_DEPENDENCIES = host-pkgconf ncurses
 TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \
-	CC=$(TARGET_CC) \
-	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
+	CC=$(TARGET_CC)
 
 ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
 define TMON_DISABLE_STACK_PROTECTOR

@@ -24,13 +23,13 @@ define TMON_BUILD_CMDS
 		exit 1 ; \
 	fi
 	$(TMON_DISABLE_STACK_PROTECTOR)
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(LINUX_DIR)/tools \
 		$(TMON_MAKE_OPTS) \
 		tmon
 endef
 
 define TMON_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(LINUX_DIR)/tools \
 		$(TMON_MAKE_OPTS) \
 		INSTALL_ROOT=$(TARGET_DIR) \
 		tmon_install
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/linux-tools: set PKG_CONFIG for tmon builds

Hi Markus,

Quoted 7 lines · Markus Mayer

From: Markus Mayer <[email protected]>

We ensure that PKG_CONFIG is set to buildroot's host version of pkg-config. This is done by passing TARGET_CONFIGURE_OPTS instead of TARGET_MAKE_ENV to make. The former includes

    PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)"

while the latter doesn't.

I was wrong when I asked you on IRC to submit this patch. Since the tmon
Makefile calls pkg-config directly (not PKG_CONFIG), this explanation is simply not true. So there really is no reason to change anything here.

Accordingly, I've marked the patch as Rejected in patchwork.

Sorry for the trouble!

Regards,
Arnout

Quoted 37 lines
Signed-off-by Markus Mayer <[email protected]>
---
 package/linux-tools/linux-tool-tmon.mk.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
package/linux-tools/linux-tool-tmon.mk.in +3 -4
index 15931c3..b62f547 100644
@@ -8,8 +8,7 @@ LINUX_TOOLS += tmon
 
 TMON_DEPENDENCIES = host-pkgconf ncurses
 TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \
-	CC=$(TARGET_CC) \
-	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
+	CC=$(TARGET_CC)
 
 ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
 define TMON_DISABLE_STACK_PROTECTOR

@@ -24,13 +23,13 @@ define TMON_BUILD_CMDS
 		exit 1 ; \
 	fi
 	$(TMON_DISABLE_STACK_PROTECTOR)
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(LINUX_DIR)/tools \
 		$(TMON_MAKE_OPTS) \
 		tmon
 endef
 
 define TMON_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(LINUX_DIR)/tools \
 		$(TMON_MAKE_OPTS) \
 		INSTALL_ROOT=$(TARGET_DIR) \
 		tmon_install
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF