mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-08 08:30:47 -09:00
51ef6691ac
qt5webkit build currently fails with the following error:
[...] parser.rb:587:in `block in parseSequence': undefined method `=~' for an instance of Annotation (NoMethodError)
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:654:in `block in parseSequence'
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:780:in `block in parseSequence'
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:625:in `block in parseSequence'
from <internal:kernel>:187:in `loop'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:586:in `parseSequence'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:814:in `parseData'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/parser.rb:818:in `parse'
from /home/alexis/src/buildroot_min/output/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb:68:in `<main>'
This issue is due to =~ being marked as deprecated since a few Ruby
versions, and finally removed in 3.2.0 [1]. This now breaks the build since
buildroot has moved to Ruby v3.3.0.
The corresponding fix has already been issued in upstream Webkit project
[2], but qt5webkit version tracked in buildroot does not have the
corresponding webkit version pulled. Fix this build error by bringing the upstream
patch. The patch is slightly modified (exclude part about Changelog file,
which is absent from qt5webkit)
Fixes:
http://autobuild.buildroot.net/results/21397b110fe02e5711ecb1d35be2108221751b0a/
[1] https://www.ruby-lang.org/en/news/2022/12/25/ruby-3-2-0-released/
[2] c7d19a492d
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From 47e03d4af292805bf304f09e34333b38a94c1789 Mon Sep 17 00:00:00 2001
|
|
From: "aperez@igalia.com" <aperez@igalia.com>
|
|
Date: Wed, 15 Jan 2020 22:15:38 +0000
|
|
Subject: [PATCH] Offlineasm warnings with newer Ruby versions
|
|
https://bugs.webkit.org/show_bug.cgi?id=206233
|
|
|
|
Reviewed by Yusuke Suzuki.
|
|
|
|
Avoid a warning about using Object#=~ on Annotation instances, which
|
|
has been deprecated in Ruby 2.7.
|
|
|
|
* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator
|
|
to Annotation instances, which do not define it.
|
|
|
|
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc
|
|
Upstream: https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef
|
|
Signed-off-by: Alexis Lothoré <alexis.lothore@bootlin.com>
|
|
---
|
|
Source/JavaScriptCore/offlineasm/parser.rb | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb
|
|
index b4451124521f..cd1cffaec6ed 100644
|
|
--- a/Source/JavaScriptCore/offlineasm/parser.rb
|
|
+++ b/Source/JavaScriptCore/offlineasm/parser.rb
|
|
@@ -584,9 +584,7 @@ class Parser
|
|
firstCodeOrigin = @tokens[@idx].codeOrigin
|
|
list = []
|
|
loop {
|
|
- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
|
|
- break
|
|
- elsif @tokens[@idx].is_a? Annotation
|
|
+ if @tokens[@idx].is_a? Annotation
|
|
# This is the only place where we can encounter a global
|
|
# annotation, and hence need to be able to distinguish between
|
|
# them.
|
|
@@ -600,6 +598,8 @@ class Parser
|
|
list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string)
|
|
@annotation = nil
|
|
@idx += 2 # Consume the newline as well.
|
|
+ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
|
|
+ break
|
|
elsif @tokens[@idx] == "\n"
|
|
# ignore
|
|
@idx += 1
|
|
--
|
|
2.43.1
|
|
|