Skip to contentSkip to conversation

package/ruby: update to 3.1.0

PATCH In review Waldemar Brodkorb 2 participants 2 messages Dec 31, 2021 – Jan 1, 2022

lore
Share & tools
lore

Waldemar Brodkorb

author
#0 lore raw

PATCH 1/1 package/ruby: update to 3.1.0

All patches are upstream. Tested with qemu-system-arm/qemu-system-sparc.

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 ...0001-fix-default-coroutine-selection.patch | 21 --------------
 package/ruby/0002-Needs-AC_PROG_CC.patch      | 28 -------------------
 package/ruby/ruby.hash                        |  4 +--
 package/ruby/ruby.mk                          |  8 ++----
 4 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 package/ruby/0001-fix-default-coroutine-selection.patch
 delete mode 100644 package/ruby/0002-Needs-AC_PROG_CC.patch
package/ruby/0001-fix-default-coroutine-selection.patch deleted +0 -21
deleted file mode 100644
index ea84aa9bc6..0000000000
@@ -1,21 +0,0 @@
-fixed default coroutine selection for musl/uclibc
-
-https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac
---- ruby-3.0.0.orig/configure.ac	2020-12-25 04:33:01.000000000 +0100
-+++ ruby-3.0.0/configure.ac	2021-02-22 13:00:53.990314464 +0100
-@@ -2441,7 +2441,10 @@
-             rb_cv_coroutine=copy
-         ],
-         [
--            rb_cv_coroutine=ucontext
-+        AC_CHECK_FUNCS([getcontext swapcontext makecontext],
-+               [rb_cv_coroutine=ucontext],
-+               [rb_cv_coroutine=copy; break]
-+	       )
-         ]
-     )
-     AC_MSG_RESULT(${rb_cv_coroutine})
package/ruby/0002-Needs-AC_PROG_CC.patch deleted +0 -28
deleted file mode 100644
index 647358be70..0000000000
@@ -1,28 +0,0 @@
-From 912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6 Mon Sep 17 00:00:00 2001
-From: Nobuyoshi Nakada <[email protected]>
-Date: Thu, 30 Sep 2021 18:24:37 +0900
-Subject: [PATCH] Needs `AC_PROG_CC`
-
-Although `AC_PROG_CC_C99` has been obsolete, `AC_PROG_CC` is not
-and the latter is necessary not to make C++ compiler mandatory.
-
-[Retrieved from:
-https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6]
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b24a8f59b0d2..c7059ee1ecf4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -218,7 +218,7 @@ rb_test_CXXFLAGS=${CXXFLAGS+yes}
- # BSD's ports and MacPorts prefix GNU binutils with 'g'
- 
- dnl Seems necessarily in order to add -std=gnu99 option for gcc 4.9.
--m4_version_prereq([2.70], [], [AC_PROG_CC_C99])
-+m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_C99])
- 
- AC_PROG_CXX
- AC_PROG_CPP
package/ruby/ruby.hash +2 -2
index 1208461cd0..93708a4d7d 100644
@@ -1,5 +1,5 @@
-# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/
-sha512  bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00  ruby-3.0.3.tar.xz
+# https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/
+sha512  a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320  ruby-3.1.0.tar.xz
 # License files, Locally calculated
 sha256  274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e  LEGAL
 sha256  967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb  COPYING
package/ruby/ruby.mk +3 -5
index 7966450fd1..0bb4391e33 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-RUBY_VERSION_MAJOR = 3.0
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).3
-RUBY_VERSION_EXT = 3.0.0
+RUBY_VERSION_MAJOR = 3.1
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).0
+RUBY_VERSION_EXT = 3.1.0
 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
 RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz
 RUBY_DEPENDENCIES = host-pkgconf host-ruby

@@ -20,8 +20,6 @@ HOST_RUBY_CONF_OPTS = \
 RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others
 RUBY_LICENSE_FILES = LEGAL COPYING BSDL
 RUBY_CPE_ID_VENDOR = ruby-lang
-# 0001-fix-default-coroutine-selection.patch
-RUBY_AUTORECONF = YES
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 RUBY_CONF_ENV += LIBS=-latomic
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Waldemar, All,

On 2021-12-31 16:12 +0100, Waldemar Brodkorb spake thusly:

Quoted 3 lines

All patches are upstream. Tested with qemu-system-arm/qemu-system-sparc.

Signed-off-by Waldemar Brodkorb <[email protected]>
    $ make host-ruby-legal-info
Quoted 1 line
Quoted 1 line
Quoted 1 line

host-ruby 3.1.0 Collecting legal info

