Skip to contentSkip to conversation

ruby: update to 2.7.1

PATCH Superseded Waldemar Brodkorb 2 participants 2 messages Sep 30, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ruby: update to 2.7.1

---
 package/ruby/ruby.hash | 4 ++--
 package/ruby/ruby.mk   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
package/ruby/ruby.hash +2 -2
index 89cab3fcd3..e9f53879b1 100644
@@ -1,5 +1,5 @@
-# https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-4-10-released/
-sha256 d5668ed11544db034f70aec37d11e157538d639ed0d0a968e2f587191fc530df  ruby-2.4.10.tar.xz
+# Locally calculated
+sha256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7  ruby-2.7.1.tar.xz
 # License files, Locally calculated
 sha256 609292a6d848ab223073944fc2d844449391a5ba2055a8b5baf1726bc13b39cb  LEGAL
 sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864  COPYING
package/ruby/ruby.mk +3 -3
index 6f8cb319cb..02f43814fd 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-RUBY_VERSION_MAJOR = 2.4
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).10
-RUBY_VERSION_EXT = 2.4.0
+RUBY_VERSION_MAJOR = 2.7
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).1
+RUBY_VERSION_EXT = 2.7.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
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 ruby: update to 2.7.1

Hello Waldemar,

package/ruby/ruby.mk line 9

Quoted 6 lines · On Wed, 30 Sep 2020 12:23:19 +0200 Waldemar Brodkorb <[email protected]> wrote:
package/ruby/ruby.mk +3 -3
-RUBY_VERSION_MAJOR = 2.4
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).10
-RUBY_VERSION_EXT = 2.4.0
+RUBY_VERSION_MAJOR = 2.7
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).1
+RUBY_VERSION_EXT = 2.7.0

Thanks a lot for taking care of updating Ruby! Unfortunately, this breaks the build, at least on SuperH/uClibc:

In file included from coroutine/ucontext/Context.c:14:
coroutine/ucontext/Context.h:22:5: error: unknown type name ?ucontext_t?

     ucontext_t state;
     ^~~~~~~~~~
coroutine/ucontext/Context.h: In function ?coroutine_initialize_main?:
coroutine/ucontext/Context.h:32:5: warning: implicit declaration of function ?getcontext? [-Wimplicit-function-declaration]
     getcontext(&context->state);
     ^~~~~~~~~~
coroutine/ucontext/Context.h: In function ?coroutine_initialize?:
coroutine/ucontext/Context.h:45:19: error: request for member ?uc_stack? in something not a structure or union
     context->state.uc_stack.ss_size = size;
                   ^
In file included from coroutine/ucontext/Context.c:14:
coroutine/ucontext/Context.h:47:19: error: request for member ?uc_stack? in something not a structure or union
     context->state.uc_stack.ss_sp = (char*)stack;
                   ^
coroutine/ucontext/Context.h:48:19: error: request for member ?uc_stack? in something not a structure or union
     context->state.uc_stack.ss_flags = 0;
                   ^
coroutine/ucontext/Context.h:49:19: error: request for member ?uc_link? in something not a structure or union
     context->state.uc_link = NULL;
                   ^
coroutine/ucontext/Context.h:51:5: warning: implicit declaration of function ?makecontext? [-Wimplicit-function-declaration]
     makecontext(&context->state, (void(*)(void))coroutine_trampoline, 2, (void*)start, (void*)context);
     ^~~~~~~~~~~
coroutine/ucontext/Context.h: In function ?coroutine_transfer?:
coroutine/ucontext/Context.h:59:5: warning: implicit declaration of function ?swapcontext? [-Wimplicit-function-declaration]
     swapcontext(&current->state, &target->state);
     ^~~~~~~~~~~
coroutine/ucontext/Context.h: In function ?coroutine_destroy?:
coroutine/ucontext/Context.h:67:19: error: request for member ?uc_stack? in something not a structure or union
     context->state.uc_stack.ss_sp = NULL;
                   ^
coroutine/ucontext/Context.h:68:19: error: request for member ?uc_stack? in something not a structure or union
     context->state.uc_stack.ss_size = 0;
                   ^

make[1]: *** [Makefile:421: coroutine/ucontext/Context.o] Error 1 make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory '/home/thomas/projets/buildroot/output/build/ruby-2.7.1'

Also, could you review ruby.mk and see if other changes are needed? For example, when I see:

# workaround for amazing build failure, see
# http://lists.busybox.net/pipermail/buildroot/2014-December/114273.html
define RUBY_REMOVE_VERCONF_H
        rm -f $(@D)/verconf.h
endef
RUBY_POST_CONFIGURE_HOOKS += RUBY_REMOVE_VERCONF_H

It's good to check if that's still needed.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com