]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
python-psutil: enable musl build
authorBaruch Siach <baruch@tkos.co.il>
Sun, 12 Mar 2017 18:49:33 +0000 (20:49 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 12 Mar 2017 22:02:15 +0000 (23:02 +0100)
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>
package/circus/Config.in
package/python-crossbar/Config.in
package/python-psutil/Config.in

index 5276513076ca5b95914bb0e2483e2a52f014c49d..f1cd93c73396a8fc4677a18e8706320de15ab7c7 100644 (file)
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CIRCUS
        depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        depends on BR2_INSTALL_LIBSTDCPP # 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_PSUTIL # runtime
        select BR2_PACKAGE_PYTHON_PYZMQ # runtime
@@ -15,7 +14,6 @@ config BR2_PACKAGE_CIRCUS
 
          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 || \
-               BR2_TOOLCHAIN_USES_MUSL || \
                !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
index 7ef1aadbc9d8ea1e245e9c220bbadd0d63b29cc5..be8332515ec244529d4539186614b7dc1fc5c4ff 100644 (file)
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_CROSSBAR
        bool "python-crossbar"
-       depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
        # All the following dependencies are runtime dependencies
        select BR2_PACKAGE_PYTHON_AUTOBAHN
        select BR2_PACKAGE_PYTHON_CBOR
@@ -40,5 +39,5 @@ config BR2_PACKAGE_PYTHON_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
index 1aec35d27411ab801243dfc04e2933cbb79aa952..c64eeeed6472cde158042cd4665e9507727c1474 100644 (file)
@@ -1,13 +1,8 @@
 config BR2_PACKAGE_PYTHON_PSUTIL
        bool "python-psutil"
-       # sys/sysinfo.h conflict with kernel headers
-       depends on !BR2_TOOLCHAIN_USES_MUSL
        help
          psutil is a cross-platform library for retrieving
          information on running processes and system utilization
          (CPU, memory, disks, network) in Python.
 
          https://pypi.python.org/pypi/psutil
-
-comment "python-psutil needs a uClibc or glibc toolchain"
-       depends on BR2_TOOLCHAIN_USES_MUSL