*.mk: replace (TARGET|HOST)_PATH by BR_PATH

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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
index 0af955fb6a15c0a4f6196f000540635b67ef9891..1bc49daee91a025d0d557a6f54d66c24d7e85b1b 100644 (file)
--- 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 f7c9bca5507594e1d27c27f910938a67ebfa26c1..0bce59928323a8a808145efe5fb89272918f3bc3 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -232,7 +232,7 @@ HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
 HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}")
 export PERL5LIB := $(HOST_DIR)/usr/lib/perl5/$(HOST_PERL_ARCHNAME):$(HOST_DIR)/usr/lib/perl5
 
-TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
+TARGET_CONFIGURE_OPTS=PATH=$(BR_PATH) \
                AR="$(TARGET_AR)" \
                AS="$(TARGET_AS)" \
                LD="$(TARGET_LD)" \
@@ -269,10 +269,10 @@ 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)" \
@@ -294,7 +294,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 85fdad6ff89ee8fb7d868f513f91ec7a6952aabd..d927bab1ce2eb3434b66a5b61b88175d8ba8d68c 100644 (file)
--- 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 1b9b8958cd471174e2bd9c056fb2a915ab28c4d7..30501d543c6c23f2d62d407015a7534c922052ea 100644 (file)
--- 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 d6786a3400512e6586d9625dd39dfb901937c849..e903c23e78a1680bf87a7f5568a43f7baf557671 100644 (file)
--- 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="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(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 086f5e98a792949eae7832f5a83e435effc684dd..d36f3ff380a42b0d5dc549627216bf1c1e951c52 100644 (file)
--- 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 SDL_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

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 69bb1ef325b3eba75f3e7945ac5bacc1c6835876..7453db5c9069837c66d1857350204ec18bd68fd9 100644 (file)
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -129,7 +129,7 @@ endif
 
 # Add HOST_DIR to PATH for codegenerator.mk to find swig
 define XBMC_BOOTSTRAP
-       cd $(@D) && PATH=$(HOST_PATH) ./bootstrap
+       cd $(@D) && PATH=$(BR_PATH) ./bootstrap
 endef
 XBMC_PRE_CONFIGURE_HOOKS += XBMC_BOOTSTRAP
 

diff --git a/package/znc/znc.mk b/package/znc/znc.mk
index 5e9b45b9c2e95bc98aea913d2f1baa1a448e5dce..6d367dc0b3356ffcfd731f635406da112fe3e819 100644 (file)
--- a/package/znc/znc.mk
+++ b/package/znc/znc.mk
@@ -14,7 +14,7 @@ ZNC_CONF_OPT = --disable-perl
 # The standard <pkg>_AUTORECONF = YES invocation doesn't work for this
 # package, because it does not use automake in a normal way.
 define ZNC_RUN_AUTOGEN
-       cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
+       cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
 endef
 ZNC_PRE_CONFIGURE_HOOKS += ZNC_RUN_AUTOGEN