mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-05 14:09:53 +03:00
packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_STAGING_OPT. Sed command used: find * -type f | xargs sed -i 's#_INSTALL_STAGING_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
57f2b8d255
commit
d6c32da881
@@ -38,7 +38,7 @@ PKG_PYTHON_DISTUTILS_BUILD_OPT = \
|
||||
PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
|
||||
--prefix=$(TARGET_DIR)/usr
|
||||
|
||||
PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \
|
||||
PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \
|
||||
--prefix=$(STAGING_DIR)/usr
|
||||
|
||||
# Host distutils-based packages
|
||||
@@ -62,7 +62,7 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \
|
||||
--single-version-externally-managed \
|
||||
--root=/
|
||||
|
||||
PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT = \
|
||||
PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \
|
||||
--prefix=$(STAGING_DIR)/usr \
|
||||
--executable=/usr/bin/python \
|
||||
--single-version-externally-managed \
|
||||
@@ -113,7 +113,7 @@ $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
|
||||
$(2)_BASE_BUILD_TGT = build
|
||||
$(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
|
||||
$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
|
||||
$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT)
|
||||
$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
|
||||
else
|
||||
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
|
||||
$(2)_BASE_BUILD_TGT = build
|
||||
@@ -127,7 +127,7 @@ $(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
|
||||
$(2)_BASE_BUILD_TGT = build
|
||||
$(2)_BASE_BUILD_OPT =
|
||||
$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
|
||||
$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT)
|
||||
$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
|
||||
else
|
||||
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
|
||||
$(2)_BASE_BUILD_TGT = build
|
||||
@@ -268,8 +268,8 @@ define $(2)_INSTALL_STAGING_CMDS
|
||||
(cd $$($$(PKG)_BUILDDIR)/; \
|
||||
$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
|
||||
$$($(2)_PYTHON_INTERPRETER) setup.py install \
|
||||
$$($$(PKG)_BASE_INSTALL_STAGING_OPT) \
|
||||
$$($$(PKG)_INSTALL_STAGING_OPT))
|
||||
$$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \
|
||||
$$($$(PKG)_INSTALL_STAGING_OPTS))
|
||||
endef
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user