*.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>
This commit is contained in:
parent
c7d660b18e
commit
8445501740
|
@ -24,7 +24,7 @@ EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
|
||||||
EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
|
EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
|
||||||
|
|
||||||
define ROOTFS_EXT2_CMD
|
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
|
endef
|
||||||
|
|
||||||
rootfs-ext2-symlink:
|
rootfs-ext2-symlink:
|
||||||
|
|
|
@ -232,7 +232,7 @@ HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
|
||||||
HOST_PERL_ARCHNAME := $(shell perl -MConfig -e "print Config->{archname}")
|
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
|
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)" \
|
AR="$(TARGET_AR)" \
|
||||||
AS="$(TARGET_AS)" \
|
AS="$(TARGET_AS)" \
|
||||||
LD="$(TARGET_LD)" \
|
LD="$(TARGET_LD)" \
|
||||||
|
@ -269,10 +269,10 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
|
||||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||||
STAGING_DIR="$(STAGING_DIR)"
|
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)" \
|
AR="$(HOSTAR)" \
|
||||||
AS="$(HOSTAS)" \
|
AS="$(HOSTAS)" \
|
||||||
LD="$(HOSTLD)" \
|
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" \
|
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
|
||||||
LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
|
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)" \
|
LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
|
||||||
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
|
||||||
PKG_CONFIG_SYSROOT_DIR="/" \
|
PKG_CONFIG_SYSROOT_DIR="/" \
|
||||||
|
|
|
@ -27,7 +27,7 @@ GPM_CONF_OPT = --without-curses
|
||||||
# configure is missing but gpm seems not compatible with our autoreconf
|
# 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
|
# mechanism so we have to do it manually instead of using GPM_AUTORECONF = YES
|
||||||
define GPM_RUN_AUTOGEN
|
define GPM_RUN_AUTOGEN
|
||||||
cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
|
cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
|
||||||
endef
|
endef
|
||||||
GPM_PRE_CONFIGURE_HOOKS += GPM_RUN_AUTOGEN
|
GPM_PRE_CONFIGURE_HOOKS += GPM_RUN_AUTOGEN
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ LIBHID_INSTALL_STAGING = YES
|
||||||
LIBHID_AUTORECONF = YES
|
LIBHID_AUTORECONF = YES
|
||||||
# configure runs libusb-config for cflags/ldflags. Ensure it picks up
|
# configure runs libusb-config for cflags/ldflags. Ensure it picks up
|
||||||
# the target version
|
# 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 = \
|
LIBHID_CONF_OPT = \
|
||||||
--disable-swig \
|
--disable-swig \
|
||||||
--disable-werror \
|
--disable-werror \
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
# Target distutils-based packages
|
# Target distutils-based packages
|
||||||
PKG_PYTHON_DISTUTILS_ENV = \
|
PKG_PYTHON_DISTUTILS_ENV = \
|
||||||
PATH="$(TARGET_PATH)" \
|
PATH=$(BR_PATH) \
|
||||||
CC="$(TARGET_CC)" \
|
CC="$(TARGET_CC)" \
|
||||||
CFLAGS="$(TARGET_CFLAGS)" \
|
CFLAGS="$(TARGET_CFLAGS)" \
|
||||||
LDFLAGS="$(TARGET_LDFLAGS)" \
|
LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||||
|
@ -40,14 +40,14 @@ PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
|
||||||
|
|
||||||
# Host distutils-based packages
|
# Host distutils-based packages
|
||||||
HOST_PKG_PYTHON_DISTUTILS_ENV = \
|
HOST_PKG_PYTHON_DISTUTILS_ENV = \
|
||||||
PATH="$(HOST_PATH)"
|
PATH=$(BR_PATH)
|
||||||
|
|
||||||
HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
|
HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
|
||||||
--prefix=$(HOST_DIR)/usr
|
--prefix=$(HOST_DIR)/usr
|
||||||
|
|
||||||
# Target setuptools-based packages
|
# Target setuptools-based packages
|
||||||
PKG_PYTHON_SETUPTOOLS_ENV = \
|
PKG_PYTHON_SETUPTOOLS_ENV = \
|
||||||
PATH="$(TARGET_PATH)" \
|
PATH=$(BR_PATH) \
|
||||||
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
|
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
|
||||||
_python_sysroot=$(STAGING_DIR) \
|
_python_sysroot=$(STAGING_DIR) \
|
||||||
_python_prefix=/usr \
|
_python_prefix=/usr \
|
||||||
|
@ -61,7 +61,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
|
||||||
|
|
||||||
# Host setuptools-based packages
|
# Host setuptools-based packages
|
||||||
HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
|
HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
|
||||||
PATH="$(HOST_PATH)"
|
PATH=$(BR_PATH)
|
||||||
|
|
||||||
HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
|
HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
|
||||||
--prefix=$(HOST_DIR)/usr
|
--prefix=$(HOST_DIR)/usr
|
||||||
|
|
|
@ -14,7 +14,7 @@ SDL_INSTALL_STAGING = YES
|
||||||
# we're patching configure.in, but package cannot autoreconf with our version of
|
# 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
|
# autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES
|
||||||
define SDL_RUN_AUTOGEN
|
define SDL_RUN_AUTOGEN
|
||||||
cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
|
cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
|
||||||
endef
|
endef
|
||||||
|
|
||||||
SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
|
SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
|
||||||
|
|
|
@ -129,7 +129,7 @@ endif
|
||||||
|
|
||||||
# Add HOST_DIR to PATH for codegenerator.mk to find swig
|
# Add HOST_DIR to PATH for codegenerator.mk to find swig
|
||||||
define XBMC_BOOTSTRAP
|
define XBMC_BOOTSTRAP
|
||||||
cd $(@D) && PATH=$(HOST_PATH) ./bootstrap
|
cd $(@D) && PATH=$(BR_PATH) ./bootstrap
|
||||||
endef
|
endef
|
||||||
XBMC_PRE_CONFIGURE_HOOKS += XBMC_BOOTSTRAP
|
XBMC_PRE_CONFIGURE_HOOKS += XBMC_BOOTSTRAP
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ ZNC_CONF_OPT = --disable-perl
|
||||||
# The standard <pkg>_AUTORECONF = YES invocation doesn't work for this
|
# The standard <pkg>_AUTORECONF = YES invocation doesn't work for this
|
||||||
# package, because it does not use automake in a normal way.
|
# package, because it does not use automake in a normal way.
|
||||||
define ZNC_RUN_AUTOGEN
|
define ZNC_RUN_AUTOGEN
|
||||||
cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
|
cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
|
||||||
endef
|
endef
|
||||||
ZNC_PRE_CONFIGURE_HOOKS += ZNC_RUN_AUTOGEN
|
ZNC_PRE_CONFIGURE_HOOKS += ZNC_RUN_AUTOGEN
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user