Explorar o código

python-psutil: enable musl build

The sysinfo.h header conflict issue is now fixed since upstream commit
c414ecd9b9151 ("Fix build with musl libc"). Enable build with musl. Enable
reverse dependencies as well.

Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Baruch Siach %!s(int64=8) %!d(string=hai) anos
pai
achega
79c01e73ad

+ 1 - 3
package/circus/Config.in

@@ -3,7 +3,6 @@ config BR2_PACKAGE_CIRCUS
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq
 	depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq
-	depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
 	select BR2_PACKAGE_PYTHON_IOWAIT # runtime
 	select BR2_PACKAGE_PYTHON_IOWAIT # runtime
 	select BR2_PACKAGE_PYTHON_PSUTIL # runtime
 	select BR2_PACKAGE_PYTHON_PSUTIL # runtime
 	select BR2_PACKAGE_PYTHON_PYZMQ # runtime
 	select BR2_PACKAGE_PYTHON_PYZMQ # runtime
@@ -15,7 +14,6 @@ config BR2_PACKAGE_CIRCUS
 
 
 	  https://circus.readthedocs.org/en/latest/
 	  https://circus.readthedocs.org/en/latest/
 
 
-comment "circus needs Python and a uClibc or glibc toolchain w/ C++, threads"
+comment "circus needs Python and a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-		BR2_TOOLCHAIN_USES_MUSL || \
 		!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
 		!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)

+ 2 - 3
package/python-crossbar/Config.in

@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_CROSSBAR
 config BR2_PACKAGE_PYTHON_CROSSBAR
 	bool "python-crossbar"
 	bool "python-crossbar"
-	depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
 	# All the following dependencies are runtime dependencies
 	# All the following dependencies are runtime dependencies
 	select BR2_PACKAGE_PYTHON_AUTOBAHN
 	select BR2_PACKAGE_PYTHON_AUTOBAHN
 	select BR2_PACKAGE_PYTHON_CBOR
 	select BR2_PACKAGE_PYTHON_CBOR
@@ -40,5 +39,5 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 
 
 	  https://pypi.python.org/pypi/crossbar
 	  https://pypi.python.org/pypi/crossbar
 
 
-comment "python-crossbar needs a uClibc or glibc toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL
+comment "python-crossbar needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP

+ 0 - 5
package/python-psutil/Config.in

@@ -1,13 +1,8 @@
 config BR2_PACKAGE_PYTHON_PSUTIL
 config BR2_PACKAGE_PYTHON_PSUTIL
 	bool "python-psutil"
 	bool "python-psutil"
-	# sys/sysinfo.h conflict with kernel headers
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	help
 	  psutil is a cross-platform library for retrieving
 	  psutil is a cross-platform library for retrieving
 	  information on running processes and system utilization
 	  information on running processes and system utilization
 	  (CPU, memory, disks, network) in Python.
 	  (CPU, memory, disks, network) in Python.
 
 
 	  https://pypi.python.org/pypi/psutil
 	  https://pypi.python.org/pypi/psutil
-
-comment "python-psutil needs a uClibc or glibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL