* [Buildroot] [PATCH v2] ruby: update to 2.7.1
@ 2020-10-01 0:46 Waldemar Brodkorb
2020-10-04 18:54 ` Peter Korsgaard
2020-10-04 19:04 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Waldemar Brodkorb @ 2020-10-01 0:46 UTC (permalink / raw)
To: buildroot
- 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
+sha256 b224f9844646cc92765df8288a46838511c1cec5b550d8874bd4686a904fcee7 ruby-2.7.1.tar.xz
# License files, Locally calculated
sha256 609292a6d848ab223073944fc2d844449391a5ba2055a8b5baf1726bc13b39cb LEGAL
sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864 COPYING
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index d138aaaa1a..d289fb937c 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -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
@@ -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
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
# On uClibc, finite, isinf and isnan are not directly implemented as
@@ -70,13 +71,6 @@ else
RUBY_CONF_OPTS += --without-gmp
endif
-# 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
-
# Remove rubygems and friends, as they need extensions that aren't
# built and a target compiler.
RUBY_EXTENSIONS_REMOVE = rake* rdoc* rubygems*
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [Buildroot] [PATCH v2] ruby: update to 2.7.1
2020-10-01 0:46 [Buildroot] [PATCH v2] ruby: update to 2.7.1 Waldemar Brodkorb
@ 2020-10-04 18:54 ` Peter Korsgaard
2020-10-04 19:04 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-10-04 18:54 UTC (permalink / raw)
To: buildroot
>>>>> "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
^ permalink raw reply [flat|nested] 3+ messages in thread* [Buildroot] [PATCH v2] ruby: update to 2.7.1
2020-10-01 0:46 [Buildroot] [PATCH v2] ruby: update to 2.7.1 Waldemar Brodkorb
2020-10-04 18:54 ` Peter Korsgaard
@ 2020-10-04 19:04 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-10-04 19:04 UTC (permalink / raw)
To: buildroot
>>>>> "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
You also forgot to update the license hashes. Please always remember to
run 'make ruby-legal-info' when bumping the version to verify.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-04 19:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-01 0:46 [Buildroot] [PATCH v2] ruby: update to 2.7.1 Waldemar Brodkorb
2020-10-04 18:54 ` Peter Korsgaard
2020-10-04 19:04 ` Peter Korsgaard
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.