commit: 727a6e02fc23f34f9106ea49383d8c3f5e7f190a
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Apr 28 00:11:04 2023 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Fri Apr 28 00:12:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=727a6e02
dev-lang/ruby: sync ::gentoo
Signed-off-by: orbea <orbea <AT> riseup.net>
dev-lang/ruby/Manifest | 2 -
.../files/3.0/902-hppa-pthread-stack-size.patch | 54 +++++
.../files/3.1/902-hppa-pthread-stack-size.patch | 54 +++++
.../files/3.2/902-hppa-pthread-stack-size.patch | 54 +++++
.../{ruby-3.0.5.ebuild => ruby-3.0.6-r2.ebuild} | 41 ++--
dev-lang/ruby/ruby-3.0.6.ebuild | 2 +-
dev-lang/ruby/ruby-3.1.3.ebuild | 252 ---------------------
.../{ruby-3.1.4.ebuild => ruby-3.1.4-r2.ebuild} | 41 ++--
8 files changed, 217 insertions(+), 283 deletions(-)
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 5a7b7e2..7bb6eb1 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,4 +1,2 @@
-DIST ruby-3.0.5.tar.xz 15880196 BLAKE2B
581aa202f6b1b5c72bb18d486c4f74ec87a6c2dd38166c4841b75dba891aabd72c3889b158134b04763cddb22c0f60015f4d21c5130077053e1fcb13e28a8024
SHA512
1c69d18210a2156f7696c678a8d54bf05c4dc49a1401c1ecc5760b1c23fb6ac14053873a225564664d6a327cda274ce72f47d112a6ad8d378f978de4e507e9a0
DIST ruby-3.0.6.tar.xz 15864560 BLAKE2B
e1fca86cdf267fc2289ef4d605fdf0023265c3a291ca4088361c0acd64310a7c41bf0750b4ac762157c20ceaa5df8bdc0a67374bcad9654bca5c3fc8630ff89c
SHA512
abbf883cd9f3ddbd171df8f8c3cd35d930623c4c01a5e01387de0aee9811cca7604b82163e18e04f809773bf1ca5a450f13f62f3db14f191f610e116ae4fa6f8
-DIST ruby-3.1.3.tar.xz 15300224 BLAKE2B
f3ef9031c2902bf5d624dce0a4584724e7a9099fb8b33b86a99026c37f4b91f23ff35c23a3cd7715bf739e6c539cc3612b5a750d00cbacf8e4ebcc70bbc85f41
SHA512
4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69
DIST ruby-3.1.4.tar.xz 15316604 BLAKE2B
5d771c267451c05ae192991976957d43d1131e652ac5a90a8dfff9deba97cf6b139d0113f5d2ed44225a545aa79a1c732555de1efc83d1010d097ec35f7e92dd
SHA512
a627bb629a10750b8b2081ad451a41faea0fc85d95aa1e267e3d2a0f56a35bb58195d4a8d13bbdbd82f4197a96dae22b1cee1dfc83861ec33a67ece07aef5633
diff --git a/dev-lang/ruby/files/3.0/902-hppa-pthread-stack-size.patch
b/dev-lang/ruby/files/3.0/902-hppa-pthread-stack-size.patch
new file mode 100644
index 0000000..7978566
--- /dev/null
+++ b/dev-lang/ruby/files/3.0/902-hppa-pthread-stack-size.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/701494
+
+From 794b6fce94343c4f9dceca5d08224b0fb364fde8 Mon Sep 17 00:00:00 2001
+From: Sam James <s...@gentoo.org>
+Date: Fri, 7 Apr 2023 11:46:12 +0100
+Subject: [PATCH] thread_pthread: Grow main_stack if required (fixes tests on
+ HPPA)
+
+On HPPA, test_insns.rb fails (along with various Ruby gems) with
+'stack level too deep (SystemStackError)'. This turns out to be because HPPA
+defaults to a small(er) stack.
+
+With this change, most of Ruby's test suite now passes on HPPA.
+
+Thanks to both Dave and Helge for the investigation and coming up with the
+patch.
+
+Bug: https://bugs.gentoo.org/701494
+Bug: https://bugs.debian.org/881773
+Bug: https://bugs.debian.org/881772 (for PPC64)
+Bug: https://github.com/rack/rack/issues/1640
+Thanks-to: John David Anglin <dave.ang...@bell.net>
+Thanks-to: Helge Deller <del...@gmx.de>
+Signed-off-by: Sam James <s...@gentoo.org>
+--- a/thread_pthread.c
++++ b/thread_pthread.c
+@@ -681,8 +681,22 @@ size_t pthread_get_stacksize_np(pthread_t);
+ # define MAINSTACKADDR_AVAILABLE 0
+ # endif
+ #endif
+-#if MAINSTACKADDR_AVAILABLE && !defined(get_main_stack)
+-# define get_main_stack(addr, size) get_stack(addr, size)
++#if MAINSTACKADDR_AVAILABLE
++static int get_stack(void **, size_t *);
++static int
++get_main_stack(void **addr, size_t *size)
++{
++ int ret = get_stack(addr, size);
++
++#ifdef __hppa__
++ /* On some architectures, the initial stack size may be too small, but
fortunately,
++ it's growable. Bump it up to the minimum needed if it is too small. */
++ if (*size < RUBY_VM_THREAD_VM_STACK_SIZE)
++ *size = RUBY_VM_THREAD_VM_STACK_SIZE;
++#endif
++
++ return ret;
++}
+ #endif
+
+ #ifdef STACKADDR_AVAILABLE
+--
+2.40.0
+
diff --git a/dev-lang/ruby/files/3.1/902-hppa-pthread-stack-size.patch
b/dev-lang/ruby/files/3.1/902-hppa-pthread-stack-size.patch
new file mode 100644
index 0000000..2578ff0
--- /dev/null
+++ b/dev-lang/ruby/files/3.1/902-hppa-pthread-stack-size.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/701494
+
+From 91bfb8a5166f4530ce556a11a4b7fb64983b7686 Mon Sep 17 00:00:00 2001
+From: Sam James <s...@gentoo.org>
+Date: Fri, 7 Apr 2023 11:46:12 +0100
+Subject: [PATCH] thread_pthread: Grow main_stack if required (fixes tests on
+ HPPA)
+
+On HPPA, test_insns.rb fails (along with various Ruby gems) with
+'stack level too deep (SystemStackError)'. This turns out to be because HPPA
+defaults to a small(er) stack.
+
+With this change, most of Ruby's test suite now passes on HPPA.
+
+Thanks to both Dave and Helge for the investigation and coming up with the
+patch.
+
+Bug: https://bugs.gentoo.org/701494
+Bug: https://bugs.debian.org/881773
+Bug: https://bugs.debian.org/881772 (for PPC64)
+Bug: https://github.com/rack/rack/issues/1640
+Thanks-to: John David Anglin <dave.ang...@bell.net>
+Thanks-to: Helge Deller <del...@gmx.de>
+Signed-off-by: Sam James <s...@gentoo.org>
+--- a/thread_pthread.c
++++ b/thread_pthread.c
+@@ -738,8 +738,22 @@ size_t pthread_get_stacksize_np(pthread_t);
+ # define MAINSTACKADDR_AVAILABLE 0
+ # endif
+ #endif
+-#if MAINSTACKADDR_AVAILABLE && !defined(get_main_stack)
+-# define get_main_stack(addr, size) get_stack(addr, size)
++#if MAINSTACKADDR_AVAILABLE
++static int get_stack(void **, size_t *);
++static int
++get_main_stack(void **addr, size_t *size)
++{
++ int ret = get_stack(addr, size);
++
++#ifdef __hppa__
++ /* On some architectures, the initial stack size may be too small, but
fortunately,
++ it's growable. Bump it up to the minimum needed if it is too small. */
++ if (*size < RUBY_VM_THREAD_VM_STACK_SIZE)
++ *size = RUBY_VM_THREAD_VM_STACK_SIZE;
++#endif
++
++ return ret;
++}
+ #endif
+
+ #ifdef STACKADDR_AVAILABLE
+--
+2.40.0
+
diff --git a/dev-lang/ruby/files/3.2/902-hppa-pthread-stack-size.patch
b/dev-lang/ruby/files/3.2/902-hppa-pthread-stack-size.patch
new file mode 100644
index 0000000..96e24a3
--- /dev/null
+++ b/dev-lang/ruby/files/3.2/902-hppa-pthread-stack-size.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/701494
+
+From 40ccf3b91071d3603335b0b7095613ef1843f9e1 Mon Sep 17 00:00:00 2001
+From: Sam James <s...@gentoo.org>
+Date: Fri, 7 Apr 2023 11:46:12 +0100
+Subject: [PATCH] thread_pthread: Grow main_stack if required (fixes tests on
+ HPPA)
+
+On HPPA, test_insns.rb fails (along with various Ruby gems) with
+'stack level too deep (SystemStackError)'. This turns out to be because HPPA
+defaults to a small(er) stack.
+
+With this change, most of Ruby's test suite now passes on HPPA.
+
+Thanks to both Dave and Helge for the investigation and coming up with the
+patch.
+
+Bug: https://bugs.gentoo.org/701494
+Bug: https://bugs.debian.org/881773
+Bug: https://bugs.debian.org/881772 (for PPC64)
+Bug: https://github.com/rack/rack/issues/1640
+Thanks-to: John David Anglin <dave.ang...@bell.net>
+Thanks-to: Helge Deller <del...@gmx.de>
+Signed-off-by: Sam James <s...@gentoo.org>
+--- a/thread_pthread.c
++++ b/thread_pthread.c
+@@ -858,8 +858,22 @@ size_t pthread_get_stacksize_np(pthread_t);
+ # define MAINSTACKADDR_AVAILABLE 0
+ # endif
+ #endif
+-#if MAINSTACKADDR_AVAILABLE && !defined(get_main_stack)
+-# define get_main_stack(addr, size) get_stack(addr, size)
++#if MAINSTACKADDR_AVAILABLE
++static int get_stack(void **, size_t *);
++static int
++get_main_stack(void **addr, size_t *size)
++{
++ int ret = get_stack(addr, size);
++
++#ifdef __hppa__
++ /* On some architectures, the initial stack size may be too small, but
fortunately,
++ it's growable. Bump it up to the minimum needed if it is too small. */
++ if (*size < RUBY_VM_THREAD_VM_STACK_SIZE)
++ *size = RUBY_VM_THREAD_VM_STACK_SIZE;
++#endif
++
++ return ret;
++}
+ #endif
+
+ #ifdef STACKADDR_AVAILABLE
+--
+2.40.0
+
diff --git a/dev-lang/ruby/ruby-3.0.5.ebuild
b/dev-lang/ruby/ruby-3.0.6-r2.ebuild
similarity index 84%
rename from dev-lang/ruby/ruby-3.0.5.ebuild
rename to dev-lang/ruby/ruby-3.0.6-r2.ebuild
index 99e94b2..a901182 100644
--- a/dev-lang/ruby/ruby-3.0.5.ebuild
+++ b/dev-lang/ruby/ruby-3.0.6-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic multiprocessing
MY_P="${PN}-$(ver_cut 1-3)"
S=${WORKDIR}/${MY_P}
@@ -45,28 +45,29 @@ RDEPEND="
DEPEND="${RDEPEND}"
BUNDLED_GEMS="
- >=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
- >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
- >=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
- >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
- >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
- >=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
- >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
- >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
+ >=dev-ruby/minitest-5.14.2[ruby_targets_ruby30(-)]
+ >=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30(-)]
+ >=dev-ruby/rake-13.0.3[ruby_targets_ruby30(-)]
+ >=dev-ruby/rbs-1.0.0[ruby_targets_ruby30(-)]
+ >=dev-ruby/rexml-3.2.4[ruby_targets_ruby30(-)]
+ >=dev-ruby/rss-0.2.9[ruby_targets_ruby30(-)]
+ >=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30(-)]
+ >=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30(-)]
"
PDEPEND="
${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby30]
- >=dev-ruby/bundler-2.2.15[ruby_targets_ruby30]
- >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
- >=dev-ruby/json-2.5.1[ruby_targets_ruby30]
- rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
+ virtual/rubygems[ruby_targets_ruby30(-)]
+ >=dev-ruby/bundler-2.2.15[ruby_targets_ruby30(-)]
+ >=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30(-)]
+ >=dev-ruby/json-2.5.1[ruby_targets_ruby30(-)]
+ rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30(-)] )
xemacs? ( app-xemacs/ruby-modes )"
src_prepare() {
eapply "${FILESDIR}"/${PN}-3.0-libressl.patch
eapply "${FILESDIR}"/"${SLOT}"/010*.patch
+ eapply "${FILESDIR}"/"${SLOT}"/902*.patch
if use elibc_musl ; then
eapply "${FILESDIR}"/3.0/900-musl-*.patch
@@ -111,6 +112,15 @@ src_prepare() {
src_configure() {
local modules= myconf=
+ # Ruby's build system does interesting things with MAKEOPTS and doesn't
+ # handle MAKEOPTS="-Oline" or similar well. Just filter it all out
+ # and use -j/-l parsed out from the original MAKEOPTS, then use that.
+ # Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
+ # is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
+ local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+ unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
+ export MAKEOPTS="${makeopts_tmp}"
+
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
filter-flags -fomit-frame-pointer
# In many places aliasing rules are broken; play it safe
@@ -157,6 +167,9 @@ src_configure() {
--enable-shared \
--enable-pthread \
--disable-rpath \
+ --without-baseruby \
+ --with-compress-debug-sections=no \
+ --enable-mkmf-verbose \
--with-out-ext="${modules}" \
$(use_with jemalloc jemalloc) \
$(use_enable jit jit-support ) \
diff --git a/dev-lang/ruby/ruby-3.0.6.ebuild b/dev-lang/ruby/ruby-3.0.6.ebuild
index 3749162..99e94b2 100644
--- a/dev-lang/ruby/ruby-3.0.6.ebuild
+++ b/dev-lang/ruby/ruby-3.0.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/";
SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz";
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc rubytests socks5
+ssl static-libs systemtap tk xemacs"
RDEPEND="
diff --git a/dev-lang/ruby/ruby-3.1.3.ebuild b/dev-lang/ruby/ruby-3.1.3.ebuild
deleted file mode 100644
index f568aeb..0000000
--- a/dev-lang/ruby/ruby-3.1.3.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/";
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz";
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl
static-libs systemtap tk xemacs"
-
-RDEPEND="
- berkdb? ( sys-libs/db:= )
- gdbm? ( sys-libs/gdbm:= )
- jemalloc? ( dev-libs/jemalloc:= )
- jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
- ssl? (
- dev-libs/openssl:0=
- )
- socks5? ( >=net-proxy/dante-1.1.13 )
- systemtap? ( dev-util/systemtap )
- tk? (
- dev-lang/tcl:0=[threads]
- dev-lang/tk:0=[threads]
- )
- dev-libs/libyaml
- dev-libs/libffi:=
- sys-libs/readline:0=
- sys-libs/zlib
- virtual/libcrypt:=
- >=app-eselect/eselect-ruby-20201225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
- >=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
- >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
- >=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
- >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
- >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
- >=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
- >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
- >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
-"
-
-PDEPEND="
- ${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby31]
- >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
- >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
- >=dev-ruby/json-2.6.1[ruby_targets_ruby31]
- rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-3.1-libressl.patch
- eapply "${FILESDIR}"/"${SLOT}"/011*.patch
-
- if use elibc_musl ; then
- eapply "${FILESDIR}"/3.1/901-musl-*.patch
- fi
-
- einfo "Unbundling gems..."
- cd "$S"
- # Remove bundled gems that we will install via PDEPEND, bug
- # 539700.
- rm -fr gems/* || die
- touch gems/bundled_gems || die
- # Don't install CLI tools since they will clash with the gem
- rm -f bin/{racc,racc2y,y2racc} || die
- sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
-
- einfo "Removing bundled libraries..."
- rm -fr ext/fiddle/libffi-3.2.1 || die
-
- # Remove tests that are known to fail or require a network connection
- rm -f test/ruby/test_process.rb
test/rubygems/test_gem{,_path_support}.rb || die
- rm -f test/rinda/test_rinda.rb test/socket/test_tcp.rb
test/fiber/test_address_resolve.rb test/resolv/test_addr.rb \
- spec/ruby/library/socket/tcpsocket/{initialize,open}_spec.rb|| die
- sed -i -e '/def test_test/askip "Depends on system setup"'
test/ruby/test_file_exhaustive.rb || die
-
- if use prefix ; then
- # Fix hardcoded SHELL var in mkmf library
- sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb
|| die
-
- if [[ ${CHOST} == *darwin* ]] ; then
- # avoid symlink loop on Darwin (?!)
- sed -i \
- -e
'/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
- configure.ac || die
-
- # make ar/libtool hack for Darwin work
- sed -i \
- -e
"s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
- configure.ac || die
- fi
- fi
-
- eapply_user
-
- eautoreconf
-}
-
-src_configure() {
- local modules="win32,win32ole" myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
- # Determine which modules *not* to build depending in the USE flags.
- if ! use berkdb ; then
- modules="${modules},dbm"
- fi
- if ! use gdbm ; then
- modules="${modules},gdbm"
- fi
- if ! use ssl ; then
- modules="${modules},openssl"
- fi
- if ! use tk ; then
- modules="${modules},tk"
- fi
-
- # Provide an empty LIBPATHENV because we disable rpath but we do not
- # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
- # #564272
- INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --with-readline-dir="${EPREFIX}"/usr \
- --enable-shared \
- --enable-pthread \
- --disable-rpath \
- --with-out-ext="${modules}" \
- $(use_with jemalloc jemalloc) \
- $(use_enable jit jit-support ) \
- $(use_enable socks5 socks) \
- $(use_enable systemtap dtrace) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable static-libs static) \
- $(use_enable static-libs install-static-library) \
- $(use_with static-libs static-linked-ext) \
- $(use_enable debug) \
- ${myconf} \
- --enable-option-checking=no
-
- # Makefile is broken because it lacks -ldl
- rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}"
MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
-}
-
-src_test() {
- emake V=1 check
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- einfo "Removing default gems before installation"
- rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
- # Ruby is involved in the install process, we don't want interference
here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo
$(MINIRUBY)'|make -f - getminiruby)
-
-
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
- if [[ ${CHOST} == *darwin* ]] ; then
-
DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
- export DYLD_LIBRARY_PATH
- fi
-
- RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- # Create directory for the default gems
- local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
- mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
- emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
-
- # Remove installed rubygems and rdoc copy
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die
"rm rubygems failed"
- rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
- rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm
rdoc failed"
- rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die
"rm rdoc bins failed"
-
- if use doc; then
- emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
- fi
-
- if use examples; then
- dodoc -r sample
- fi
-
- dodoc ChangeLog NEWS.md doc/NEWS* README*
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(23|24|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-3.1.4.ebuild
b/dev-lang/ruby/ruby-3.1.4-r2.ebuild
similarity index 84%
rename from dev-lang/ruby/ruby-3.1.4.ebuild
rename to dev-lang/ruby/ruby-3.1.4-r2.ebuild
index fd4ac5d..7099a09 100644
--- a/dev-lang/ruby/ruby-3.1.4.ebuild
+++ b/dev-lang/ruby/ruby-3.1.4-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic multiprocessing
MY_P="${PN}-$(ver_cut 1-3)"
S=${WORKDIR}/${MY_P}
@@ -45,28 +45,29 @@ RDEPEND="
DEPEND="${RDEPEND}"
BUNDLED_GEMS="
- >=dev-ruby/minitest-5.15.0[ruby_targets_ruby31]
- >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31]
- >=dev-ruby/rake-13.0.6[ruby_targets_ruby31]
- >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31]
- >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31]
- >=dev-ruby/rss-0.2.9[ruby_targets_ruby31]
- >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31]
- >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31]
+ >=dev-ruby/minitest-5.15.0[ruby_targets_ruby31(-)]
+ >=dev-ruby/power_assert-2.0.1[ruby_targets_ruby31(-)]
+ >=dev-ruby/rake-13.0.6[ruby_targets_ruby31(-)]
+ >=dev-ruby/rbs-2.1.0[ruby_targets_ruby31(-)]
+ >=dev-ruby/rexml-3.2.5[ruby_targets_ruby31(-)]
+ >=dev-ruby/rss-0.2.9[ruby_targets_ruby31(-)]
+ >=dev-ruby/test-unit-3.5.3[ruby_targets_ruby31(-)]
+ >=dev-ruby/typeprof-0.12.2[ruby_targets_ruby31(-)]
"
PDEPEND="
${BUNDLED_GEMS}
- virtual/rubygems[ruby_targets_ruby31]
- >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31]
- >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31]
- >=dev-ruby/json-2.6.1[ruby_targets_ruby31]
- rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31] )
+ virtual/rubygems[ruby_targets_ruby31(-)]
+ >=dev-ruby/bundler-2.3.3[ruby_targets_ruby31(-)]
+ >=dev-ruby/did_you_mean-1.6.1[ruby_targets_ruby31(-)]
+ >=dev-ruby/json-2.6.1[ruby_targets_ruby31(-)]
+ rdoc? ( >=dev-ruby/rdoc-6.3.3[ruby_targets_ruby31(-)] )
xemacs? ( app-xemacs/ruby-modes )"
src_prepare() {
eapply "${FILESDIR}"/${PN}-3.1-libressl.patch
eapply "${FILESDIR}"/"${SLOT}"/011*.patch
+ eapply "${FILESDIR}"/"${SLOT}"/902*.patch
if use elibc_musl ; then
eapply "${FILESDIR}"/3.1/901-musl-*.patch
@@ -116,6 +117,15 @@ src_prepare() {
src_configure() {
local modules="win32,win32ole" myconf=
+ # Ruby's build system does interesting things with MAKEOPTS and doesn't
+ # handle MAKEOPTS="-Oline" or similar well. Just filter it all out
+ # and use -j/-l parsed out from the original MAKEOPTS, then use that.
+ # Newer Portage sets this option by default in GNUMAKEFLAGS if nothing
+ # is set by the user in MAKEOPTS. See bug #900929 and bug #728424.
+ local makeopts_tmp="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
+ unset MAKEOPTS MAKEFLAGS GNUMAKEFLAGS
+ export MAKEOPTS="${makeopts_tmp}"
+
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
filter-flags -fomit-frame-pointer
# In many places aliasing rules are broken; play it safe
@@ -162,6 +172,9 @@ src_configure() {
--enable-shared \
--enable-pthread \
--disable-rpath \
+ --without-baseruby \
+ --with-compress-debug-sections=no \
+ --enable-mkmf-verbose \
--with-out-ext="${modules}" \
$(use_with jemalloc jemalloc) \
$(use_enable jit jit-support ) \
