All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v4 0/7] PATH cleanup
@ 2014-02-16 13:58 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
                   ` (6 more replies)
  0 siblings, 7 replies; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

Hi all,

Another round for this series, with this time, as main change: the
renaming of BR2_PATH into BR_PATH, to follow what has been stated
during the last Buildroot developper metting.

Note that this series has been rebased on top of the next branch.

Yours,
Samuel


Samuel Martin (7):
  bustle: use TARGET_MAKE_ENV instead of setting PATH in the make
    environment
  Makefile: introduce BR_PATH
  Makefile: add $(HOST_DIR)/sbin to BR_PATH
  *.mk: replace (TARGET|HOST)_PATH by BR_PATH
  infra: remove unused {TARGET, HOST}_PATH definition
  pkg-cmake.mk: add PATH in the configure command environment
  Makefile: export PATH

 Makefile                 |  4 ++++
 fs/ext2/ext2.mk          |  2 +-
 package/Makefile.in      | 13 ++++---------
 package/bustle/bustle.mk |  2 +-
 package/gpm/gpm.mk       |  2 +-
 package/libhid/libhid.mk |  2 +-
 package/pkg-cmake.mk     |  2 ++
 package/pkg-python.mk    |  8 ++++----
 package/sdl/sdl.mk       |  2 +-
 9 files changed, 19 insertions(+), 18 deletions(-)

--
1.8.5.4

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 1/7] bustle: use TARGET_MAKE_ENV instead of setting PATH in the make environment
  2014-02-16 13:58 [Buildroot] [PATCH v4 0/7] PATH cleanup Samuel Martin
@ 2014-02-16 13:58 ` Samuel Martin
  2014-02-18 15:35   ` Thomas Petazzoni
  2014-02-16 13:58 ` [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH Samuel Martin
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

TARGET_MAKE_ENV already contains the PATH definition among other useful
variables.

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

---
changes v3 -> v4:
- add this change to the series (ThomasP)
---
 package/bustle/bustle.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/bustle/bustle.mk b/package/bustle/bustle.mk
index 2330c08..7bc3e97 100644
--- a/package/bustle/bustle.mk
+++ b/package/bustle/bustle.mk
@@ -11,7 +11,7 @@ BUSTLE_LICENSE_FILES = LICENSE
 BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
 
 define BUSTLE_BUILD_CMDS
-	PATH=$(TARGET_PATH) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		PCAP_FLAGS='-lpcap' -C $(@D) dist/build/bustle-pcap
 endef
 
-- 
1.8.5.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH
  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-16 13:58 ` Samuel Martin
  2014-02-18  6:25   ` Arnout Vandecappelle
  2014-02-16 13:58 ` [Buildroot] [PATCH v4 3/7] Makefile: add $(HOST_DIR)/sbin to BR_PATH Samuel Martin
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

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

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 3/7] Makefile: add $(HOST_DIR)/sbin to BR_PATH
  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-16 13:58 ` [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH Samuel Martin
@ 2014-02-16 13:58 ` Samuel Martin
  2014-02-16 13:58 ` [Buildroot] [PATCH v4 4/7] *.mk: replace (TARGET|HOST)_PATH by BR_PATH Samuel Martin
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

Extend BR_PATH because a few host-packages install programs in this
location.

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

---
changes v3 -> v4:
- rebase
- fix typo in commit log (ThomasP)
- rename BR2_PATH -> BR_PATH

changes v2 -> v3:
- rebase

changes v1 -> v2:
- rebase
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 138e0ef..bb5b38e 100644
--- a/Makefile
+++ b/Makefile
@@ -326,7 +326,7 @@ TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 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)"
+BR_PATH:="$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"
 
 # locales to generate
 GENERATE_LOCALE=$(call qstrip,$(BR2_GENERATE_LOCALE))
-- 
1.8.5.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 4/7] *.mk: replace (TARGET|HOST)_PATH by BR_PATH
  2014-02-16 13:58 [Buildroot] [PATCH v4 0/7] PATH cleanup Samuel Martin
                   ` (2 preceding siblings ...)
  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 ` 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
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

