package/python-numpy: needs gcc >= 9

python-numpy needs gcc >= 8.4 since bump to version 1.25.0 in commit
ca63464e37 and
4002a7d421:

../output-1/build/host-python-numpy-1.25.0/meson.build:30:4: ERROR: Problem encountered: NumPy requires GCC >= 8.4

Fixes:
 - http://autobuild.buildroot.org/results/9ec82be71c908873112064792ace283049355031

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2023-11-04 23:12:06 +01:00 committed by Peter Korsgaard
parent 89e6b474ea
commit 8b3993178d
11 changed files with 46 additions and 19 deletions

View File

@ -79,6 +79,7 @@ config BR2_PACKAGE_GNURADIO_PYTHON
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
depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy
select BR2_PACKAGE_BOOST_PYTHON
select BR2_PACKAGE_PYTHON_NUMPY # runtime
select BR2_PACKAGE_PYTHON_PYBIND
@ -86,8 +87,9 @@ config BR2_PACKAGE_GNURADIO_PYTHON
help
Enable python component
comment "python support needs glibc or musl"
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
comment "python support needs a glibc or musl toolchain w/ host gcc >= 9"
depends on !BR2_HOST_GCC_AT_LEAST_9 || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
config BR2_PACKAGE_GNURADIO_UTILS
bool "gr-utils support"

View File

@ -53,14 +53,16 @@ config BR2_PACKAGE_OLA_RDM_TESTS
depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy
select BR2_PACKAGE_PYTHON_NUMPY
help
Build OLA RDM tests.
comment "rdm tests needs a toolchain w/ glibc or musl"
comment "rdm tests needs a glibc or musl toolchain w/ gcc >= 9"
depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL
comment "plugin selections"

View File

@ -157,15 +157,17 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON
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
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # 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"
comment "python support needs a glibc or musl toolchain w/ gcc >= 9"
depends on BR2_PACKAGE_PYTHON3
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
config BR2_PACKAGE_OPENCV3_LIB_SHAPE
bool "shape"

View File

@ -180,15 +180,17 @@ config BR2_PACKAGE_OPENCV4_LIB_PYTHON
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
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # 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"
comment "python support needs a glibc or musl toolchain w/ gcc >= 9"
depends on BR2_PACKAGE_PYTHON3
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 ||\
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
config BR2_PACKAGE_OPENCV4_LIB_SHAPE
bool "shape"

View File

@ -8,6 +8,8 @@ config BR2_PACKAGE_PIGLIT
BR2_PACKAGE_WAFFLE_SUPPORTS_GBM
depends on BR2_INSTALL_LIBSTDCPP # mesa3d-demos, python-numpy
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy
depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy
select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
@ -32,6 +34,8 @@ config BR2_PACKAGE_PIGLIT
https://piglit.freedesktop.org
comment "piglit needs a glibc or musl toolchain w/ C++"
comment "piglit needs a glibc or musl toolchain w/ C++, gcc >= 9, host gcc >= 9"
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
!BR2_HOST_GCC_AT_LEAST_9 || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)

View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy
depends on BR2_INSTALL_LIBSTDCPP # python-autobahn's compress and serialization
# All the following dependencies are runtime dependencies. It
# matches almost 1:1 the requirements-min.txt from crossbar
@ -64,8 +65,8 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
https://pypi.python.org/pypi/crossbar
comment "python-crossbar needs a glibc or musl toolchain w/ C++"
comment "python-crossbar needs a glibc or musl toolchain w/ C++, gcc >= 9"
depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \
!BR2_INSTALL_LIBSTDCPP
!BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_9

View File

@ -3,6 +3,8 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy
depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy
select BR2_PACKAGE_FREETYPE # runtime
select BR2_PACKAGE_LIBPNG # runtime
select BR2_PACKAGE_PYTHON_CERTIFI # runtime
@ -36,6 +38,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB_QT
endif
comment "python-matplotlib needs a glibc or musl toolchain w/ C++"
comment "python-matplotlib needs a glibc or musl toolchain w/ C++, gcc >= 9, host gcc >= 9"
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \
!BR2_INSTALL_LIBSTDCPP
!BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_9 || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_9

View File

@ -19,6 +19,7 @@ config BR2_PACKAGE_PYTHON_NUMPY
depends on BR2_INSTALL_LIBSTDCPP
# python-numpy needs fenv.h which is not provided by uclibc
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9
help
NumPy is the fundamental package for scientific computing
with Python.
@ -28,7 +29,8 @@ config BR2_PACKAGE_PYTHON_NUMPY
http://www.numpy.org/
comment "python-numpy needs a glibc or musl toolchain w/ C++"
comment "python-numpy needs a glibc or musl toolchain w/ C++, gcc >= 9"
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)

View File

@ -4,6 +4,8 @@ config BR2_PACKAGE_PYTHON_SCIPY
depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS # lapack
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # openblas
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy
depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy
depends on BR2_TOOLCHAIN_HAS_FORTRAN # lapack
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_LAPACK
@ -19,10 +21,11 @@ config BR2_PACKAGE_PYTHON_SCIPY
https://www.scipy.org/scipylib/
comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl"
comment "python-scipy needs glibc or musl toolchain w/ fortran, c++, gcc >= 9, host gcc >= 9"
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \
!BR2_INSTALL_LIBSTDCPP || \
!BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_9 || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
(!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL)

View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy
depends on BR2_INSTALL_LIBSTDCPP # python-numpy
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy
select BR2_PACKAGE_PYTHON_CBOR2 # runtime
select BR2_PACKAGE_PYTHON_CFFI # runtime
select BR2_PACKAGE_PYTHON_CLICK # runtime
@ -18,7 +19,8 @@ config BR2_PACKAGE_PYTHON_ZLMDB
https://github.com/crossbario/zlmdb
comment "python-zlmdb needs a glibc or musl toolchain w/ C++"
comment "python-zlmdb needs a glibc or musl toolchain w/ C++, gcc >= 9"
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)

View File

@ -94,16 +94,20 @@ config BR2_PACKAGE_UHD_OCTOCLOCK
help
enable OctoClock support
comment "uhd python API needs python3 and a toolchain w/ glibc or musl"
comment "uhd python API needs python3 and a glibc or musl toolchain w/ gcc >= 9, host gcc >= 9"
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
depends on !BR2_HOST_GCC_AT_LEAST_9 || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \
!(BR2_TOOLCHAIN_USES_GLIBC && BR2_TOOLCHAIN_USES_MUSL) # python-numpy
config BR2_PACKAGE_UHD_PYTHON
bool "python API support"
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
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # python-numpy
depends on BR2_HOST_GCC_AT_LEAST_9 # host-python-numpy
select BR2_PACKAGE_PYTHON_NUMPY
select BR2_PACKAGE_PYTHON_REQUESTS
help