| Message ID | 20230930221727.1458825-3-arnout@mind.be |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/pkg-python.mk: refactor setup-type variables | expand |
Arnout, All, On 2023-10-01 00:16 +0200, Arnout Vandecappelle via buildroot spake thusly: > This variable can just as well be merged into _BASE_BUILD_CMD. This is > how it's done for the install opts. And anyway it's only used by > distutils and nowhere else. > > Signed-off-by: Arnout Vandecappelle <arnout@mind.be> Applied to next, thanks. Regards, Yann E. MORIN. > --- > package/pkg-python.mk | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/package/pkg-python.mk b/package/pkg-python.mk > index 1fc096efb3..eacf75c165 100644 > --- a/package/pkg-python.mk > +++ b/package/pkg-python.mk > @@ -198,8 +198,7 @@ endif > ifeq ($$($(2)_SETUP_TYPE),distutils) > ifeq ($(4),target) > $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) > -$(2)_BASE_BUILD_CMD = setup.py build > -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) > +$(2)_BASE_BUILD_CMD = setup.py build $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) > $(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) > $(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) > else > @@ -335,7 +334,7 @@ define $(2)_BUILD_CMDS > $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ > $$(HOST_DIR)/bin/python3 \ > $$($$(PKG)_BASE_BUILD_CMD) \ > - $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) > + $$($$(PKG)_BUILD_OPTS)) > endef > endif > > -- > 2.41.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 1fc096efb3..eacf75c165 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -198,8 +198,7 @@ endif ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_CMD = setup.py build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) $(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) $(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else @@ -335,7 +334,7 @@ define $(2)_BUILD_CMDS $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ $$(HOST_DIR)/bin/python3 \ $$($$(PKG)_BASE_BUILD_CMD) \ - $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) + $$($$(PKG)_BUILD_OPTS)) endef endif
This variable can just as well be merged into _BASE_BUILD_CMD. This is how it's done for the install opts. And anyway it's only used by distutils and nowhere else. Signed-off-by: Arnout Vandecappelle <arnout@mind.be> --- package/pkg-python.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)