diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2011-10-24 18:20:05 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2011-10-24 18:20:05 +0000 |
| commit | b01623895d4db29f292ababd0994e9ac9a2bb767 (patch) | |
| tree | bd8fb4d5077d30b52c60df9d7b63e9c31cb8676f /eclass/ruby-ng.eclass | |
| parent | alpha/ia64/s390/sh/sparc stable wrt #357478 (diff) | |
| download | gentoo-2-b01623895d4db29f292ababd0994e9ac9a2bb767.tar.gz gentoo-2-b01623895d4db29f292ababd0994e9ac9a2bb767.tar.bz2 gentoo-2-b01623895d4db29f292ababd0994e9ac9a2bb767.zip | |
Use RbConfig instead of Config to get ruby configuration values, since Config is now deprecated in Ruby 1.9 and all current implementations of ruby support RbConfig.
Diffstat (limited to 'eclass/ruby-ng.eclass')
| -rw-r--r-- | eclass/ruby-ng.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index d31253b50817..d01a4ac5d56e 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.42 2011/10/22 10:08:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.43 2011/10/24 18:20:05 graaff Exp $ # @ECLASS: ruby-ng.eclass # @MAINTAINER: @@ -507,10 +507,10 @@ _each_ruby_check_install() { has "${EAPI}" 2 && ! use prefix && EPREFIX= - local libruby_basename=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["LIBRUBY_SO"]') + local libruby_basename=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_SO"]') local libruby_soname=$(basename $(${scancmd} -F "%S#F" -qS "${EPREFIX}/usr/$(get_libdir)/${libruby_basename}") 2>/dev/null) - local sitedir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitedir"]') - local sitelibdir=$(${RUBY} -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]') + local sitedir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitedir"]') + local sitelibdir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]') # Look for wrong files in sitedir # if [[ -d "${D}${sitedir}" ]]; then @@ -560,7 +560,7 @@ ruby-ng_src_install() { # @USAGE: rbconfig item # @RETURN: Returns the value of the given rbconfig item of the Ruby interpreter in ${RUBY}. ruby_rbconfig_value() { - echo $(${RUBY} -rrbconfig -e "puts Config::CONFIG['$1']") + echo $(${RUBY} -rrbconfig -e "puts RbConfig::CONFIG['$1']") } # @FUNCTION: doruby @@ -581,7 +581,7 @@ doruby() { # @FUNCTION: ruby_get_libruby # @RETURN: The location of libruby*.so belonging to the Ruby interpreter in ${RUBY}. ruby_get_libruby() { - ${RUBY} -rrbconfig -e 'puts File.join(Config::CONFIG["libdir"], Config::CONFIG["LIBRUBY"])' + ${RUBY} -rrbconfig -e 'puts File.join(RbConfig::CONFIG["libdir"], RbConfig::CONFIG["LIBRUBY"])' } # @FUNCTION: ruby_get_hdrdir |