Thanks to the 2 previous patches of the series, BR_PATH contains
all locations in which host-packages may install programs.

This patch replaces the occurrences TARGET_PATH and HOST_PATH with
BR_PATH, everywhere these variables are used in the *.mk files.

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

---
changes v3 -> v4:
- rebase
- fix typo in commit log (ThomasP)
- rename BR2_PATH -> BR_PATH
- make substitution of new occurenrces (gpm.mk)

changes v2 -> v3:
- rebase
- no one-line commit log (ThomasP)

changes v1 -> v2:
- make substitution of new occurenrces (pkg-python.mk and sdl.mk)
---
 fs/ext2/ext2.mk          | 2 +-
 package/Makefile.in      | 9 ++++-----
 package/gpm/gpm.mk       | 2 +-
 package/libhid/libhid.mk | 2 +-
 package/pkg-python.mk    | 8 ++++----
 package/sdl/sdl.mk       | 2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index 0af955f..1bc49da 100644
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -24,7 +24,7 @@ EXT2_ENV  = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
 EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
 
 define ROOTFS_EXT2_CMD
-	PATH=$(TARGET_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
+	PATH=$(BR_PATH) $(EXT2_ENV) fs/ext2/genext2fs.sh -d $(TARGET_DIR) $(EXT2_OPTS) $@
 endef
 
 rootfs-ext2-symlink:
diff --git a/package/Makefile.in b/package/Makefile.in
index 15b7e3c..9a3ad57 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -208,7 +208,7 @@ HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
 
 export PERL5LIB := $(HOST_DIR)/usr/lib/perl
 
-TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
+TARGET_CONFIGURE_OPTS=PATH=$(BR_PATH) \
 		AR="$(TARGET_AR)" \
 		AS="$(TARGET_AS)" \
 		LD="$(TARGET_LD)" \
@@ -245,10 +245,9 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		STAGING_DIR="$(STAGING_DIR)"
 
-TARGET_MAKE_ENV=PATH=$(TARGET_PATH)
+TARGET_MAKE_ENV=PATH=$(BR_PATH)
 
-
-HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
+HOST_CONFIGURE_OPTS=PATH=$(BR_PATH) \
 		AR="$(HOSTAR)" \
 		AS="$(HOSTAS)" \
 		LD="$(HOSTLD)" \
@@ -270,7 +269,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
 
-HOST_MAKE_ENV=PATH=$(HOST_PATH) \
+HOST_MAKE_ENV=PATH=$(BR_PATH) \
 		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_SYSROOT_DIR="/" \
diff --git a/package/gpm/gpm.mk b/package/gpm/gpm.mk
index 85fdad6..d927bab 100644
--- a/package/gpm/gpm.mk
+++ b/package/gpm/gpm.mk
@@ -27,7 +27,7 @@ GPM_CONF_OPT = --without-curses
 # configure is missing but gpm seems not compatible with our autoreconf
 # mechanism so we have to do it manually instead of using GPM_AUTORECONF = YES
 define GPM_RUN_AUTOGEN
-	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
 endef
 GPM_PRE_CONFIGURE_HOOKS += GPM_RUN_AUTOGEN
 
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index 1b9b895..30501d5 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -11,7 +11,7 @@ LIBHID_INSTALL_STAGING = YES
 LIBHID_AUTORECONF = YES
 # configure runs libusb-config for cflags/ldflags. Ensure it picks up
 # the target version
-LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(TARGET_PATH)
+LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH)
 LIBHID_CONF_OPT = \
 	--disable-swig \
 	--disable-werror \
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
index a862895..f28aa89 100644
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -22,7 +22,7 @@
 
 # Target distutils-based packages
 PKG_PYTHON_DISTUTILS_ENV = \
