summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2021-10-10 08:37:55 +0200
committerHans de Graaff <graaff@gentoo.org>2021-10-10 08:39:44 +0200
commit732fa8647044c8d13853a84546803c070faf0217 (patch)
tree36f902dea16050d9c174c8ab573fbf7189105d32 /profiles/arch/amd64
parentapp-emulation/lxd: add fowners for the keepdir (diff)
downloadgentoo-732fa8647044c8d13853a84546803c070faf0217.tar.gz
gentoo-732fa8647044c8d13853a84546803c070faf0217.tar.bz2
gentoo-732fa8647044c8d13853a84546803c070faf0217.zip
profiles: prepare for ruby27 stable bug
Set the new defaults including ruby27 in the base profile, and reset it again to the ruby26 defaults in the arch profiles. This allows each arch to stable ruby27 at their own speed. Bug 801289. Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Diffstat (limited to 'profiles/arch/amd64')
-rw-r--r--profiles/arch/amd64/make.defaults8
-rw-r--r--profiles/arch/amd64/use.stable.mask4
2 files changed, 10 insertions, 2 deletions
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index afe2ba0ad010..1f4063dbdd1f 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
ARCH="amd64"
@@ -38,7 +38,7 @@ LDFLAGS_x32="-m elf32_x86_64"
CHOST_x32="x86_64-pc-linux-gnux32"
# Simon Stelling <blubb@gentoo.org> (2006-10-24)
-# They are masked, but we can enable them anyway for those who have
+# They are masked, but we can enable them anyway for those who have
# >=portage-2.1.2_pre3-r4
CPU_FLAGS_X86="mmx mmxext sse sse2"
@@ -67,3 +67,7 @@ IUSE_IMPLICIT="abi_x86_64"
# Enable USE=libtirpc by default, to ease dependency resolution during
# the stabilization of glibc-2.26. Bug 657148
USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org> (2021-10-10)
+# Temporary override base default to support the ruby27 stable bug 801289
+RUBY_TARGETS="ruby26"
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index df910ea0ebe9..ed932e0c842e 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,6 +4,10 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Hans de Graaff <graaff@gentoo.org> (2021-10-10)
+# Temporary entry to support the ruby27 stable bug 801289
+ruby_targets_ruby27
+
# Michał Górny <mgorny@gentoo.org> (2021-05-04)
# Python 3.10 is not yet stable (and will not be until it's out of beta,
# around September.