Commit 84455017 authored by Samuel Martin's avatar Samuel Martin Committed by Thomas Petazzoni
Browse files

*.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: default avatarSamuel Martin <s.martin49@gmail.com>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c7d660b1

fs/ext2/ext2.mk

+1 −1
Original line number Diff line number Diff line
@@ -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:

package/Makefile.in

+4 −4
Original line number Diff line number Diff line
@@ -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="/" \

package/gpm/gpm.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

package/libhid/libhid.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \

package/pkg-python.mk

+4 −4
Original line number Diff line number Diff line
@@ -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