-	PATH="$(TARGET_PATH)" \
+	PATH="$(BR_PATH)" \
 	CC="$(TARGET_CC)" \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -40,14 +40,14 @@ PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
 
 # Host distutils-based packages
 HOST_PKG_PYTHON_DISTUTILS_ENV = \
-	PATH="$(HOST_PATH)"
+	PATH="$(BR_PATH)"
 
 HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
 	--prefix=$(HOST_DIR)/usr
 
 # Target setuptools-based packages
 PKG_PYTHON_SETUPTOOLS_ENV = \
-	PATH="$(TARGET_PATH)" \
+	PATH="$(BR_PATH)" \
 	PYTHONPATH="$(PYTHON_PATH)" \
 	_python_sysroot=$(STAGING_DIR) \
 	_python_prefix=/usr \
@@ -61,7 +61,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
 
 # Host setuptools-based packages
 HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
-	PATH="$(HOST_PATH)"
+	PATH="$(BR_PATH)"
 
 HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
 	--prefix=$(HOST_DIR)/usr
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index cf3366d..efa2455 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -14,7 +14,7 @@ SDL_INSTALL_STAGING = YES
 # we're patching configure.in, but package cannot autoreconf with our version of
 # autotools, so we have to do it manually instead of setting SD_AUTORECONF = YES
 define SDL_RUN_AUTOGEN
-	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
+	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
 endef
 
 SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
-- 
1.8.5.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 5/7] infra: remove unused {TARGET, HOST}_PATH definition
  2014-02-16 13:58 [Buildroot] [PATCH v4 0/7] PATH cleanup Samuel Martin
                   ` (3 preceding siblings ...)
  2014-02-16 13:58 ` [Buildroot] [PATCH v4 4/7] *.mk: replace (TARGET|HOST)_PATH by BR_PATH Samuel Martin
@ 2014-02-16 13:58 ` 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
  6 siblings, 0 replies; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

Since the variables TARGET_PATH and HOST_PATH are not used anymore,
let's remove them.

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

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

changes v2 -> v3:
- rebase
- no one-line commit log (ThomasP)

changes v1 -> v2:
- rebase
---
 package/Makefile.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index 9a3ad57..d064ff5 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -144,9 +144,6 @@ else
 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 = $(BR_PATH)
-
 # Define TARGET_xx variables for all common binutils/gcc
 TARGET_AR       = $(TARGET_CROSS)ar
 TARGET_AS       = $(TARGET_CROSS)as
@@ -200,7 +197,6 @@ 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 = $(BR_PATH)
 
 # hostcc version as an integer - E.G. 4.3.2 => 432
 HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
-- 
1.8.5.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 6/7] pkg-cmake.mk: add PATH in the configure command environment
  2014-02-16 13:58 [Buildroot] [PATCH v4 0/7] PATH cleanup Samuel Martin
                   ` (4 preceding siblings ...)
  2014-02-16 13:58 ` [Buildroot] [PATCH v4 5/7] infra: remove unused {TARGET, HOST}_PATH definition Samuel Martin
@ 2014-02-16 13:58 ` Samuel Martin
  2014-02-16 13:58 ` [Buildroot] [PATCH v4 7/7] Makefile: export PATH Samuel Martin
  6 siblings, 0 replies; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

Because BR2_PATH is not exported in the environment beforehand running
cmake, it is necessary to add it on the cmake configure command.

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

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

changes v2 -> v3:
- rebase
- no one-line commit log (ThomasP)

changes v1 -> v2:
- remove explicit PATH=... in configure commands in pkg-autotools.mk
  because it is already added via *_CONFIGURE_OPTS (ThomasP), and
  reword the commit message.
---
 package/pkg-cmake.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index f7e454b..bf3db90 100644
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -60,6 +60,7 @@ ifeq ($(4),target)
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	PATH=$(BR_PATH) \
 	$$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
 		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
@@ -74,6 +75,7 @@ else
 define $(2)_CONFIGURE_CMDS
 	(cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
+	PATH=$(BR_PATH) \
 	$(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \
 		-DCMAKE_INSTALL_SO_NO_EXE=0 \
 		-DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \
-- 
1.8.5.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 7/7] Makefile: export PATH
  2014-02-16 13:58 [Buildroot] [PATCH v4 0/7] PATH cleanup Samuel Martin
                   ` (5 preceding siblings ...)
  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 ` Samuel Martin
  2014-02-18  6:32   ` Arnout Vandecappelle
  6 siblings, 1 reply; 14+ messages in thread
