Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ruby: update to use openssl3 #5997

Merged
merged 1 commit into from
Jan 31, 2024
Merged

ruby: update to use openssl3 #5997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions cross/ruby/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -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

Expand Down
3 changes: 3 additions & 0 deletions cross/ruby/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions spk/ruby/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.<br/>2. Update openssl to v1.1.1o."
CHANGELOG = "1. Update openssl to v3.1.4."

MAINTAINER = SynoCommunity
DESCRIPTION = Ruby Programming Language.
Expand Down