From 6728c67307858a103456a05a3daaddbbb49dba36 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 30 Sep 2020 09:31:57 +0200 Subject: [PATCH] package/python-txtorcon.mk: drop _py3 file for python 2.x to fix pycompile issue Fixes: http://autobuild.buildroot.net/results/76b580000e6311e88584874f942517badd6fadf6/ python-txtorcon DOES support python 2.x, but it contains some optional python 3 / async code in controller_py3.py which is conditionally used from controller.py: try: from .controller_py3 import _AsyncOnionAuthContext HAVE_ASYNC = True except Exception: HAVE_ASYNC = False pycompile unfortunately errors out on the async code: ../scripts/pycompile.py .. error: File "/usr/lib/python2.7/site-packages/txtorcon/controller_py3.py", line 13 async def __aenter__(self): ^ 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 Signed-off-by: Yann E. MORIN --- package/python-txtorcon/python-txtorcon.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index a01c0b2511..4df400c3e7 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -11,4 +11,13 @@ PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_PYTHON),y) +# only needed/valid for python 3.x +define PYTHON_TXTORCON_RM_PY3_FILE + rm -f $(TARGET_DIR)/usr/lib/python*/site-packages/txtorcon/controller_py3.py +endef + +PYTHON_TXTORCON_POST_INSTALL_TARGET_HOOKS += PYTHON_TXTORCON_RM_PY3_FILE +endif + $(eval $(python-package)) -- 2.30.2