| 1 |
commit: e79e532d2563c4eae769876fd7cc7e6f3fac12da |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 28 23:04:51 2018 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 28 23:04:51 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e79e532d |
| 7 |
|
| 8 |
profiles/arch/*/make.defaults: tweak RUBY_TARGETS override |
| 9 |
|
| 10 |
Unfortunately RUBY_TARGETS does not have merge semantics |
| 11 |
and just overrides value from parent profile. Thus |
| 12 |
RUBY_TARGETS="ruby23 -ruby24" |
| 13 |
is not valid and yields error spam like: |
| 14 |
Invalid '-' operator in non-incremental variable 'RUBY_TARGETS': '-ruby24' |
| 15 |
|
| 16 |
Just drop RUBY_TARGETS="-ruby" part. The change should be a no-op. |
| 17 |
|
| 18 |
Bug: https://bugs.gentoo.org/671064 |
| 19 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 20 |
|
| 21 |
profiles/arch/alpha/make.defaults | 2 +- |
| 22 |
profiles/arch/arm/make.defaults | 2 +- |
| 23 |
profiles/arch/hppa/make.defaults | 2 +- |
| 24 |
profiles/arch/ia64/make.defaults | 2 +- |
| 25 |
profiles/arch/powerpc/ppc32/make.defaults | 2 +- |
| 26 |
profiles/arch/powerpc/ppc64/make.defaults | 2 +- |
| 27 |
profiles/arch/s390/make.defaults | 2 +- |
| 28 |
profiles/arch/sparc/make.defaults | 2 +- |
| 29 |
8 files changed, 8 insertions(+), 8 deletions(-) |
| 30 |
|
| 31 |
diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults |
| 32 |
index 3449562f048..efb7262f104 100644 |
| 33 |
--- a/profiles/arch/alpha/make.defaults |
| 34 |
+++ b/profiles/arch/alpha/make.defaults |
| 35 |
@@ -30,7 +30,7 @@ ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 e |
| 36 |
|
| 37 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 38 |
# Temporary entry to support stable bug 661262 |
| 39 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 40 |
+RUBY_TARGETS="ruby23" |
| 41 |
|
| 42 |
# Tobias Klausmann <klausman@g.o> (25 Jun 2018) |
| 43 |
# Enable USE=libtirpc by default, to ease dependency resolution during |
| 44 |
|
| 45 |
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults |
| 46 |
index f1655f9170e..d09bb4da35e 100644 |
| 47 |
--- a/profiles/arch/arm/make.defaults |
| 48 |
+++ b/profiles/arch/arm/make.defaults |
| 49 |
@@ -25,4 +25,4 @@ USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM" |
| 50 |
|
| 51 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 52 |
# Temporary entry to support stable bug 661262 |
| 53 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 54 |
+RUBY_TARGETS="ruby23" |
| 55 |
|
| 56 |
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults |
| 57 |
index f6b6600fec8..3f22ce8df61 100644 |
| 58 |
--- a/profiles/arch/hppa/make.defaults |
| 59 |
+++ b/profiles/arch/hppa/make.defaults |
| 60 |
@@ -27,4 +27,4 @@ VIDEO_CARDS="fbdev" |
| 61 |
|
| 62 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 63 |
# Temporary entry to support stable bug 661262 |
| 64 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 65 |
+RUBY_TARGETS="ruby23" |
| 66 |
|
| 67 |
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults |
| 68 |
index 1c7884a9e38..b91a3961859 100644 |
| 69 |
--- a/profiles/arch/ia64/make.defaults |
| 70 |
+++ b/profiles/arch/ia64/make.defaults |
| 71 |
@@ -34,4 +34,4 @@ ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens |
| 72 |
|
| 73 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 74 |
# Temporary entry to support stable bug 661262 |
| 75 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 76 |
+RUBY_TARGETS="ruby23" |
| 77 |
|
| 78 |
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults |
| 79 |
index f5b7331ada0..3b8dbab2de7 100644 |
| 80 |
--- a/profiles/arch/powerpc/ppc32/make.defaults |
| 81 |
+++ b/profiles/arch/powerpc/ppc32/make.defaults |
| 82 |
@@ -38,4 +38,4 @@ ABI_PPC="32" |
| 83 |
|
| 84 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 85 |
# Temporary entry to support stable bug 661262 |
| 86 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 87 |
+RUBY_TARGETS="ruby23" |
| 88 |
|
| 89 |
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults |
| 90 |
index ee493e24c30..d2b49417d9f 100644 |
| 91 |
--- a/profiles/arch/powerpc/ppc64/make.defaults |
| 92 |
+++ b/profiles/arch/powerpc/ppc64/make.defaults |
| 93 |
@@ -42,4 +42,4 @@ ABI_PPC="64" |
| 94 |
|
| 95 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 96 |
# Temporary entry to support stable bug 661262 |
| 97 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 98 |
+RUBY_TARGETS="ruby23" |
| 99 |
|
| 100 |
diff --git a/profiles/arch/s390/make.defaults b/profiles/arch/s390/make.defaults |
| 101 |
index ec35f09d114..476bb25aa01 100644 |
| 102 |
--- a/profiles/arch/s390/make.defaults |
| 103 |
+++ b/profiles/arch/s390/make.defaults |
| 104 |
@@ -34,4 +34,4 @@ USE="-multilib" |
| 105 |
|
| 106 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 107 |
# Temporary entry to support stable bug 661262 |
| 108 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 109 |
+RUBY_TARGETS="ruby23" |
| 110 |
|
| 111 |
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults |
| 112 |
index 4af6d8cc78c..8ae22a12a03 100644 |
| 113 |
--- a/profiles/arch/sparc/make.defaults |
| 114 |
+++ b/profiles/arch/sparc/make.defaults |
| 115 |
@@ -46,4 +46,4 @@ USE="libtirpc" |
| 116 |
|
| 117 |
# Hans de Graaff <graaff@g.o> (12 Nov 2018) |
| 118 |
# Temporary entry to support stable bug 661262 |
| 119 |
-RUBY_TARGETS="ruby23 -ruby24" |
| 120 |
+RUBY_TARGETS="ruby23" |
Archives