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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in
index 0f3e86f497d82c0626dbfa37a9341a72f6b1377e..2ae3841dfa3068cc3f8c145d7cbee033471d79d6 100644 (file)
--- a/package/python-networkx/Config.in
+++ b/package/python-networkx/Config.in
@@ -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,

diff --git a/package/setools/Config.in b/package/setools/Config.in
index 56a85b01c82321249cffc939d7704648ed70e5c6..9475bbef65f3660b9ceb42d4ecf3adb1e94518b8 100644 (file)
--- a/package/setools/Config.in
+++ b/package/setools/Config.in
@@ -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,7 @@ 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_USE_MMU
+       depends on !BR2_PACKAGE_PYTHON3

diff --git a/package/setools/setools.mk b/package/setools/setools.mk
index fc49fc218e6b409535f458dadfed2effcdcaba3b..24da3613c4e8dc411f89c3dbb8b168b80b72c17e 100644 (file)
--- a/package/setools/setools.mk
+++ b/package/setools/setools.mk
@@ -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