From: Samuel Martin @ 2014-02-16 13:58 UTC (permalink / raw)
  To: buildroot

This can be useful for:
- package using custom build system that are not aware that the host
  tree is in $(O)/host/;
- post-{build,image} scripts, in case some host-tools were specifically
  built to be used by these scripts.

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

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

changes v2 -> v3:
- rebase
- extend commit loghanges v2 -> v3:

changes v1 -> v2:
- extend commit message
---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index bb5b38e..ca2d721 100644
--- a/Makefile
+++ b/Makefile
@@ -353,6 +353,7 @@ export STAGING_DIR
 export HOST_DIR
 export BINARIES_DIR
 export BASE_DIR
+export PATH:=$(BR_PATH)
 
 ################################################################################
 #
-- 
1.8.5.4

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH
  2014-02-16 13:58 ` [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH Samuel Martin
@ 2014-02-18  6:25   ` Arnout Vandecappelle
  0 siblings, 0 replies; 14+ messages in thread
From: Arnout Vandecappelle @ 2014-02-18  6:25 UTC (permalink / raw)
  To: buildroot

On 16/02/14 14:58, Samuel Martin wrote:
> 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)

 This comment is redundant.

> +BR_PATH:="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"

 Use = instead of := and put spaces around it.

 Also, the quoting is really redundant. The original comment said "Quotes
are needed for spaces et al in path components", but since that was only
done for TARGET_PATH and not for HOST_PATH it didn't work in the first
place. In addition, we also don't add quotes around the other uses of
HOST_DIR etc., so it's just $(PATH) itself that we're protecting. If you
do keep the quotes, at least copy the comment.


> +
>  # 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.

 This comment is no longer in the right place.


 Regards,
 Arnout

> -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 | \
> 


-- 
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 4/7] *.mk: replace (TARGET|HOST)_PATH by BR_PATH
  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
  0 siblings, 0 replies; 14+ messages in thread
From: Arnout Vandecappelle @ 2014-02-18  6:28 UTC (permalink / raw)
  To: buildroot

On 16/02/14 14:58, Samuel Martin wrote:
> Thanks to the 2 previous patches of the series, BR_PATH contains
> all locations in which host-packages may install programs.
> 
> This patch replaces the occurrences TARGET_PATH and HOST_PATH with
> BR_PATH, everywhere these variables are used in the *.mk files.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout

-- 
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 7/7] Makefile: export PATH
  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
  0 siblings, 1 reply; 14+ messages in thread
From: Arnout Vandecappelle @ 2014-02-18  6:32 UTC (permalink / raw)
  To: buildroot

On 16/02/14 14:58, Samuel Martin wrote:
> This can be useful for:
> - package using custom build system that are not aware that the host
>   tree is in $(O)/host/;
> - post-{build,image} scripts, in case some host-tools were specifically
>   built to be used by these scripts.

 This makes all the previous patches redundant, since the PATH=...
invocations should be removed instead of renamed.

> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> 
> ---
> changes v3 -> v4:
> - rebase
> - rename BR2_PATH -> BR_PATH
> 
> changes v2 -> v3:
> - rebase
> - extend commit loghanges v2 -> v3:
> 
> changes v1 -> v2:
> - extend commit message
> ---
>  Makefile | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Makefile b/Makefile
> index bb5b38e..ca2d721 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -353,6 +353,7 @@ export STAGING_DIR
>  export HOST_DIR
>  export BINARIES_DIR
>  export BASE_DIR
> +export PATH:=$(BR_PATH)

 With this change, the := in BR_PATH becomes essential. There should be a
