From 019cfcfc4a108112306f30c38c1a17fc42841e15 Mon Sep 17 00:00:00 2001 From: Adam Duskett <adam.duskett@amarulasolutions.com> Date: Wed, 17 Jan 2024 15:50:42 -0700 Subject: [PATCH] package/flutter-engine/Config.in: Drop nptl dependency As Yann mentioned in commit 9d8497e79de3ced144877ba6ee38cc5b7181aaeb, a dependency on a glibc toolchain implies a dependency on BR2_TOOLCHAIN_HAS_THREADS_NPTL. As such, remove the dependency from package/flutter-engine/Config.in. Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> --- package/flutter-engine/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/flutter-engine/Config.in b/package/flutter-engine/Config.in index 3c92e40f74..00bcd05cd4 100644 --- a/package/flutter-engine/Config.in +++ b/package/flutter-engine/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_FLUTTER_ENGINE depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthreads depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS @@ -68,12 +67,11 @@ comment "flutter-engine needs an OpenGL or OpenGLES backend" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES -comment "flutter-engine needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5, NPTL" +comment "flutter-engine needs a glibc toolchain w/ wchar, C++, gcc >= 5, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_HOST_GCC_AT_LEAST_5 + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_USE_WCHAR || !BR2_HOST_GCC_AT_LEAST_5 comment "flutter-engine needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_FLUTTER_ENGINE_ARCH_SUPPORTS