* [Buildroot] [PATCH v2] ruby: bump version to 3.2.2
@ 2023-09-16 12:20 Waldemar Brodkorb
2023-09-17 13:00 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: Waldemar Brodkorb @ 2023-09-16 12:20 UTC (permalink / raw)
To: buildroot
Patch is included upstream, remove it and the reference in .checkpackageignore.
Host build fails with following error:
<internal:/buildroot/output/build/host-ruby-3.2.2/lib/rubygems/core_ext/kernel_require.rb>:85:in `require': cannot load such file -- psych (LoadError)
from <internal:/buildroot/output/build/host-ruby-3.2.2/lib/rubygems/core_ext/kernel_require.rb>:85:in `require'
from /buildroot/output/build/host-ruby-3.2.2/lib/rubygems.rb:608:in `load_yaml'
Fix it by adding host-libyaml to the dependencies.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
v1->v2:
- add failure for host build requested by Thomas Petazzoni
---
.checkpackageignore | 1 -
.../0001-Fix-build-with-LibreSSL-3-5.patch | 25 -------------------
package/ruby/ruby.hash | 4 +--
package/ruby/ruby.mk | 8 +++---
4 files changed, 6 insertions(+), 32 deletions(-)
delete mode 100644 package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index 73a00d610c..7b89234827 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1277,7 +1277,6 @@ package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream
package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream
package/rubix/0001-dont-use-legacy-functions.patch Upstream
package/rubix/0002-misc-fixes.patch Sob Upstream
-package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch Upstream
package/rygel/0001-build-Add-man_pages-build-options.patch Upstream
package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch Upstream
package/rygel/S99rygel Indent Shellcheck Variables
diff --git a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch
deleted file mode 100644
index 805dfd2f89..0000000000
--- a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001
-From: Jeremy Evans <code@jeremyevans.net>
-Date: Fri, 25 Mar 2022 13:11:31 -0700
-Subject: [PATCH] Fix build with LibreSSL 3.5
-
-[Retrieved from:
-https://github.com/ruby/openssl/commit/e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- ext/openssl/ossl_pkey.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
-index 2a4835a2..24d0da46 100644
---- a/ext/openssl/ossl_pkey.c
-+++ b/ext/openssl/ossl_pkey.c
-@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der)
- }
- }
- else {
--#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0)
- if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0,
- ossl_pem_passwd_cb,
- (void *)pass)) {
diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash
index 42d8a2497f..bbe77ce1c1 100644
--- a/package/ruby/ruby.hash
+++ b/package/ruby/ruby.hash
@@ -1,5 +1,5 @@
-# https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/
-sha512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 ruby-3.1.3.tar.xz
+# https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-2-2-released/
+sha512 a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935 ruby-3.2.2.tar.xz
# License files, Locally calculated
sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 28b1ec13ef..4278e6584d 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -4,9 +4,9 @@
#
################################################################################
-RUBY_VERSION_MAJOR = 3.1
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).3
-RUBY_VERSION_EXT = 3.1.0
+RUBY_VERSION_MAJOR = 3.2
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).2
+RUBY_VERSION_EXT = 3.2.0
RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz
@@ -20,7 +20,7 @@ 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
+HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl host-libyaml
RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems
HOST_RUBY_CONF_OPTS = \
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH v2] ruby: bump version to 3.2.2
2023-09-16 12:20 [Buildroot] [PATCH v2] ruby: bump version to 3.2.2 Waldemar Brodkorb
@ 2023-09-17 13:00 ` Yann E. MORIN
2023-09-18 8:26 ` Waldemar Brodkorb
0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2023-09-17 13:00 UTC (permalink / raw)
To: Waldemar Brodkorb; +Cc: buildroot
On 2023-09-16 14:20 +0200, Waldemar Brodkorb spake thusly:
> Patch is included upstream, remove it and the reference in .checkpackageignore.
>
> Host build fails with following error:
> <internal:/buildroot/output/build/host-ruby-3.2.2/lib/rubygems/core_ext/kernel_require.rb>:85:in `require': cannot load such file -- psych (LoadError)
> from <internal:/buildroot/output/build/host-ruby-3.2.2/lib/rubygems/core_ext/kernel_require.rb>:85:in `require'
> from /buildroot/output/build/host-ruby-3.2.2/lib/rubygems.rb:608:in `load_yaml'
>
> Fix it by adding host-libyaml to the dependencies.
>
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
> v1->v2:
> - add failure for host build requested by Thomas Petazzoni
You provided the error message of the build failure for the host
variant, that explains why host-ruby needs host-libyaml. That's good.
But I think that what Thomas requested, was to explain why the target
variant does not need libyaml.
Indeed, it looks like host-ruby is trying to load libyaml at runtime,
so it would kinda make sense that it would also need it at runtime on
the target...
A runtime test would be great, and would resolve the issue. ;-)
Regards,
Yann E. MORIN.
> ---
> .checkpackageignore | 1 -
> .../0001-Fix-build-with-LibreSSL-3-5.patch | 25 -------------------
> package/ruby/ruby.hash | 4 +--
> package/ruby/ruby.mk | 8 +++---
> 4 files changed, 6 insertions(+), 32 deletions(-)
> delete mode 100644 package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch
>
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 73a00d610c..7b89234827 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1277,7 +1277,6 @@ package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch Upstream
> package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch Upstream
> package/rubix/0001-dont-use-legacy-functions.patch Upstream
> package/rubix/0002-misc-fixes.patch Sob Upstream
> -package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch Upstream
> package/rygel/0001-build-Add-man_pages-build-options.patch Upstream
> package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch Upstream
> package/rygel/S99rygel Indent Shellcheck Variables
> diff --git a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch
> deleted file mode 100644
> index 805dfd2f89..0000000000
> --- a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001
> -From: Jeremy Evans <code@jeremyevans.net>
> -Date: Fri, 25 Mar 2022 13:11:31 -0700
> -Subject: [PATCH] Fix build with LibreSSL 3.5
> -
> -[Retrieved from:
> -https://github.com/ruby/openssl/commit/e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d]
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - ext/openssl/ossl_pkey.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
> -index 2a4835a2..24d0da46 100644
> ---- a/ext/openssl/ossl_pkey.c
> -+++ b/ext/openssl/ossl_pkey.c
> -@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der)
> - }
> - }
> - else {
> --#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
> -+#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0)
> - if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0,
> - ossl_pem_passwd_cb,
> - (void *)pass)) {
> diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash
> index 42d8a2497f..bbe77ce1c1 100644
> --- a/package/ruby/ruby.hash
> +++ b/package/ruby/ruby.hash
> @@ -1,5 +1,5 @@
> -# https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/
> -sha512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 ruby-3.1.3.tar.xz
> +# https://www.ruby-lang.org/en/news/2023/03/30/ruby-3-2-2-released/
> +sha512 a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935 ruby-3.2.2.tar.xz
>
> # License files, Locally calculated
> sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL
> diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
> index 28b1ec13ef..4278e6584d 100644
> --- a/package/ruby/ruby.mk
> +++ b/package/ruby/ruby.mk
> @@ -4,9 +4,9 @@
> #
> ################################################################################
>
> -RUBY_VERSION_MAJOR = 3.1
> -RUBY_VERSION = $(RUBY_VERSION_MAJOR).3
> -RUBY_VERSION_EXT = 3.1.0
> +RUBY_VERSION_MAJOR = 3.2
> +RUBY_VERSION = $(RUBY_VERSION_MAJOR).2
> +RUBY_VERSION_EXT = 3.2.0
> RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
> RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz
>
> @@ -20,7 +20,7 @@ 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
> +HOST_RUBY_DEPENDENCIES = host-pkgconf host-openssl host-libyaml
> RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
> RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems
> HOST_RUBY_CONF_OPTS = \
> --
> 2.39.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH v2] ruby: bump version to 3.2.2
2023-09-17 13:00 ` Yann E. MORIN
@ 2023-09-18 8:26 ` Waldemar Brodkorb
0 siblings, 0 replies; 3+ messages in thread
From: Waldemar Brodkorb @ 2023-09-18 8:26 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: buildroot
Hi Yann, all,
Yann E. MORIN wrote,
> On 2023-09-16 14:20 +0200, Waldemar Brodkorb spake thusly:
> > Patch is included upstream, remove it and the reference in .checkpackageignore.
> >
> > Host build fails with following error:
> > <internal:/buildroot/output/build/host-ruby-3.2.2/lib/rubygems/core_ext/kernel_require.rb>:85:in `require': cannot load such file -- psych (LoadError)
> > from <internal:/buildroot/output/build/host-ruby-3.2.2/lib/rubygems/core_ext/kernel_require.rb>:85:in `require'
> > from /buildroot/output/build/host-ruby-3.2.2/lib/rubygems.rb:608:in `load_yaml'
> >
> > Fix it by adding host-libyaml to the dependencies.
> >
> > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> > ---
> > v1->v2:
> > - add failure for host build requested by Thomas Petazzoni
>
> You provided the error message of the build failure for the host
> variant, that explains why host-ruby needs host-libyaml. That's good.
>
> But I think that what Thomas requested, was to explain why the target
> variant does not need libyaml.
>
> Indeed, it looks like host-ruby is trying to load libyaml at runtime,
> so it would kinda make sense that it would also need it at runtime on
> the target...
>
> A runtime test would be great, and would resolve the issue. ;-)
I sent an runtime test to the list. THis show that ruby should work
without libyaml on the target. It is an optional feature for the
target.
best regards
Waldemar
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-18 8:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-16 12:20 [Buildroot] [PATCH v2] ruby: bump version to 3.2.2 Waldemar Brodkorb
2023-09-17 13:00 ` Yann E. MORIN
2023-09-18 8:26 ` Waldemar Brodkorb
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox