summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-13 18:33:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-16 08:07:01 +0100
commita4c06a9986e6a9f45c9521aaa099958a51bdc091 (patch)
treec70da211ad0d47fa1ace591400156c3d079d94e6 /meta
parent3a7ead55a40bb66b18abb9fd39c012a73f584c20 (diff)
downloadpoky-a4c06a9986e6a9f45c9521aaa099958a51bdc091.tar.gz
ruby: update 3.2.2 -> 3.3.0
Rebase: ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch Drop: ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch (merged upstream) ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch ruby/remove_has_include_macros.patch (code rewritten upstream) (From OE-Core rev: 6e3326838f888912a76e9a1ce77fb76550d27169) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch11
-rw-r--r--meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch52
-rw-r--r--meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch32
-rw-r--r--meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch7
-rw-r--r--meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch9
-rw-r--r--meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch42
-rw-r--r--meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch16
-rw-r--r--meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch7
-rw-r--r--meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch28
-rw-r--r--meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch17
-rw-r--r--meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch35
-rw-r--r--meta/recipes-devtools/ruby/ruby_3.3.0.bb (renamed from meta/recipes-devtools/ruby/ruby_3.2.2.bb)8
12 files changed, 48 insertions, 216 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
index 2e3156880e..7402e76333 100644
--- a/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
+++ b/meta/recipes-devtools/ruby/ruby/0001-extmk-fix-cross-compilation-of-external-gems.patch
@@ -1,7 +1,7 @@
1From a6e12b25a54d112c899b70c89c0bec9c5e5ebf3c Mon Sep 17 00:00:00 2001 1From caa03f46a3204a7e0f0e5d9d9cc9113304dc0382 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> 2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
3Date: Mon, 30 Sep 2019 16:57:01 +0100 3Date: Mon, 30 Sep 2019 16:57:01 +0100
4Subject: [PATCH 1/3] extmk: fix cross-compilation of external gems 4Subject: [PATCH] extmk: fix cross-compilation of external gems
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -16,10 +16,10 @@ Signed-off-by: André Draszik <andre.draszik@jci.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/ext/extmk.rb b/ext/extmk.rb 18diff --git a/ext/extmk.rb b/ext/extmk.rb
19index 1389dc4117..e4d923d7a7 100755 19index 428ffc9..87eff71 100755
20--- a/ext/extmk.rb 20--- a/ext/extmk.rb
21+++ b/ext/extmk.rb 21+++ b/ext/extmk.rb
22@@ -413,8 +413,8 @@ def $mflags.defined?(var) 22@@ -420,8 +420,8 @@ else
23 end 23 end
24 $ruby = [$ruby] 24 $ruby = [$ruby]
25 $ruby << "-I'$(topdir)'" 25 $ruby << "-I'$(topdir)'"
@@ -29,6 +29,3 @@ index 1389dc4117..e4d923d7a7 100755
29 $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout 29 $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout
30 ENV["RUBYLIB"] = "-" 30 ENV["RUBYLIB"] = "-"
31 end 31 end
32--
332.23.0.rc1
34
diff --git a/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch b/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch
deleted file mode 100644
index 1dff9c0f8c..0000000000
--- a/meta/recipes-devtools/ruby/ruby/0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 6b3c202b46b9312c5bb0789145f13d8086e70948 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Jan 2023 02:34:17 -0800
4Subject: [PATCH] fiddle: Use C11 _Alignof to define ALIGN_OF when possible
5
6WG14 N2350 made very clear that it is an UB having type definitions
7within "offsetof" [1]. This patch enhances the implementation of macro
8ALIGN_OF to use builtin "_Alignof" to avoid undefined behavior
9when using std=c11 or newer
10
11clang 16+ has started to flag this [2]
12
13Fixes build when using -std >= gnu11 and using clang16+
14
15Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it
16may support C11, exclude those compiler versions
17
18[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm
19[2] https://reviews.llvm.org/D133574
20
21Upstream-Status: Submitted [https://github.com/ruby/fiddle/pull/120]
22Signed-off-by: Khem Raj <raj.khem@gmail.com>
23---
24 ext/fiddle/fiddle.h | 12 +++++++++++-
25 1 file changed, 11 insertions(+), 1 deletion(-)
26
27diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
28index 10eb9ce..ffb395e 100644
29--- a/ext/fiddle/fiddle.h
30+++ b/ext/fiddle/fiddle.h
31@@ -196,7 +196,17 @@
32 #endif
33 #define TYPE_UINTPTR_T (-TYPE_INTPTR_T)
34
35-#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
36+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023
37+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
38+ clang versions < 8.0.0 have the same bug. */
39+#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
40+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
41+ && !defined __clang__) \
42+ || (defined __clang__ && __clang_major__ < 8))
43+# define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
44+#else
45+# define ALIGN_OF(type) _Alignof(type)
46+#endif
47
48 #define ALIGN_VOIDP ALIGN_OF(void*)
49 #define ALIGN_CHAR ALIGN_OF(char)
50--
512.39.0
52
diff --git a/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch b/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch
deleted file mode 100644
index 226ef3af75..0000000000
--- a/meta/recipes-devtools/ruby/ruby/0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 2368d07660a93a2c41d63f3ab6054ca4daeef820 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 17 Nov 2020 18:31:40 +0000
4Subject: [PATCH] template/Makefile.in: do not write host cross-cc items into
5 target config
6
7This helps reproducibility.
8
9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 template/Makefile.in | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/template/Makefile.in b/template/Makefile.in
16index 10dc826..940ee07 100644
17--- a/template/Makefile.in
18+++ b/template/Makefile.in
19@@ -657,11 +657,11 @@ mjit_config.h:
20 echo '#endif'; \
21 quote MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"; \
22 sep=,; \
23- quote "MJIT_CC_COMMON " $(MJIT_CC); \
24+ quote "MJIT_CC_COMMON " ; \
25 quote "MJIT_CFLAGS MJIT_ARCHFLAG" $(MJIT_CFLAGS); \
26 quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \
27 quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \
28- quote "MJIT_LDSHARED " $(MJIT_LDSHARED); \
29+ quote "MJIT_LDSHARED " ; \
30 quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
31 quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \
32 quote 'PRELOADENV "@PRELOADENV@"'; \
diff --git a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch
index f7b7adb3fd..67054d6553 100644
--- a/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch
+++ b/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch
@@ -1,4 +1,4 @@
1From dfb22e4d6662bf72879eda806eaa78c7b52b519e Mon Sep 17 00:00:00 2001 1From 980dcc5380db6f03451357140ae1487117300156 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Jan 2022 20:29:14 -0800 3Date: Tue, 25 Jan 2022 20:29:14 -0800
4Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv 4Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
15 15
16diff --git a/vm_dump.c b/vm_dump.c 16diff --git a/vm_dump.c b/vm_dump.c
17index a98f5aa..957b785 100644 17index 444be4a..8a081a7 100644
18--- a/vm_dump.c 18--- a/vm_dump.c
19+++ b/vm_dump.c 19+++ b/vm_dump.c
20@@ -39,6 +39,11 @@ 20@@ -39,6 +39,11 @@
@@ -29,6 +29,3 @@ index a98f5aa..957b785 100644
29 #define VM_CFP_CNT(ec, cfp) \ 29 #define VM_CFP_CNT(ec, cfp) \
30 ((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \ 30 ((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \
31 (rb_control_frame_t *)(cfp)) 31 (rb_control_frame_t *)(cfp))
32--
332.35.0
34
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 96ae86263b..f3a65e785d 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,20 +1,19 @@
1From 21d8e7700fa0a9c4bf569dd366134060ae858832 Mon Sep 17 00:00:00 2001 1From 7f7facb85bd65adec24230fe8ca7f6a9863a1fd0 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
5 5
6Signed-off-by: Christopher Larson <chris_larson@mentor.com> 6Signed-off-by: Christopher Larson <chris_larson@mentor.com>
7Upstream-Status: Pending 7Upstream-Status: Pending
8
9--- 8---
10 template/Makefile.in | 2 +- 9 template/Makefile.in | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
12 11
13diff --git a/template/Makefile.in b/template/Makefile.in 12diff --git a/template/Makefile.in b/template/Makefile.in
14index 1456313..15b98a4 100644 13index 8c462f2..2200c8c 100644
15--- a/template/Makefile.in 14--- a/template/Makefile.in
16+++ b/template/Makefile.in 15+++ b/template/Makefile.in
17@@ -127,7 +127,7 @@ ENABLE_SHARED = @ENABLE_SHARED@ 16@@ -115,7 +115,7 @@ ENABLE_SHARED = @ENABLE_SHARED@
18 LDSHARED = @LIBRUBY_LDSHARED@ 17 LDSHARED = @LIBRUBY_LDSHARED@
19 DLDSHARED = @DLDSHARED@ 18 DLDSHARED = @DLDSHARED@
20 XDLDFLAGS = @DLDFLAGS@ 19 XDLDFLAGS = @DLDFLAGS@
@@ -22,4 +21,4 @@ index 1456313..15b98a4 100644
22+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) 21+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
23 SOLIBS = @SOLIBS@ 22 SOLIBS = @SOLIBS@
24 ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ 23 ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
25 MAINLIBS = $(YJIT_LIBS) @MAINLIBS@ 24 MAINLIBS = @MAINLIBS@
diff --git a/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch b/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch
deleted file mode 100644
index 2efbad7513..0000000000
--- a/meta/recipes-devtools/ruby/ruby/0002-template-Makefile.in-filter-out-f-prefix-map.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Subject: [PATCH] template/Makefile.in: filter out -f*prefix-map
2
3If we add DEBUG_PREFIX_MAP into LDFLAGS, ruby and ruby-dbg are no longer
4reproducible. Fix this.
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Tony Battersby <tonyb@cybernetics.com>
8---
9--- a/tool/mjit_archflag.sh
10+++ b/tool/mjit_archflag.sh
11@@ -7,6 +7,20 @@ quote() {
12 echo
13 }
14
15+quote_filtered() {
16+ printf "#${indent}define $1"
17+ while shift && [ "$#" -gt 0 ]; do
18+ case "$1" in
19+ -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*)
20+ ;;
21+ *)
22+ printf ' "%s"'$sep "$1"
23+ ;;
24+ esac
25+ done
26+ echo
27+}
28+
29 archs=""
30 arch_flag=""
31
32--- a/template/Makefile.in
33+++ b/template/Makefile.in
34@@ -666,7 +666,7 @@ mjit_config.h:
35 quote "MJIT_OPTFLAGS " $(MJIT_OPTFLAGS); \
36 quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \
37 quote "MJIT_LDSHARED " ; \
38- quote "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
39+ quote_filtered "MJIT_DLDFLAGS MJIT_ARCHFLAG" $(MJIT_DLDFLAGS); \
40 quote "MJIT_LIBS " $(LIBRUBYARG_SHARED); \
41 quote 'PRELOADENV "@PRELOADENV@"'; \
42 indent=$${archs:+' '}; \
diff --git a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
index f92f0e1ba6..e2d5b57c25 100644
--- a/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
+++ b/meta/recipes-devtools/ruby/ruby/0003-rdoc-build-reproducible-documentation.patch
@@ -1,6 +1,7 @@
1From 5079e678ce2a81416088c04f9123cd8207d5def2 Mon Sep 17 00:00:00 2001
1From: Christian Hofstaedtler <zeha@debian.org> 2From: Christian Hofstaedtler <zeha@debian.org>
2Date: Tue, 10 Oct 2017 15:04:34 -0300 3Date: Tue, 10 Oct 2017 15:04:34 -0300
3Subject: rdoc: build reproducible documentation 4Subject: [PATCH] rdoc: build reproducible documentation
4 5
5- provide a fixed timestamp to the gzip compression 6- provide a fixed timestamp to the gzip compression
6 7
@@ -10,23 +11,24 @@ Signed-off-by: Antonio Terceiro <terceiro@debian.org>
10Signed-off-by: Christian Hofstaedtler <zeha@debian.org> 11Signed-off-by: Christian Hofstaedtler <zeha@debian.org>
11--- 12---
12 lib/rdoc/generator/json_index.rb | 4 ++-- 13 lib/rdoc/generator/json_index.rb | 4 ++--
13 lib/rdoc/rdoc.rb | 2 +- 14 1 file changed, 2 insertions(+), 2 deletions(-)
14 2 files changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/lib/rdoc/generator/json_index.rb b/lib/rdoc/generator/json_index.rb
17index c454910..24feab0 100644
16--- a/lib/rdoc/generator/json_index.rb 18--- a/lib/rdoc/generator/json_index.rb
17+++ b/lib/rdoc/generator/json_index.rb 19+++ b/lib/rdoc/generator/json_index.rb
18@@ -178,7 +178,7 @@ 20@@ -178,7 +178,7 @@ class RDoc::Generator::JsonIndex
19 debug_msg "Writing gzipped search index to %s" % outfile 21 debug_msg "Writing gzipped search index to %s" % outfile
20 22
21 Zlib::GzipWriter.open(outfile) do |gz| 23 Zlib::GzipWriter.open(outfile) do |gz|
22- gz.mtime = File.mtime(search_index_file) 24- gz.mtime = File.mtime(search_index_file)
23+ gz.mtime = -1 25+ gz.mtime = -1
24 gz.orig_name = search_index_file.basename.to_s 26 gz.orig_name = search_index_file.basename.to_s
25 gz.write search_index 27 gz.write search_index
26 gz.close 28 gz.close
27@@ -196,7 +196,7 @@ 29@@ -196,7 +196,7 @@ class RDoc::Generator::JsonIndex
28 debug_msg "Writing gzipped file to %s" % outfile 30 debug_msg "Writing gzipped file to %s" % outfile
29 31
30 Zlib::GzipWriter.open(outfile) do |gz| 32 Zlib::GzipWriter.open(outfile) do |gz|
31- gz.mtime = File.mtime(dest) 33- gz.mtime = File.mtime(dest)
32+ gz.mtime = -1 34+ gz.mtime = -1
diff --git a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
index e0aca0dcfc..b14a731cfb 100644
--- a/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
+++ b/meta/recipes-devtools/ruby/ruby/0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch
@@ -1,6 +1,7 @@
1From 99734381652602f76075017576a819c427ebb5f2 Mon Sep 17 00:00:00 2001
1From: Reiner Herrmann <reiner@reiner-h.de> 2From: Reiner Herrmann <reiner@reiner-h.de>
2Date: Tue, 10 Oct 2017 15:06:13 -0300 3Date: Tue, 10 Oct 2017 15:06:13 -0300
3Subject: lib/mkmf.rb: sort list of object files in generated Makefile 4Subject: [PATCH] lib/mkmf.rb: sort list of object files in generated Makefile
4 5
5Without sorting the list explicitly, its order is indeterministic, 6Without sorting the list explicitly, its order is indeterministic,
6because readdir() is also not deterministic. 7because readdir() is also not deterministic.
@@ -15,9 +16,11 @@ Signed-off-by: Reiner Herrmann <reiner@reiner-h.de>
15 lib/mkmf.rb | 2 +- 16 lib/mkmf.rb | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
17 18
19diff --git a/lib/mkmf.rb b/lib/mkmf.rb
20index 6da7dde..3af30a9 100644
18--- a/lib/mkmf.rb 21--- a/lib/mkmf.rb
19+++ b/lib/mkmf.rb 22+++ b/lib/mkmf.rb
20@@ -2315,7 +2315,7 @@ 23@@ -2368,7 +2368,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
21 LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} 24 LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
22 ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')} 25 ORIG_SRCS = #{orig_srcs.collect(&File.method(:basename)).join(' ')}
23 SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')} 26 SRCS = $(ORIG_SRCS) #{(srcs - orig_srcs).collect(&File.method(:basename)).join(' ')}
diff --git a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
index 41f206523e..24268625a2 100644
--- a/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
+++ b/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch
@@ -1,4 +1,4 @@
1From 6e1dc610724a7aa8368cbcddf4bbe21cccc0f731 Mon Sep 17 00:00:00 2001 1From 3bc324379aa3e322bad9353da8c0064cd671cc74 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
@@ -12,20 +12,20 @@ Upstream-Status: Backport [debian]
12 1 file changed, 3 insertions(+), 1 deletion(-) 12 1 file changed, 3 insertions(+), 1 deletion(-)
13 13
14diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb 14diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
15index 0d72cee..eb7bc25 100644 15index a0c7faa..f0722d9 100644
16--- a/lib/rubygems/specification.rb 16--- a/lib/rubygems/specification.rb
17+++ b/lib/rubygems/specification.rb 17+++ b/lib/rubygems/specification.rb
18@@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification 18@@ -1774,7 +1774,9 @@ class Gem::Specification < Gem::BasicSpecification
19 raise(Gem::InvalidSpecificationException, 19 raise(Gem::InvalidSpecificationException,
20 "invalid date format in specification: #{date.inspect}") 20 "invalid date format in specification: #{date.inspect}")
21 end 21 end
22- when Time, DateLike then 22- when Time, DateLike then
23+ when Time then 23+ when Time then
24+ Time.utc(date.utc.year, date.utc.month, date.utc.day) 24+ Time.utc(date.utc.year, date.utc.month, date.utc.day)
25+ when DateLike then 25+ when DateLike then
26 Time.utc(date.year, date.month, date.day) 26 Time.utc(date.year, date.month, date.day)
27 else 27 else
28 TODAY 28 TODAY
29-- 29--
302.25.1 302.39.2
31 31
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 0a87cae17f..21604dfc34 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 3f60710bc29c1b08e128314d40101e87b7d2c9a1 Mon Sep 17 00:00:00 2001 1From 1dc7ef09c3c567c4adb09ccfd97e0e59c58edb9f 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
@@ -7,7 +7,6 @@ Without an explicit date, they will get the current date and make the
7build unreproducible 7build unreproducible
8 8
9Upstream-Status: Backport [debian] 9Upstream-Status: Backport [debian]
10
11--- 10---
12 ext/bigdecimal/bigdecimal.gemspec | 1 + 11 ext/bigdecimal/bigdecimal.gemspec | 1 +
13 ext/fiddle/fiddle.gemspec | 1 + 12 ext/fiddle/fiddle.gemspec | 1 +
@@ -17,12 +16,12 @@ Upstream-Status: Backport [debian]
17 5 files changed, 5 insertions(+) 16 5 files changed, 5 insertions(+)
18 17
19diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec 18diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
20index d215757..5148d56 100644 19index f9f3b45..b9a469d 100644
21--- a/ext/bigdecimal/bigdecimal.gemspec 20--- a/ext/bigdecimal/bigdecimal.gemspec
22+++ b/ext/bigdecimal/bigdecimal.gemspec 21+++ b/ext/bigdecimal/bigdecimal.gemspec
23@@ -4,6 +4,7 @@ Gem::Specification.new do |s| 22@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
24 s.name = "bigdecimal" 23 s.name = name
25 s.version = "3.1.3" 24 s.version = source_version
26 s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"] 25 s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
27+ s.date = RUBY_RELEASE_DATE 26+ s.date = RUBY_RELEASE_DATE
28 s.email = ["mrkn@mrkn.jp"] 27 s.email = ["mrkn@mrkn.jp"]
@@ -41,10 +40,10 @@ index 8781093..efdca32 100644
41 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] 40 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
42 41
43diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec 42diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
44index d26a757..cc88c55 100644 43index d4f5276..8f89611 100644
45--- a/ext/io/console/io-console.gemspec 44--- a/ext/io/console/io-console.gemspec
46+++ b/ext/io/console/io-console.gemspec 45+++ b/ext/io/console/io-console.gemspec
47@@ -4,6 +4,7 @@ _VERSION = "0.6.0" 46@@ -4,6 +4,7 @@ _VERSION = "0.7.1"
48 Gem::Specification.new do |s| 47 Gem::Specification.new do |s|
49 s.name = "io-console" 48 s.name = "io-console"
50 s.version = _VERSION 49 s.version = _VERSION
@@ -65,7 +64,7 @@ index 1f4798e..48743cf 100644
65 spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] 64 spec.email = ["knu@idaemons.org", "ume@mahoroba.org"]
66 65
67diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec 66diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
68index 3c96f7d..fec0872 100644 67index 93a281c..cc5c155 100644
69--- a/lib/rdoc/rdoc.gemspec 68--- a/lib/rdoc/rdoc.gemspec
70+++ b/lib/rdoc/rdoc.gemspec 69+++ b/lib/rdoc/rdoc.gemspec
71@@ -7,6 +7,7 @@ end 70@@ -7,6 +7,7 @@ end
diff --git a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch b/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch
deleted file mode 100644
index b78e3db892..0000000000
--- a/meta/recipes-devtools/ruby/ruby/remove_has_include_macros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From e74b57febec9bd806e29025e6eeb8091e7021d75 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 26 Jan 2020 11:27:40 -0800
4Subject: [PATCH] Filter out __has_include* compiler defines
5
6They are internal to compiler and this header is later on includes in C
7files, but newer gcc >= 10 complains about it.
8
9error in initial header file:
10| In file included from /tmp/20200124-86625-14hiju4.c:1:
11| /tmp/20200124-86625-11y6l6i.h:13849:9: error: "__has_include" cannot be used as a macro name
12| 13849 | #define __has_include __has_include
13| | ^~~~~~~~~~~~~
14| compilation terminated due to -Wfatal-errors.
15
16Upstream-Status: Pending
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18
19---
20 common.mk | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/common.mk b/common.mk
24index 664f750..3b8fbe6 100644
25--- a/common.mk
26+++ b/common.mk
27@@ -238,6 +238,8 @@ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJE
28 $(ECHO) building $(@F:.time=.h)
29 $(Q)$(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \
30 $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
31+ $(Q)sed -i -e "/#define __has_include __has_include/d" $(@F:.time=.h).new
32+ $(Q)sed -i -e "/#define __has_include_next __has_include_next/d" $(@F:.time=.h).new
33 $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new
34
35 $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time
diff --git a/meta/recipes-devtools/ruby/ruby_3.2.2.bb b/meta/recipes-devtools/ruby/ruby_3.3.0.bb
index 481fe7c23d..17eb6d73c2 100644
--- a/meta/recipes-devtools/ruby/ruby_3.2.2.bb
+++ b/meta/recipes-devtools/ruby/ruby_3.3.0.bb
@@ -10,7 +10,7 @@ LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \
11 file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ 11 file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \
12 file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 12 file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
13 file://LEGAL;md5=bcd74b47bbaf2051c5e49811a5faa97a \ 13 file://LEGAL;md5=81e6a4d81533b9263da4c3485a0ad883 \
14 " 14 "
15 15
16DEPENDS = "zlib openssl libyaml gdbm readline libffi" 16DEPENDS = "zlib openssl libyaml gdbm readline libffi"
@@ -21,16 +21,12 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
21SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ 21SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
22 file://0001-extmk-fix-cross-compilation-of-external-gems.patch \ 22 file://0001-extmk-fix-cross-compilation-of-external-gems.patch \
23 file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \ 23 file://0002-Obey-LDFLAGS-for-the-link-of-libruby.patch \
24 file://remove_has_include_macros.patch \
25 file://run-ptest \ 24 file://run-ptest \
26 file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \
27 file://0002-template-Makefile.in-filter-out-f-prefix-map.patch \
28 file://0003-rdoc-build-reproducible-documentation.patch \ 25 file://0003-rdoc-build-reproducible-documentation.patch \
29 file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \ 26 file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \
30 file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \ 27 file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \
31 file://0006-Make-gemspecs-reproducible.patch \ 28 file://0006-Make-gemspecs-reproducible.patch \
32 file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ 29 file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \
33 file://0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch \
34 " 30 "
35UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/" 31UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
36 32
@@ -51,7 +47,7 @@ do_configure:prepend() {
51 47
52DEPENDS:append:libc-musl = " libucontext" 48DEPENDS:append:libc-musl = " libucontext"
53 49
54SRC_URI[sha256sum] = "96c57558871a6748de5bc9f274e93f4b5aad06cd8f37befa0e8d94e7b8a423bc" 50SRC_URI[sha256sum] = "96518814d9832bece92a85415a819d4893b307db5921ae1f0f751a9a89a56b7d"
55 51
56PACKAGECONFIG ??= "" 52PACKAGECONFIG ??= ""
57PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 53PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 06:43:29 +0000