comment there to explain why. Also, the assignment to BR_PATH and to PATH
should be right next to each other (the export can stay here, though).

 And in fact, BR_PATH becomes completely redundant, it's sufficient to
have a single PATH := ....:$(PATH)

 Regards,
 Arnout
>  
>  ################################################################################
>  #
> 


-- 
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 1/7] bustle: use TARGET_MAKE_ENV instead of setting PATH in the make environment
  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
  0 siblings, 0 replies; 14+ messages in thread
From: Thomas Petazzoni @ 2014-02-18 15:35 UTC (permalink / raw)
  To: buildroot

Dear Samuel Martin,

On Sun, 16 Feb 2014 14:58:27 +0100, Samuel Martin wrote:
> TARGET_MAKE_ENV already contains the PATH definition among other useful
> variables.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 7/7] Makefile: export PATH
  2014-02-18  6:32   ` Arnout Vandecappelle
@ 2014-02-18 15:37     ` Thomas Petazzoni
  2014-02-18 15:55       ` Samuel Martin
  0 siblings, 1 reply; 14+ messages in thread
From: Thomas Petazzoni @ 2014-02-18 15:37 UTC (permalink / raw)
  To: buildroot

Dear Arnout Vandecappelle,

On Tue, 18 Feb 2014 07:32:48 +0100, Arnout Vandecappelle wrote:
> On 16/02/14 14:58, Samuel Martin wrote:
> > This can be useful for:
> > - package using custom build system that are not aware that the host
> >   tree is in $(O)/host/;
> > - post-{build,image} scripts, in case some host-tools were specifically
> >   built to be used by these scripts.
> 
>  This makes all the previous patches redundant, since the PATH=...
> invocations should be removed instead of renamed.

Agreed. Samuel, you should make a choice:

 * Either you use BR_PATH, and we continue to pass PATH=$(BR_PATH)
   whenever the PATH is needed.

 * Or you simply directly export PATH with the right value, and remove
   all occurrences where we manually pass PATH=<something>.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [Buildroot] [PATCH v4 7/7] Makefile: export PATH
  2014-02-18 15:37     ` Thomas Petazzoni
@ 2014-02-18 15:55       ` Samuel Martin
  0 siblings, 0 replies; 14+ messages in thread
From: Samuel Martin @ 2014-02-18 15:55 UTC (permalink / raw)
  To: buildroot

Arnout, Thomas,

On Tue, Feb 18, 2014 at 4:37 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Arnout Vandecappelle,
>
> On Tue, 18 Feb 2014 07:32:48 +0100, Arnout Vandecappelle wrote:
>> On 16/02/14 14:58, Samuel Martin wrote:
>> > This can be useful for:
>> > - package using custom build system that are not aware that the host
>> >   tree is in $(O)/host/;
>> > - post-{build,image} scripts, in case some host-tools were specifically
>> >   built to be used by these scripts.
>>
>>  This makes all the previous patches redundant, since the PATH=...
>> invocations should be removed instead of renamed.
>
> Agreed. Samuel, you should make a choice:
>
>  * Either you use BR_PATH, and we continue to pass PATH=$(BR_PATH)
>    whenever the PATH is needed.
>
>  * Or you simply directly export PATH with the right value, and remove
>    all occurrences where we manually pass PATH=<something>.

Ok.
It was not clear whether the export would be accepted...
So I followed the secure way, thinking that the PATH usage could be
cleaned up later ;-)

Anyway, now it's my call. :)
Thanks for clarification.


Regards,


-- 
Samuel

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2014-02-18 15:55 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [Buildroot] [PATCH v4 2/7] Makefile: introduce BR_PATH Samuel Martin
2014-02-18  6:25   ` 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

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.