package/python-networkx: needs python3
PATCH 1/1 package/python-networkx: needs python3
python3 is mandatory since version 2.3 and
https://github.com/networkx/networkx/commit/8f4845e94709dd62a4ebf3775fe02ca777ec49f2
Fixes:
- http://autobuild.buildroot.org/results/c34d9c92cadbfb0e333eba91c9fae3baac53d0a2
--- package/python-networkx/Config.in | 1 + package/setools/Config.in | 6 ++++-- package/setools/setools.mk | 10 +--------- 3 files changed, 6 insertions(+), 11 deletions(-)
package/python-networkx/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation,
package/setools/Config.in +4 -2
@@ -4,8 +4,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR depends on BR2_USE_MMU - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX
@@ -24,3 +23,6 @@ comment "setools needs a toolchain w/ threads, C++, wchar, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP + +comment "setools needs python3" + depends on !BR2_PACKAGE_PYTHON3
package/setools/setools.mk +1 -9
@@ -13,14 +13,6 @@ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL SETOOLS_SETUP_TYPE = setuptools HOST_SETOOLS_DEPENDENCIES = host-python-cython host-libselinux host-libsepol host-python-networkx -ifeq ($(BR2_PACKAGE_PYTHON3),y) -SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else -SETOOLS_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -SETOOLS_DEPENDENCIES += python-enum34 -HOST_SETOOLS_DEPENDENCIES += host-python-enum34 -endif - define SETOOLS_FIX_SETUP # By default, setup.py will look for libsepol.a in the host machines # /usr/lib directory. This needs to be changed to the staging directory.
@@ -43,7 +35,7 @@ HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP ifeq ($(BR2_PACKAGE_PYTHON_PYQT5),) define SETOOLS_REMOVE_QT_SCRIPTS $(RM) $(TARGET_DIR)/usr/bin/apol - $(RM) -r $(TARGET_DIR)/lib/$(SETOOLS_PYLIBVER)/site-packages/setoolsgui/ + $(RM) -r $(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/setoolsgui/ endef SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS endif
Signature · 1 line
2.27.0
PATCH 1/1 package/python-networkx: needs python3
Quoted 7 lines · On Wed, 15 Jul 2020 22:25:15 +0200 Fabrice Fontaine…
python3 is mandatory since version 2.3 and
https://github.com/networkx/networkx/commit/8f4845e94709dd62a4ebf3775fe02ca777ec49f2Fixes:
- http://autobuild.buildroot.org/results/c34d9c92cadbfb0e333eba91c9fae3baac53d0a2Signed-off-by Fabrice Fontaine <[email protected]>
Thanks for fixing this!
Quoted 15 lines
package/setools/Config.in +1
-2@@ -4,8 +4,7 @@ config BR2_PACKAGE_SETOOLS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR depends on BR2_USE_MMU - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_NETWORKX # runtime select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_LIBSELINUX
package/setools/Config.in comment "setools needs a toolchain w/ threads, C++, wchar, dynamic library" · line 27
Quoted 5 lines
package/setools/Config.in +2
-0@@ -24,3 +23,6 @@ comment "setools needs a toolchain w/ threads, C++, wchar, dynamic library" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP + +comment "setools needs python3"
This needed a:
depends on BR2_USE_MMU
package/setools/Config.in comment "setools needs a toolchain w/ threads, C++, wchar, dynamic library" · line 28
Quoted 1 line
package/setools/Config.in +1
-0+ depends on !BR2_PACKAGE_PYTHON3
Applied with this fixed. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com