From cc5a6c4af7e7809fccdb72b7140b33dacbbd1a94 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 25 Feb 2023 15:49:04 +0100 Subject: [PATCH] package/python-numpy: needs C++ C++ is mandatory since at least version 1.23.0 and https://github.com/numpy/numpy/commit/c91a7d0c5691c9d78bd75284777fda73f225155d 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 Signed-off-by: Thomas Petazzoni --- package/piglit/Config.in | 6 ++++-- package/python-numpy/Config.in | 6 ++++-- package/python-zlmdb/Config.in | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 736fd95d71..5e957a555a 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_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) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index a65164d9d5..132c3f7a82 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -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) diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in index ac4ee05442..8eba2d7946 100644 --- a/package/python-zlmdb/Config.in +++ b/package/python-zlmdb/Config.in @@ -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)