package/python-numpy: add reverse dependency on packages using python-numpy

Since commit 1aa59097e61d524bb55ab1fcd4fbe5098b3e0bed[1] is merged, a
new build failure occurs when selecting packages which needs
python-numpy as dependency.

This fix a build issue[2] by adding the correct reverse dependencies
to the following packages :
- gnuradio (for python support)
- opencv3 (for python support)
- piglit
- python-matplotlib

So :
- adding to every listed packages
  `depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)`
  and add a comment to explain what happend.

[1] https://git.buildroot.net/buildroot/commit/?id=1aa59097e61d524bb55ab1fcd4fbe5098b3e0bed
[2] http://autobuild.buildroot.org/results/b76/b76b6cf9602bcf5df69a7276762eab54cf74007b

Signed-off-by: Alexandre PAYEN <alexandre.payen@smile.fr>
Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Damien DUVAL <damien.duval@smile.fr>
Cc: Romain Naour <romain.naour@smile.fr>
Reviewed-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index 6d0669779f0bf3fab2d8c0461ea8556e9d36c7b5..80f6a1c5351a6496288489a12dd204520973d942 100644 (file)
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -66,11 +66,15 @@ config BR2_PACKAGE_GNURADIO_PYTHON
        bool "python support"
        depends on BR2_PACKAGE_PYTHON
        depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+       depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
        select BR2_PACKAGE_BOOST_PYTHON
        select BR2_PACKAGE_PYTHON_NUMPY # runtime
        help
          Enable python component
 
+comment "python support needs glibc or musl"
+       depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
+
 config BR2_PACKAGE_GNURADIO_UTILS
        bool "gr-utils support"
        depends on BR2_PACKAGE_GNURADIO_PYTHON

diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index 3a6ff8e80c342bd6fd750d334ca84a8b79cade4a..cf7763d4ae5f4706f585a55f2bde7f15d6599594 100644 (file)
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -158,11 +158,15 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON
        bool "python"
        depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
        depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+       depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
        select BR2_PACKAGE_PYTHON_NUMPY
        help
          Include opencv_python module into the OpenCV build.  No
          python example is installed.
 
+comment "python support needs glibc or musl"
+       depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
+
 config BR2_PACKAGE_OPENCV3_LIB_SHAPE
        bool "shape"
        # opencv_core dependency is already enabled

diff --git a/package/piglit/Config.in b/package/piglit/Config.in
index 7a16c94284c003e15d63e2866e5543ddb9333a76..736fd95d7194dfbd1c27017a77d9e578ef9845ee 100644 (file)
--- a/package/piglit/Config.in
+++ b/package/piglit/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_PIGLIT
                BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \
                BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \
                BR2_PACKAGE_WAFFLE_SUPPORTS_GBM
+       depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
        select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL
        select BR2_PACKAGE_LIBPNG
        select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
@@ -29,3 +30,6 @@ config BR2_PACKAGE_PIGLIT
          implementations.
 
          https://piglit.freedesktop.org
+
+comment "piglit needs glibc or musl"
+       depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)

diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in
index 14f43568f36a67d1e221f37371a00058ffd508d2..07160affd043fcb0f7ef70b089c93a275cb42250 100644 (file)
--- a/package/python-matplotlib/Config.in
+++ b/package/python-matplotlib/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_PACKAGE_PYTHON3
        depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
+       depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
        select BR2_PACKAGE_FREETYPE # runtime
        select BR2_PACKAGE_LIBPNG # runtime
        select BR2_PACKAGE_PYTHON_CYCLER
@@ -23,3 +24,6 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB
 
 comment "python-matplotlib needs a toolchain w/ C++"
        depends on !BR2_INSTALL_LIBSTDCPP
+
+comment "python-matplotlib needs glibc or musl"
+       depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)