diff options
Diffstat (limited to 'poky/meta/recipes-devtools/ruby')
| -rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby.inc | 6 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch | 34 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch | 41 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch | 13 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/ruby/ruby_3.1.1.bb (renamed from poky/meta/recipes-devtools/ruby/ruby_3.1.0.bb) | 15 |
5 files changed, 70 insertions, 39 deletions
diff --git a/poky/meta/recipes-devtools/ruby/ruby.inc b/poky/meta/recipes-devtools/ruby/ruby.inc index 20ae15bd7a..ebff5efd1f 100644 --- a/poky/meta/recipes-devtools/ruby/ruby.inc +++ b/poky/meta/recipes-devtools/ruby/ruby.inc @@ -6,15 +6,15 @@ It is simple, straight-forward, and extensible. \ " HOMEPAGE = "http://www.ruby-lang.org/" SECTION = "devel/ruby" -LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPLv2 | ISC | MIT" +LICENSE = "Ruby | BSD-2-Clause | BSD-3-Clause | GPL-2.0-only | ISC | MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5b8c87559868796979806100db3f3805 \ file://BSDL;md5=8b50bc6de8f586dc66790ba11d064d75 \ file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LEGAL;md5=f260190bc1e92e363f0ee3c0463d4c7c \ " -DEPENDS = "ruby-native zlib openssl libyaml gdbm readline libffi" -DEPENDS:class-native = "openssl-native libyaml-native readline-native zlib-native" +DEPENDS = "zlib openssl libyaml gdbm readline libffi" +DEPENDS:append:class-target = " ruby-native" SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ diff --git a/poky/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch b/poky/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch new file mode 100644 index 0000000000..f7b7adb3fd --- /dev/null +++ b/poky/meta/recipes-devtools/ruby/ruby/0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch @@ -0,0 +1,34 @@ +From dfb22e4d6662bf72879eda806eaa78c7b52b519e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 25 Jan 2022 20:29:14 -0800 +Subject: [PATCH] vm_dump.c: Define REG_S1 and REG_S2 for musl/riscv + +These defines are missing in musl, there is a possible +patch to add them to musl, but we need a full list of +these names for mcontext that can be added once for all + +Upstream-Status: Inappropriate [musl bug] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + vm_dump.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/vm_dump.c b/vm_dump.c +index a98f5aa..957b785 100644 +--- a/vm_dump.c ++++ b/vm_dump.c +@@ -39,6 +39,11 @@ + + #define MAX_POSBUF 128 + ++#if defined(__riscv) && !defined(__GLIBC__) ++# define REG_S1 9 ++# define REG_S2 18 ++#endif ++ + #define VM_CFP_CNT(ec, cfp) \ + ((rb_control_frame_t *)((ec)->vm_stack + (ec)->vm_stack_size) - \ + (rb_control_frame_t *)(cfp)) +-- +2.35.0 + diff --git a/poky/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch b/poky/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch index b7faa58655..41f206523e 100644 --- a/poky/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch +++ b/poky/meta/recipes-devtools/ruby/ruby/0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch @@ -1,28 +1,31 @@ -From: Christian Hofstaedtler <zeha@debian.org> -Date: Tue, 10 Oct 2017 15:07:11 -0300 -Subject: Mark Gemspec-reproducible change fixing #784225, too +From 6e1dc610724a7aa8368cbcddf4bbe21cccc0f731 Mon Sep 17 00:00:00 2001 +From: Lucas Kanashiro <kanashiro@debian.org> +Date: Fri, 1 Nov 2019 15:25:17 -0300 +Subject: [PATCH] Make gemspecs reproducible -I think the UTC date change will fix the Multi-Arch not-same file issue, -too. +Without an explicit date, they will get the current date and make the +build unreproducible Upstream-Status: Backport [debian] - -Signed-off-by: Antonio Terceiro <terceiro@debian.org> -Signed-off-by: Christian Hofstaedtler <zeha@debian.org> --- lib/rubygems/specification.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) +diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb +index 0d72cee..eb7bc25 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb -@@ -1695,7 +1695,9 @@ - raise(Gem::InvalidSpecificationException, - "invalid date format in specification: #{date.inspect}") - end -- when Time, DateLike then -+ when Time then -+ Time.utc(date.utc.year, date.utc.month, date.utc.day) -+ when DateLike then - Time.utc(date.year, date.month, date.day) - else - TODAY +@@ -1691,7 +1691,9 @@ class Gem::Specification < Gem::BasicSpecification + raise(Gem::InvalidSpecificationException, + "invalid date format in specification: #{date.inspect}") + end +- when Time, DateLike then ++ when Time then ++ Time.utc(date.utc.year, date.utc.month, date.utc.day) ++ when DateLike then + Time.utc(date.year, date.month, date.day) + else + TODAY +-- +2.25.1 + diff --git a/poky/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch b/poky/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch index de8d4f04cc..1e4a298317 100644 --- a/poky/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch +++ b/poky/meta/recipes-devtools/ruby/ruby/0006-Make-gemspecs-reproducible.patch @@ -41,10 +41,10 @@ index a9c0ec4..89da078 100644 spec.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"] diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec -index 36beda7..e932d83 100644 +index aa57f8a..ba7f8e5 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec -@@ -4,6 +4,7 @@ _VERSION = "0.5.10" +@@ -4,6 +4,7 @@ _VERSION = "0.5.11" Gem::Specification.new do |s| s.name = "io-console" s.version = _VERSION @@ -53,13 +53,13 @@ index 36beda7..e932d83 100644 s.email = "nobu@ruby-lang.org" s.description = "add console capabilities to IO instances." diff --git a/lib/ipaddr.gemspec b/lib/ipaddr.gemspec -index 36e2300..06dc888 100644 +index 1f4798e..48743cf 100644 --- a/lib/ipaddr.gemspec +++ b/lib/ipaddr.gemspec -@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +@@ -18,6 +18,7 @@ end Gem::Specification.new do |spec| spec.name = "ipaddr" - spec.version = "1.2.3" + spec.version = version + spec.date = RUBY_RELEASE_DATE spec.authors = ["Akinori MUSHA", "Hajimu UMEMOTO"] spec.email = ["knu@idaemons.org", "ume@mahoroba.org"] @@ -76,3 +76,6 @@ index 525a15f..f6d0e22 100644 s.version = RDoc::VERSION s.authors = [ +-- +2.25.1 + diff --git a/poky/meta/recipes-devtools/ruby/ruby_3.1.0.bb b/poky/meta/recipes-devtools/ruby/ruby_3.1.1.bb index 7183c93d45..d8fddfa520 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_3.1.0.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_3.1.1.bb @@ -11,9 +11,10 @@ SRC_URI += " \ file://0004-lib-mkmf.rb-sort-list-of-object-files-in-generated-M.patch \ file://0005-Mark-Gemspec-reproducible-change-fixing-784225-too.patch \ file://0006-Make-gemspecs-reproducible.patch \ + file://0001-vm_dump.c-Define-REG_S1-and-REG_S2-for-musl-riscv.patch \ " -SRC_URI[sha256sum] = "50a0504c6edcb4d61ce6b8cfdbddaa95707195fab0ecd7b5e92654b2a9412854" +SRC_URI[sha256sum] = "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" @@ -36,21 +37,11 @@ EXTRA_OECONF = "\ " EXTRA_OECONF:append:libc-musl = "\ - LIBS='-lucontext' \ ac_cv_func_isnan=yes \ ac_cv_func_isinf=yes \ " -EXTRA_OECONF:append:libc-musl:riscv64 = "\ - --with-coroutine=copy \ -" -EXTRA_OECONF:append:libc-musl:riscv32 = "\ - --with-coroutine=copy \ -" - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} +PARALLEL_MAKEINST = "" do_install:append:class-target () { # Find out rbconfig.rb from .installed.list |