From: Peter Korsgaard Date: Fri, 2 Oct 2020 13:40:48 +0000 (+0200) Subject: package/python-fire.mk: drop test_components_py3.py file for python 2.x to fix pyfile... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6bfedaf57798c12f0e6279b8361fd5ec4244db8c;p=buildroot.git package/python-fire.mk: drop test_components_py3.py file for python 2.x to fix pyfile issue Fixes: http://autobuild.buildroot.net/results/72e0cc78194a1b93bf26a50742e59a1e93bde1d1/ fire has conditional logic to load test_components_py3.py when running under Python 3.x: if six.PY3: from fire import test_components_py3 as py3 pycompile unfortunately errors out on it: ../scripts/pycompile.py .. error: File "/usr/lib/python2.7/site-packages/fire/test_components_py3.py", line 18 def identity(arg1, arg2: int, arg3=10, arg4: int = 20, *arg5, ^ SyntaxError: invalid syntax As a workaround, simply drop the unusable _py3 file from TARGET_DIR if building for python 2.x. Signed-off-by: Peter Korsgaard --- diff --git a/package/python-fire/python-fire.mk b/package/python-fire/python-fire.mk index 343abbca7d..f6a2e073f0 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -11,4 +11,13 @@ PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_FIRE_RM_PY3_FILE + rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/fire/test_components_py3.py +endef + +PYTHON_FIRE_POST_INSTALL_TARGET_HOOKS += PYTHON_FIRE_RM_PY3_FILE +endif + $(eval $(python-package))