diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2023-09-27 09:44:42 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2023-12-12 05:54:41 +0100 |
| commit | c7b30bdd07eeda3f18fa0d1fe4138f22d14850e6 (patch) | |
| tree | 41bed471709622ff371b4d90b886876765cd5bcd | |
| parent | bac4cf67f5dad3af5619b3149d4c9bd22f806672 (diff) | |
ruby: add libressl patch from buildroot
| -rw-r--r-- | package/ruby/Makefile | 3 | ||||
| -rw-r--r-- | package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch | 25 |
2 files changed, 28 insertions, 0 deletions
diff --git a/package/ruby/Makefile b/package/ruby/Makefile index ab0e41e2a..536d09593 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -25,6 +25,9 @@ $(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \ stack_protector=no \ + ac_cv_func_finite=yes \ + ac_cv_func_isinf=yes \ + ac_cv_func_isnan=yes \ rb_cv_binary_elf=yes CONFIGURE_ARGS+= --disable-install-doc \ --with-out-ext=fiddle \ diff --git a/package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch new file mode 100644 index 000000000..805dfd2f8 --- /dev/null +++ b/package/ruby/patches/0001-Fix-build-with-LibreSSL-3-5.patch @@ -0,0 +1,25 @@ +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)) { |