deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
2019.08.x
Alexandre PAYEN 2019-08-08 17:19:50 +02:00 committed by Peter Korsgaard
parent 0c5acbbcb6
commit 7a546b87d5
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/gnuradio/Config.in
View File

@ -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

4
package/opencv3/Config.in
View File

@ -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

4
package/piglit/Config.in
View File

@ -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)

4
package/python-matplotlib/Config.in
View File

@ -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)