diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41521 -> 41533 bytes | |||
| -rw-r--r-- | eclass/ruby-ng.eclass | 7 | ||||
| -rw-r--r-- | eclass/ruby-utils.eclass | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 34ffa0770fff..cfc9704ceecb 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index e9d0f33e5580..8d6f0082b9e8 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -13,12 +13,7 @@ # The Ruby eclass is designed to allow an easier installation of Ruby packages # and their incorporation into the Gentoo Linux system. # -# Currently available targets are: -# * ruby21 - Ruby (MRI) 2.1.x -# * ruby22 - Ruby (MRI) 2.2.x -# * ruby23 - Ruby (MRI) 2.3.x -# * ruby24 - Ruby (MRI) 2.4.x -# * rbx - Rubinius +# Currently available targets are listed in ruby-utils.eclass # # This eclass does not define the implementation of the configure, # compile, test, or install phases. Instead, the default phases are diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass index 854ce06ac050..e4a072a0972e 100644 --- a/eclass/ruby-utils.eclass +++ b/eclass/ruby-utils.eclass @@ -28,7 +28,7 @@ if [[ ! ${_RUBY_UTILS} ]]; then # provide for a better first installation experience. # All RUBY_TARGETS -RUBY_TARGETS_PREFERENCE="ruby22 ruby21 " +RUBY_TARGETS_PREFERENCE="ruby22 " # All other active ruby targets RUBY_TARGETS_PREFERENCE+="ruby23 ruby24" @@ -67,6 +67,10 @@ _ruby_implementation_depend() { rubypn="dev-lang/ruby" rubyslot=":2.4" ;; + ruby25) + rubypn="dev-lang/ruby" + rubyslot=":2.5" + ;; ree18) rubypn="dev-lang/ruby-enterprise" rubyslot=":1.8" diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 58d859dfaf32..a038303ec7f5 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1484,7 +1484,7 @@ gcc_do_filter_flags() { # "hppa2.0-unknown-linux-gnu" -> hppa2_0_unknown_linux_gnu local VAR="CFLAGS_"${CTARGET//[-.]/_} - CXXFLAGS=${!VAR} + CXXFLAGS=${!VAR-${CFLAGS}} fi export GCJFLAGS=${GCJFLAGS:-${CFLAGS}} |