diff --git a/cross/ruby/Makefile b/cross/ruby/Makefile index dca4e4165bb..2b9141bda5c 100644 --- a/cross/ruby/Makefile +++ b/cross/ruby/Makefile @@ -1,14 +1,14 @@ PKG_NAME = ruby PKG_VERS = 3.1.2 -PKG_SHORT_VERS = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS))) PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://cache.ruby-lang.org/pub/ruby/$(PKG_SHORT_VERS) +PKG_DIST_SITE = https://cache.ruby-lang.org/pub/ruby/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS))) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) BUILD_DEPENDS = native/ruby -DEPENDS = cross/openssl cross/readline cross/gdbm cross/berkeleydb +DEPENDS = cross/openssl3 cross/readline cross/gdbm cross/berkeleydb +# Ruby 3.1.2 is the latest version that compiles without std=c++11 support (ARMv5_ARCHS) # even it compiles with older cross/gdbm, ruby crashes at runtime UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) @@ -28,8 +28,7 @@ NATIVE_RUBY = $(realpath $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/ins GNU_CONFIGURE = 1 CONFIGURE_ARGS = --with-baseruby=$(NATIVE_RUBY) --prefix=$(INSTALL_PREFIX) --disable-install-doc -# avoid warning "_FORTIFY_SOURCE requires compiling with optimization (-O)" -ADDITIONAL_CFLAGS = -O3 +ADDITIONAL_CFLAGS = -O2 include ../../mk/spksrc.cross-cc.mk diff --git a/cross/ruby/PLIST b/cross/ruby/PLIST index e7f3d36f435..937661fdc74 100644 --- a/cross/ruby/PLIST +++ b/cross/ruby/PLIST @@ -13,3 +13,6 @@ rsc:bin/ruby rsc:bin/typeprof rsc:lib/ruby/3.1.0 rsc:lib/ruby/gems +lib:lib/ruby/*/*/*.so +lib:lib/ruby/*/*/*/*.so +lib:lib/ruby/*/*/*/*/*.so diff --git a/spk/ruby/Makefile b/spk/ruby/Makefile index dad9eb6f956..0e2989884b6 100644 --- a/spk/ruby/Makefile +++ b/spk/ruby/Makefile @@ -1,14 +1,14 @@ SPK_NAME = ruby SPK_VERS = 3.1.2 -SPK_REV = 11 +SPK_REV = 12 SPK_ICON = src/ruby.png -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/ruby # even it compiles with older cross/gdbm, ruby crashes at runtime UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) -CHANGELOG = "1. Update ruby to v3.1.2.
2. Update openssl to v1.1.1o." +CHANGELOG = "1. Update openssl to v3.1.4." MAINTAINER = SynoCommunity DESCRIPTION = Ruby Programming Language.