From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1506404-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 194E915ACFB
for <garchives@archives.gentoo.org>; Mon, 10 Apr 2023 08:21:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6174CE07E6;
Mon, 10 Apr 2023 08:21:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 39260E07E6
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Apr 2023 08:21:30 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 691E8340C93
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Apr 2023 08:21:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B17ACA19
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Apr 2023 08:21:27 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1681114829.e86df55fc08f6fb8ececc9001e9f25187b8d3eff.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ruby/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/ruby/ruby-2.7.8-r2.ebuild dev-lang/ruby/ruby-2.7.8-r3.ebuild dev-lang/ruby/ruby-3.0.6-r1.ebuild dev-lang/ruby/ruby-3.0.6-r2.ebuild dev-lang/ruby/ruby-3.1.4-r1.ebuild dev-lang/ruby/ruby-3.1.4-r2.ebuild dev-lang/ruby/ruby-3.2.2-r1.ebuild dev-lang/ruby/ruby-3.2.2-r2.ebuild
X-VCS-Directories: dev-lang/ruby/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e86df55fc08f6fb8ececc9001e9f25187b8d3eff
X-VCS-Branch: master
Date: Mon, 10 Apr 2023 08:21:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e80db089-9068-44a6-8dfc-14057e6ac123
X-Archives-Hash: 3644782d16ddc7567098ce8bedab2ed8
commit: e86df55fc08f6fb8ececc9001e9f25187b8d3eff
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 08:16:19 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 08:20:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e86df55f
dev-lang/ruby: filter out -Oline from MAKEOPTS, GNUMAKEFLAGS
Sorry for another revbump in such a short period (although maybe it's not so
bad given very few people will have upgraded yet).
Newer Portage sets GNUMAKEFLAGS="--output-sync=line" if MAKEOPTS is unset. It looks
like this sometimes leads to Ruby installing no files (or just docs). Filter it out
and just parse out --jobs and --load-average from MAKEOPTS.
This is behind at least two reports on Bugzilla and possibly another on the
forums.
Closes: https://bugs.gentoo.org/728424
Closes: https://bugs.gentoo.org/900929
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ruby/{ruby-2.7.8-r2.ebuild => ruby-2.7.8-r3.ebuild} | 11 ++++++++++-
dev-lang/ruby/{ruby-3.0.6-r1.ebuild => ruby-3.0.6-r2.ebuild} | 11 ++++++++++-
dev-lang/ruby/{ruby-3.1.4-r1.ebuild => ruby-3.1.4-r2.ebuild} | 11 ++++++++++-
dev-lang/ruby/{ruby-3.2.2-r1.ebuild => ruby-3.2.2-r2.ebuild} | 11 ++++++++++-
4 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/dev-lang/ruby/ruby-2.7.8-r2.ebuild b/dev-lang/ruby/ruby-2.7.8-r3.ebuild
similarity index 93%
rename from dev-lang/ruby/ruby-2.7.8-r2.ebuild
rename to dev-lang/ruby/ruby-2.7.8-r3.ebuild
index 5e7cad20cb1f..1f208b667274 100644
--- a/dev-lang/ruby/ruby-2.7.8-r2.ebuild
+++ b/dev-lang/ruby/ruby-2.7.8-r3.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}
@@ -116,6 +116,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
diff --git a/dev-lang/ruby/ruby-3.0.6-r1.ebuild b/dev-lang/ruby/ruby-3.0.6-r2.ebuild
similarity index 93%
rename from dev-lang/ruby/ruby-3.0.6-r1.ebuild
rename to dev-lang/ruby/ruby-3.0.6-r2.ebuild
index afed530e4063..c060d4060381 100644
--- a/dev-lang/ruby/ruby-3.0.6-r1.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}
@@ -111,6 +111,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
diff --git a/dev-lang/ruby/ruby-3.1.4-r1.ebuild b/dev-lang/ruby/ruby-3.1.4-r2.ebuild
similarity index 93%
rename from dev-lang/ruby/ruby-3.1.4-r1.ebuild
rename to dev-lang/ruby/ruby-3.1.4-r2.ebuild
index 06af384a59d1..555c25a75baa 100644
--- a/dev-lang/ruby/ruby-3.1.4-r1.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}
@@ -116,6 +116,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
diff --git a/dev-lang/ruby/ruby-3.2.2-r1.ebuild b/dev-lang/ruby/ruby-3.2.2-r2.ebuild
similarity index 94%
rename from dev-lang/ruby/ruby-3.2.2-r1.ebuild
rename to dev-lang/ruby/ruby-3.2.2-r2.ebuild
index eb755d2a1589..68155cce8bdb 100644
--- a/dev-lang/ruby/ruby-3.2.2-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.2.2-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}
@@ -131,6 +131,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