diff options
| -rw-r--r-- | package/ruby/Makefile | 9 | ||||
| -rw-r--r-- | package/ruby/patches/0001-fix-default-coroutine-selection.patch | 21 |
2 files changed, 4 insertions, 26 deletions
diff --git a/package/ruby/Makefile b/package/ruby/Makefile index 186cb5b1f..ab0e41e2a 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 3.0.3 +PKG_VERSION:= 3.1.2 PKG_RELEASE:= 1 -PKG_HASH:= 88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c +PKG_HASH:= ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a PKG_DESCR:= scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libressl zlib @@ -14,7 +14,7 @@ PKG_BUILDDEP:= ruby-host libressl zlib HOST_BUILDDEP:= libressl-host PKG_NEEDS:= threads PKG_URL:= http://www.ruby-lang.org/ -PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.0/ +PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.1/ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -22,7 +22,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf # uClibc setpgrp does not take arguments CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes \ stack_protector=no \ @@ -38,7 +37,7 @@ INSTALL_TARGET:= install-nodoc HOST_CONFIGURE_ARGS+= --disable-install-doc \ --disable-shared \ - --with-out-ext=curses,readline \ + --with-out-ext=curses,readline,openssl \ --disable-rubygems HOST_ALL_TARGET:= main HOST_INSTALL_TARGET:= install-nodoc diff --git a/package/ruby/patches/0001-fix-default-coroutine-selection.patch b/package/ruby/patches/0001-fix-default-coroutine-selection.patch deleted file mode 100644 index ea84aa9bc..000000000 --- a/package/ruby/patches/0001-fix-default-coroutine-selection.patch +++ /dev/null @@ -1,21 +0,0 @@ -fixed default coroutine selection for musl/uclibc - -https://github.com/ruby/ruby/pull/3567/commits/b570e7de87aaad8c903176d835e8124127f627b3 - -Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> - -diff -Nur ruby-3.0.0.orig/configure.ac ruby-3.0.0/configure.ac ---- ruby-3.0.0.orig/configure.ac 2020-12-25 04:33:01.000000000 +0100 -+++ ruby-3.0.0/configure.ac 2021-02-22 13:00:53.990314464 +0100 -@@ -2441,7 +2441,10 @@ - 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}) |