All of lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH
Date: Sun, 16 Feb 2014 14:58:28 +0100	[thread overview]
Message-ID: <1392559113-5215-3-git-send-email-s.martin49@gmail.com> (raw)
In-Reply-To: <1392559113-5215-1-git-send-email-s.martin49@gmail.com>

Since the HOST_PATH and TARGET_PATH variables almost contain the same
things, let's factorize this in a single BR_PATH.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>

---
changes v3 -> v4:
- rebase
- rename BR2_PATH -> BR_PATH

changes v2 -> v3:
- rebase

changes v1 -> v2:
- rebase
---
 Makefile            | 3 +++
 package/Makefile.in | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 20aabd6..138e0ef 100644
--- a/Makefile
+++ b/Makefile
@@ -325,6 +325,9 @@ TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 # packages compiled for the host go here
 HOST_DIR:=$(call qstrip,$(BR2_HOST_DIR))
 
+# Set BR_PATH (including host bindirs)
+BR_PATH:="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"
+
 # locales to generate
 GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))
 
diff --git a/package/Makefile.in b/package/Makefile.in
index eea7043..15b7e3c 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -145,7 +145,7 @@ TARGET_CROSS=$(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
 endif
 
 # Quotes are needed for spaces et al in path components.
-TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(PATH)"
+TARGET_PATH = $(BR_PATH)
 
 # Define TARGET_xx variables for all common binutils/gcc
 TARGET_AR       = $(TARGET_CROSS)ar
@@ -200,7 +200,7 @@ HOST_CFLAGS   ?= -O2
 HOST_CFLAGS   += $(HOST_CPPFLAGS)
 HOST_CXXFLAGS += $(HOST_CFLAGS)
 HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
-HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
+HOST_PATH = $(BR_PATH)
 
 # hostcc version as an integer - E.G. 4.3.2 => 432
 HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
-- 
1.8.5.4

  parent reply	other threads:[~2014-02-16 13:58 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-16 13:58 [Buildroot] [PATCH v4 0/7] PATH cleanup Samuel Martin
2014-02-16 13:58 ` [Buildroot] [PATCH v4 1/7] bustle: use TARGET_MAKE_ENV instead of setting PATH in the make environment Samuel Martin
2014-02-18 15:35   ` Thomas Petazzoni
2014-02-16 13:58 ` Samuel Martin [this message]
2014-02-18  6:25   ` [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH Arnout Vandecappelle
2014-02-16 13:58 ` [Buildroot] [PATCH v4 3/7] Makefile: add $(HOST_DIR)/sbin to BR_PATH Samuel Martin
2014-02-16 13:58 ` [Buildroot] [PATCH v4 4/7] *.mk: replace (TARGET|HOST)_PATH by BR_PATH Samuel Martin
2014-02-18  6:28   ` Arnout Vandecappelle
2014-02-16 13:58 ` [Buildroot] [PATCH v4 5/7] infra: remove unused {TARGET, HOST}_PATH definition Samuel Martin
2014-02-16 13:58 ` [Buildroot] [PATCH v4 6/7] pkg-cmake.mk: add PATH in the configure command environment Samuel Martin
2014-02-16 13:58 ` [Buildroot] [PATCH v4 7/7] Makefile: export PATH Samuel Martin
2014-02-18  6:32   ` Arnout Vandecappelle
2014-02-18 15:37     ` Thomas Petazzoni
2014-02-18 15:55       ` Samuel Martin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392559113-5215-3-git-send-email-s.martin49@gmail.com \
    --to=s.martin49@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.