From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2] ruby: update to 2.7.1
Date: Sun, 04 Oct 2020 20:54:19 +0200 [thread overview]
Message-ID: <87blhhrfdw.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <20201001004602.pfh6b7jfoj7v4eji@waldemar-brodkorb.de> (Waldemar Brodkorb's message of "Thu, 1 Oct 2020 02:46:02 +0200")
>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes:
> - add patch to recognize coroutines correctly
> - remove unneeded verconf.h remove hack
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
> v1-> v2:
> - fix build for SuperH/uClibc
> - remove unneeded verconf.h hack
> ---
> .../0001-fix-default-coroutine-selection.patch | 35 ++++++++++++++++++++++
> package/ruby/ruby.hash | 4 +--
> package/ruby/ruby.mk | 14 +++------
> 3 files changed, 41 insertions(+), 12 deletions(-)
> create mode 100644 package/ruby/0001-fix-default-coroutine-selection.patch
> diff --git a/package/ruby/0001-fix-default-coroutine-selection.patch b/package/ruby/0001-fix-default-coroutine-selection.patch
> new file mode 100644
> index 0000000000..79dbd692e5
> --- /dev/null
> +++ b/package/ruby/0001-fix-default-coroutine-selection.patch
> @@ -0,0 +1,35 @@
> +fixed default coroutine selection for musl/uclibc
> +
> +https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3
> +
> +Signed-off-by: Waldemar Brodkorb <wbx@opennadk.org>
> +
> +diff -Nur ruby-2.7.1.orig/configure.ac ruby-2.7.1/configure.ac
> +--- ruby-2.7.1.orig/configure.ac 2020-03-31 12:44:55.000000000 +0200
> ++++ ruby-2.7.1/configure.ac 2020-10-01 00:03:53.130462286 +0200
> +@@ -2344,8 +2344,12 @@
> + 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 -Nur ruby-2.7.1.orig/coroutine/copy/Context.c ruby-2.7.1/coroutine/copy/Context.c
> +--- ruby-2.7.1.orig/coroutine/copy/Context.c 2020-03-31 12:44:55.000000000 +0200
> ++++ ruby-2.7.1/coroutine/copy/Context.c 2020-10-01 00:04:59.414670705 +0200
> +@@ -5,6 +5,8 @@
> + * Copyright, 2019, by Samuel Williams. All rights reserved.
> + */
> +
> ++#include <sys/types.h>
> ++
> + #include "Context.h"
> +
> + // http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html
> diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash
> index 89cab3fcd3..e9f53879b1 100644
> --- a/package/ruby/ruby.hash
> +++ b/package/ruby/ruby.hash
> @@ -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
We should use the upstream URL when upstream publishes hashes, so I've
changed this to:
# https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-7-1-released/
> 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
> @@ -19,6 +19,7 @@ HOST_RUBY_CONF_OPTS = \
> --without-gmp
> RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others
> RUBY_LICENSE_FILES = LEGAL COPYING BSDL
> +RUBY_AUTORECONF = YES
We normally add a comment explaining why, so I've added:
# 0001-fix-default-coroutine-selection.patch
And committed, thanks.
I see that ruby 2.7.2 has recently been released with a security fix,
care to send a patch for that?
https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/
We currently don't have anyone listed in DEVELOPERS for ruby, care to be
listed for it?
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2020-10-04 18:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 0:46 [Buildroot] [PATCH v2] ruby: update to 2.7.1 Waldemar Brodkorb
2020-10-04 18:54 ` Peter Korsgaard [this message]
2020-10-04 19:04 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87blhhrfdw.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.