ERROR: LEGAL has wrong sha256 hash:
ERROR: expected: 274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e
ERROR: got : 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc
ERROR: Incomplete download, or man-in-the-middle (MITM) attack

That's because new files have been added, MIT-covered, and another has been removed. So I've fixed the hash, added the MIT to the list of licenses, and pushed to master (with a bit of shuffling the variables around).

I've also noted that there is the GPL license text in the 'GPL' file at the root of the package, ad idneed, there are a few files that do refer to the GPL.

Could you please have a look and send an update, please?

Regards,
Yann E. MORIN.

Quoted 115 lines
---
 ...0001-fix-default-coroutine-selection.patch | 21 --------------
 package/ruby/0002-Needs-AC_PROG_CC.patch      | 28 -------------------
 package/ruby/ruby.hash                        |  4 +--
 package/ruby/ruby.mk                          |  8 ++----
 4 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 package/ruby/0001-fix-default-coroutine-selection.patch
 delete mode 100644 package/ruby/0002-Needs-AC_PROG_CC.patch
package/ruby/0001-fix-default-coroutine-selection.patch deleted +0 -21
deleted file mode 100644
index ea84aa9bc6..0000000000
@@ -1,21 +0,0 @@
-fixed default coroutine selection for musl/uclibc
-
-https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
-
-diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac
---- ruby-3.0.0.orig/configure.ac	2020-12-25 04:33:01.000000000 +0100
-+++ ruby-3.0.0/configure.ac	2021-02-22 13:00:53.990314464 +0100
-@@ -2441,7 +2441,10 @@
-             rb_cv_coroutine=copy
-         ],
-         [
--            rb_cv_coroutine=ucontext
-+        AC_CHECK_FUNCS([getcontext swapcontext makecontext],
-+               [rb_cv_coroutine=ucontext],
-+               [rb_cv_coroutine=copy; break]
-+	       )
-         ]
-     )
-     AC_MSG_RESULT(${rb_cv_coroutine})
package/ruby/0002-Needs-AC_PROG_CC.patch deleted +0 -28
deleted file mode 100644
index 647358be70..0000000000
@@ -1,28 +0,0 @@
-From 912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6 Mon Sep 17 00:00:00 2001
-From: Nobuyoshi Nakada <[email protected]>
-Date: Thu, 30 Sep 2021 18:24:37 +0900
-Subject: [PATCH] Needs `AC_PROG_CC`
-
-Although `AC_PROG_CC_C99` has been obsolete, `AC_PROG_CC` is not
-and the latter is necessary not to make C++ compiler mandatory.
-
-[Retrieved from:
-https://github.com/ruby/ruby/commit/912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6]
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b24a8f59b0d2..c7059ee1ecf4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -218,7 +218,7 @@ rb_test_CXXFLAGS=${CXXFLAGS+yes}
- # BSD's ports and MacPorts prefix GNU binutils with 'g'
- 
- dnl Seems necessarily in order to add -std=gnu99 option for gcc 4.9.
--m4_version_prereq([2.70], [], [AC_PROG_CC_C99])
-+m4_version_prereq([2.70], [AC_PROG_CC], [AC_PROG_CC_C99])
- 
- AC_PROG_CXX
- AC_PROG_CPP
package/ruby/ruby.hash +2 -2
index 1208461cd0..93708a4d7d 100644
@@ -1,5 +1,5 @@
-# https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/
-sha512  bb9ea426278d5a7ac46595296f03b82d43df8b7db41045cdf85611e05e26c703c53f700494cd7cf5d4c27fa953bdc5c144317d7720812db0a6e3b6f4bc4d2e00  ruby-3.0.3.tar.xz
+# https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/
+sha512  a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320  ruby-3.1.0.tar.xz
 # License files, Locally calculated
 sha256  274f8d7983052448e7fd691c81043465c92ee6fb7bd8ab3f20a7997862f2778e  LEGAL
 sha256  967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb  COPYING
package/ruby/ruby.mk +3 -5
index 7966450fd1..0bb4391e33 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-RUBY_VERSION_MAJOR = 3.0
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).3
-RUBY_VERSION_EXT = 3.0.0
+RUBY_VERSION_MAJOR = 3.1
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).0
+RUBY_VERSION_EXT = 3.1.0
 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
 RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz
 RUBY_DEPENDENCIES = host-pkgconf host-ruby

@@ -20,8 +20,6 @@ HOST_RUBY_CONF_OPTS = \
 RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others
 RUBY_LICENSE_FILES = LEGAL COPYING BSDL
 RUBY_CPE_ID_VENDOR = ruby-lang
-# 0001-fix-default-coroutine-selection.patch
-RUBY_AUTORECONF = YES
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 RUBY_CONF_ENV += LIBS=-latomic
Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot