From 3c83c1fd4a06dc3ef2803fe160ad57c35546ba7b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 26 Oct 2021 09:06:03 +0200 Subject: [PATCH] package/ruby: needs gcc and host gcc >= 4.9 ruby needs gcc and host gcc >= 4.9 since commit 5f1c6758a561134e30fe9fb7fae55e5d6e97d01a and the addition of AC_PROG_CC: In file included from vm_core.h:85:0, from iseq.h:14, from mini_builtin.c:3, from miniinit.c:51: thread_pthread.h:108:43: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'struct' RUBY_EXTERN RB_THREAD_LOCAL_SPECIFIER struct rb_execution_context_struct *ruby_current_ec; ^ Fixes: - http://autobuild.buildroot.org/results/f196f8bc68d1b4c20bddced89478598a3fcd3dea - http://autobuild.buildroot.org/results/81bdac585600877d3fa8d9478b7f160dbd1537a9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/qt5/qt5webkit/Config.in | 2 +- package/ruby/Config.in | 7 +++++-- package/webkitgtk/Config.in | 2 +- package/wpewebkit/Config.in | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 65f08d1c5e..4abb04844c 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on BR2_INSTALL_LIBSTDCPP # leveldb - depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # icu depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb depends on !BR2_BINFMT_FLAT # icu diff --git a/package/ruby/Config.in b/package/ruby/Config.in index 141db90140..c210120945 100644 --- a/package/ruby/Config.in +++ b/package/ruby/Config.in @@ -3,11 +3,14 @@ config BR2_PACKAGE_RUBY depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on BR2_HOST_GCC_AT_LEAST_4_9 help Object Oriented Scripting Language. http://www.ruby-lang.org/ -comment "ruby needs a toolchain w/ wchar, threads, dynamic library" +comment "ruby needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.9, host gcc >= 4.9" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 425bf81e4e..bc8207d93b 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -25,7 +25,7 @@ config BR2_PACKAGE_WEBKITGTK bool "webkitgtk" depends on !BR2_STATIC_LIBS # wayland depends on !BR2_BINFMT_FLAT # icu - depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 6fc1e668fd..8357051e93 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -30,7 +30,7 @@ config BR2_PACKAGE_WPEWEBKIT bool "wpewebkit" depends on !BR2_STATIC_LIBS # wayland depends on !BR2_BINFMT_FLAT # icu - depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7