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

package/python-numpy: needs C++ 

C++ is mandatory since at least version 1.23.0 and
c91a7d0c56
resulting in the following build failure since bump to version 1.23.4 in
commit 32d8e23b977a5bba1f23e3821709c6aa9ff3bc55:

RuntimeError: Broken toolchain: cannot link a simple C++ program. note: A compiler with support for C++11 language features is required.

Fixes:
 - http://autobuild.buildroot.org/results/2d048d9b669ad60f37eeb2162b0a4f9fb425be1e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit cc5a6c4af7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022.11.x
Fabrice Fontaine 2023-02-25 15:49:04 +01:00 committed by Peter Korsgaard
parent eecb4a6630
commit d2a00c83ae
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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_INSTALL_LIBSTDCPP # python-numpy
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
@ -31,5 +32,6 @@ config BR2_PACKAGE_PIGLIT
https://piglit.freedesktop.org
comment "piglit needs glibc or musl"
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
comment "piglit needs a glibc or musl toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)

6
package/python-numpy/Config.in
View File

@ -16,6 +16,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
config BR2_PACKAGE_PYTHON_NUMPY
bool "python-numpy"
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
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
help
@ -27,6 +28,7 @@ config BR2_PACKAGE_PYTHON_NUMPY
http://www.numpy.org/
comment "python-numpy needs glibc or musl"
comment "python-numpy needs a glibc or musl toolchain w/ C++"
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
depends on !BR2_INSTALL_LIBSTDCPP || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)

6
package/python-zlmdb/Config.in
View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_PYTHON_ZLMDB
bool "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
select BR2_PACKAGE_PYTHON_CBOR2 # runtime
select BR2_PACKAGE_PYTHON_CFFI # runtime
@ -17,6 +18,7 @@ config BR2_PACKAGE_PYTHON_ZLMDB
https://github.com/crossbario/zlmdb
comment "python-zlmdb needs glibc or musl"
comment "python-zlmdb needs a glibc or musl toolchain w/ C++"
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)
depends on !BR2_INSTALL_LIBSTDCPP || \
!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL)