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
#0 lore raw

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

We ensure that PKG_CONFIG is set to buildroot's host version of pkg-config.

---

A previous revision of this patch was submitted as [1].

[1] http://lists.busybox.net/pipermail/buildroot/2017-September/202911.html

 package/linux-tools/linux-tool-tmon.mk.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
package/linux-tools/linux-tool-tmon.mk.in +5 -4
index 15931c3..fe2db50 100644
@@ -8,8 +8,9 @@ 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)
+
+TARGET_CONFIGURE_OPTS += PKG_CONFIG="$(HOST_DIR)/bin/pkg-config"
 
 ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
 define TMON_DISABLE_STACK_PROTECTOR
@@ -24,13 +25,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

Please ignore this patch. There's a newer version of it already posted to the list. (I was a little slow cluing into Arnout's suggestions. My apologies.)

Thanks,
-Markus

Quoted 52 lines · Markus Mayer

We ensure that PKG_CONFIG is set to buildroot's host version of pkg-config.

---

A previous revision of this patch was submitted as [1].

[1] http://lists.busybox.net/pipermail/buildroot/2017-September/202911.html

 package/linux-tools/linux-tool-tmon.mk.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
package/linux-tools/linux-tool-tmon.mk.in +5 -5
index 15931c3..fe2db50 100644
@@ -8,8 +8,9 @@ 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)
+
+TARGET_CONFIGURE_OPTS += PKG_CONFIG="$(HOST_DIR)/bin/pkg-config"
 
 ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
 define TMON_DISABLE_STACK_PROTECTOR
@@ -24,13 +25,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
--

2.7.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot