* [Buildroot] [PATCH] package/linux-tools: set PKG_CONFIG for tmon builds
@ 2017-09-26 18:03 Markus Mayer
2017-09-26 19:23 ` Markus Mayer
0 siblings, 1 reply; 4+ messages in thread
From: Markus Mayer @ 2017-09-26 18:03 UTC (permalink / raw)
To: buildroot
We ensure that PKG_CONFIG is set to buildroot's host version of
pkg-config.
Signed-off-by: Markus Mayer <mmayer@broadcom.com>
---
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(-)
diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in
index 15931c3..fe2db50 100644
--- a/package/linux-tools/linux-tool-tmon.mk.in
+++ b/package/linux-tools/linux-tool-tmon.mk.in
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] package/linux-tools: set PKG_CONFIG for tmon builds
@ 2017-09-26 19:08 Markus Mayer
2017-09-26 19:53 ` Arnout Vandecappelle
0 siblings, 1 reply; 4+ messages in thread
From: Markus Mayer @ 2017-09-26 19:08 UTC (permalink / raw)
To: buildroot
From: Markus Mayer <mmayer@broadcom.com>
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 <mmayer@broadcom.com>
---
package/linux-tools/linux-tool-tmon.mk.in | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in
index 15931c3..b62f547 100644
--- a/package/linux-tools/linux-tool-tmon.mk.in
+++ b/package/linux-tools/linux-tool-tmon.mk.in
@@ -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
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] package/linux-tools: set PKG_CONFIG for tmon builds
2017-09-26 18:03 Markus Mayer
@ 2017-09-26 19:23 ` Markus Mayer
0 siblings, 0 replies; 4+ messages in thread
From: Markus Mayer @ 2017-09-26 19:23 UTC (permalink / raw)
To: buildroot
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
On 26 September 2017 at 11:03, Markus Mayer <mmayer@broadcom.com> wrote:
> We ensure that PKG_CONFIG is set to buildroot's host version of
> pkg-config.
>
> Signed-off-by: Markus Mayer <mmayer@broadcom.com>
> ---
>
> 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(-)
>
> diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in
> index 15931c3..fe2db50 100644
> --- a/package/linux-tools/linux-tool-tmon.mk.in
> +++ b/package/linux-tools/linux-tool-tmon.mk.in
> @@ -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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] package/linux-tools: set PKG_CONFIG for tmon builds
2017-09-26 19:08 [Buildroot] [PATCH] package/linux-tools: set PKG_CONFIG for tmon builds Markus Mayer
@ 2017-09-26 19:53 ` Arnout Vandecappelle
0 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2017-09-26 19:53 UTC (permalink / raw)
To: buildroot
Hi Markus,
On 26-09-17 21:08, Markus Mayer wrote:
> From: Markus Mayer <mmayer@broadcom.com>
>
> 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
>
> Signed-off-by: Markus Mayer <mmayer@broadcom.com>
> ---
> package/linux-tools/linux-tool-tmon.mk.in | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in
> index 15931c3..b62f547 100644
> --- a/package/linux-tools/linux-tool-tmon.mk.in
> +++ b/package/linux-tools/linux-tool-tmon.mk.in
> @@ -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
>
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-09-26 19:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-26 19:08 [Buildroot] [PATCH] package/linux-tools: set PKG_CONFIG for tmon builds Markus Mayer
2017-09-26 19:53 ` Arnout Vandecappelle
-- strict thread matches above, loose matches on Subject: below --
2017-09-26 18:03 Markus Mayer
2017-09-26 19:23 ` Markus Mayer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox