summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-01-04 12:05:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-06 12:03:48 +0000
commit8770071d21961446413bccb457fb0e66ecab8c69 (patch)
tree416a7d9ca5bd501a71ce539a4d5f8cd6844c61fc
parent5164d87e1344ab56958e380be2546508c613df2b (diff)
downloadpoky-8770071d21961446413bccb457fb0e66ecab8c69.tar.gz
ruby: upgrade 3.1.3 -> 3.2.0
(From OE-Core rev: 6b544ba8e80bee83030976a98e47e0a66a216ec9) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch8
-rw-r--r--meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch17
-rw-r--r--meta/recipes-devtools/ruby/ruby_3.2.0.bb (renamed from meta/recipes-devtools/ruby/ruby_3.1.3.bb)2
3 files changed, 12 insertions, 15 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
index 4b954e439b..96ae86263b 100644
--- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
+++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch
@@ -1,4 +1,4 @@
1From 07fd1ada322eda6c05ac45c08fc814976f31b596 Mon Sep 17 00:00:00 2001 1From 21d8e7700fa0a9c4bf569dd366134060ae858832 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com> 2From: Christopher Larson <chris_larson@mentor.com>
3Date: Thu, 5 May 2016 10:59:07 -0700 3Date: Thu, 5 May 2016 10:59:07 -0700
4Subject: [PATCH] Obey LDFLAGS for the link of libruby 4Subject: [PATCH] Obey LDFLAGS for the link of libruby
@@ -11,10 +11,10 @@ Upstream-Status: Pending
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/template/Makefile.in b/template/Makefile.in 13diff --git a/template/Makefile.in b/template/Makefile.in
14index f5a3149..5cc75ae 100644 14index 1456313..15b98a4 100644
15--- a/template/Makefile.in 15--- a/template/Makefile.in
16+++ b/template/Makefile.in 16+++ b/template/Makefile.in
17@@ -114,7 +114,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ 17@@ -127,7 +127,7 @@ ENABLE_SHARED = @ENABLE_SHARED@
18 LDSHARED = @LIBRUBY_LDSHARED@ 18 LDSHARED = @LIBRUBY_LDSHARED@
19 DLDSHARED = @DLDSHARED@ 19 DLDSHARED = @DLDSHARED@
20 XDLDFLAGS = @DLDFLAGS@ 20 XDLDFLAGS = @DLDFLAGS@
@@ -22,4 +22,4 @@ index f5a3149..5cc75ae 100644
22+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) 22+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
23 SOLIBS = @SOLIBS@ 23 SOLIBS = @SOLIBS@
24 ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ 24 ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
25 MAINLIBS = @MAINLIBS@ 25 MAINLIBS = $(YJIT_LIBS) @MAINLIBS@
diff --git a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch
index 1e4a298317..0a87cae17f 100644
--- a/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch
+++ b/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch
@@ -1,4 +1,4 @@
1From 6e1dc610724a7aa8368cbcddf4bbe21cccc0f731 Mon Sep 17 00:00:00 2001 1From 3f60710bc29c1b08e128314d40101e87b7d2c9a1 Mon Sep 17 00:00:00 2001
2From: Lucas Kanashiro <kanashiro@debian.org> 2From: Lucas Kanashiro <kanashiro@debian.org>
3Date: Fri, 1 Nov 2019 15:25:17 -0300 3Date: Fri, 1 Nov 2019 15:25:17 -0300
4Subject: [PATCH] Make gemspecs reproducible 4Subject: [PATCH] Make gemspecs reproducible
@@ -17,19 +17,19 @@ Upstream-Status: Backport [debian]
17 5 files changed, 5 insertions(+) 17 5 files changed, 5 insertions(+)
18 18
19diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec 19diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
20index fd49c1b..5b8bb00 100644 20index d215757..5148d56 100644
21--- a/ext/bigdecimal/bigdecimal.gemspec 21--- a/ext/bigdecimal/bigdecimal.gemspec
22+++ b/ext/bigdecimal/bigdecimal.gemspec 22+++ b/ext/bigdecimal/bigdecimal.gemspec
23@@ -4,6 +4,7 @@ Gem::Specification.new do |s| 23@@ -4,6 +4,7 @@ Gem::Specification.new do |s|
24 s.name = "bigdecimal" 24 s.name = "bigdecimal"
25 s.version = "3.1.1" 25 s.version = "3.1.3"
26 s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"] 26 s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
27+ s.date = RUBY_RELEASE_DATE 27+ s.date = RUBY_RELEASE_DATE
28 s.email = ["mrkn@mrkn.jp"] 28 s.email = ["mrkn@mrkn.jp"]
29 29
30 s.summary = "Arbitrary-precision decimal floating-point number library." 30 s.summary = "Arbitrary-precision decimal floating-point number library."
31diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec 31diff --git a/ext/fiddle/fiddle.gemspec b/ext/fiddle/fiddle.gemspec
32index a9c0ec4..89da078 100644 32index 8781093..efdca32 100644
33--- a/ext/fiddle/fiddle.gemspec 33--- a/ext/fiddle/fiddle.gemspec
34+++ b/ext/fiddle/fiddle.gemspec 34+++ b/ext/fiddle/fiddle.gemspec
35@@ -8,6 +8,7 @@ end 35@@ -8,6 +8,7 @@ end
@@ -41,10 +41,10 @@ index a9c0ec4..89da078 100644
41 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] 41 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
42 42
43diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec 43diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
44index aa57f8a..ba7f8e5 100644 44index d26a757..cc88c55 100644
45--- a/ext/io/console/io-console.gemspec 45--- a/ext/io/console/io-console.gemspec
46+++ b/ext/io/console/io-console.gemspec 46+++ b/ext/io/console/io-console.gemspec
47@@ -4,6 +4,7 @@ _VERSION = "0.5.11" 47@@ -4,6 +4,7 @@ _VERSION = "0.6.0"
48 Gem::Specification.new do |s| 48 Gem::Specification.new do |s|
49 s.name = "io-console" 49 s.name = "io-console"
50 s.version = _VERSION 50 s.version = _VERSION
@@ -65,7 +65,7 @@ index 1f4798e..48743cf 100644
65 spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] 65 spec.email = ["knu@idaemons.org", "ume@mahoroba.org"]
66 66
67diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec 67diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
68index 525a15f..f6d0e22 100644 68index 3c96f7d..fec0872 100644
69--- a/lib/rdoc/rdoc.gemspec 69--- a/lib/rdoc/rdoc.gemspec
70+++ b/lib/rdoc/rdoc.gemspec 70+++ b/lib/rdoc/rdoc.gemspec
71@@ -7,6 +7,7 @@ end 71@@ -7,6 +7,7 @@ end
@@ -76,6 +76,3 @@ index 525a15f..f6d0e22 100644
76 s.version = RDoc::VERSION 76 s.version = RDoc::VERSION
77 77
78 s.authors = [ 78 s.authors = [
79--
802.25.1
81
diff --git a/meta/recipes-devtools/ruby/ruby_3.1.3.bb b/meta/recipes-devtools/ruby/ruby_3.2.0.bb
index 85d6184a04..1981a7524c 100644
--- a/meta/recipes-devtools/ruby/ruby_3.1.3.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.2.0.bb
@@ -50,7 +50,7 @@ do_configure:prepend() {
50 50
51DEPENDS:append:libc-musl = " libucontext" 51DEPENDS:append:libc-musl = " libucontext"
52 52
53SRC_URI[sha256sum] = "5ea498a35f4cd15875200a52dde42b6eb179e1264e17d78732c3a57cd1c6ab9e" 53SRC_URI[sha256sum] = "daaa78e1360b2783f98deeceb677ad900f3a36c0ffa6e2b6b19090be77abc272"
54 54
55PACKAGECONFIG ??= "" 55PACKAGECONFIG ??= ""
56PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 56PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"