From b4efd17526a5554b5191e3e5ef69d33aa210c5ce Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 31 Dec 2021 16:12:52 +0100 Subject: [PATCH] package/ruby: update to 3.1.0 All patches are upstream. Tested with qemu-system-arm/qemu-system-sparc. LEGAL license hash changed: - drop aclocal.m4, no longer provided - add MIT-covered works Signed-off-by: Waldemar Brodkorb [yann.morin.1998@free.fr: update license hash] Signed-off-by: Yann E. MORIN --- ...0001-fix-default-coroutine-selection.patch | 21 -------------- package/ruby/0002-Needs-AC_PROG_CC.patch | 28 ------------------- package/ruby/ruby.hash | 6 ++-- package/ruby/ruby.mk | 21 ++++++++------ 4 files changed, 16 insertions(+), 60 deletions(-) delete mode 100644 package/ruby/0001-fix-default-coroutine-selection.patch delete mode 100644 package/ruby/0002-Needs-AC_PROG_CC.patch diff --git a/package/ruby/0001-fix-default-coroutine-selection.patch b/package/ruby/0001-fix-default-coroutine-selection.patch deleted file mode 100644 index ea84aa9bc6..0000000000 --- a/package/ruby/0001-fix-default-coroutine-selection.patch +++ /dev/null @@ -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 - -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}) diff --git a/package/ruby/0002-Needs-AC_PROG_CC.patch b/package/ruby/0002-Needs-AC_PROG_CC.patch deleted file mode 100644 index 647358be70..0000000000 --- a/package/ruby/0002-Needs-AC_PROG_CC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 912a8dcfc5369d840dcd6bf0f88ee0bac7d902d6 Mon Sep 17 00:00:00 2001 -From: Nobuyoshi Nakada -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 ---- - 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 diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 1208461cd0..90e7627a97 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,6 +1,6 @@ -# 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 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING sha256 36a9a6e7347214bbba599a412617204e65bff065dcbe5c46f5cb454c80de9eb0 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 7966450fd1..4f3b94f83b 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,11 +4,21 @@ # ################################################################################ -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_LICENSE = \ + Ruby or BSD-2-Clause, \ + BSD-3-Clause, \ + MIT, \ + others +RUBY_LICENSE_FILES = LEGAL COPYING BSDL + +RUBY_CPE_ID_VENDOR = ruby-lang + RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -17,11 +27,6 @@ HOST_RUBY_CONF_OPTS = \ --disable-install-doc \ --with-out-ext=curses,readline \ --without-gmp -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