From 7a546b87d5b8781b03f3ba5d311d61f4169ee899 Mon Sep 17 00:00:00 2001 From: Alexandre PAYEN Date: Thu, 8 Aug 2019 17:19:50 +0200 Subject: [PATCH] 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 Cc: Alexey Brodkin Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Damien DUVAL Cc: Romain Naour Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/gnuradio/Config.in | 4 ++++ package/opencv3/Config.in | 4 ++++ package/piglit/Config.in | 4 ++++ package/python-matplotlib/Config.in | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 6d0669779f..80f6a1c535 100644 --- 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 3a6ff8e80c..cf7763d4ae 100644 --- 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 7a16c94284..736fd95d71 100644 --- 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 14f43568f3..07160affd0 100644 --- 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)