diff options
Diffstat (limited to 'package/ruby')
| -rw-r--r-- | package/ruby/Makefile | 19 | ||||
| -rw-r--r-- | package/ruby/patches/patch-configure | 16 |
2 files changed, 11 insertions, 24 deletions
diff --git a/package/ruby/Makefile b/package/ruby/Makefile index ab1d92fad..8553eb5c5 100644 --- a/package/ruby/Makefile +++ b/package/ruby/Makefile @@ -4,18 +4,17 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= ruby -PKG_VERSION:= 2.4.1 +PKG_VERSION:= 3.4.6 PKG_RELEASE:= 1 -PKG_HASH:= a330e10d5cb5e53b3a0078326c5731888bb55e32c4abfeb27d9e7f8e5d000250 +PKG_HASH:= 804995bc22938aa475127000d3103cb133409ad3955edfc0e7412be66a4859b8 PKG_DESCR:= scripting language PKG_SECTION:= dev/lang -PKG_BUILDDEP:= ruby-host libressl zlib +PKG_DEPENDS:= libopenssl zlib +PKG_BUILDDEP:= ruby-host openssl zlib +HOST_BUILDDEP:= openssl-host yaml-host PKG_NEEDS:= threads PKG_URL:= http://www.ruby-lang.org/ -PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/2.4/ -#PKG_NOPARALLEL:= 1 - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= http://ftp.ruby-lang.org/pub/ruby/3.4/ include ${ADK_TOPDIR}/mk/host.mk include ${ADK_TOPDIR}/mk/package.mk @@ -26,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 \ @@ -37,8 +39,9 @@ ALL_TARGET:= main INSTALL_TARGET:= install-nodoc HOST_CONFIGURE_ARGS+= --disable-install-doc \ + --disable-yjit \ --disable-shared \ - --with-out-ext=curses,openssl,readline \ + --with-out-ext=curses,readline,openssl \ --disable-rubygems HOST_ALL_TARGET:= main HOST_INSTALL_TARGET:= install-nodoc diff --git a/package/ruby/patches/patch-configure b/package/ruby/patches/patch-configure deleted file mode 100644 index 6a6360320..000000000 --- a/package/ruby/patches/patch-configure +++ /dev/null @@ -1,16 +0,0 @@ ---- ruby-2.4.0.orig/configure 2016-12-23 17:06:46.000000000 +0100 -+++ ruby-2.4.0/configure 2017-01-30 03:08:52.351107663 +0100 -@@ -9412,6 +9412,13 @@ esac - ac_cv_func_isinf=yes - ac_cv_func_isnan=yes - ;; #( -+ linux*) : -+ LIBS="-lm $LIBS" -+ # finite(), isinf() and isnan() are macros on Linux. -+ ac_cv_func_finite=yes -+ ac_cv_func_isinf=yes -+ ac_cv_func_isnan=yes -+ ;; #( - aix*) : - LIBS="-lm $LIBS" - ac_cv_func_round=no |