Gentoo Archives: gentoo-dev

From: graaff@g.o
To: gentoo-dev@l.g.o
Cc: Hans de Graaff <graaff@g.o>
Subject: [gentoo-dev] [PATCH 4/6] ruby-ng.eclass: use ruby_rbconfig_value
Date: Sun, 21 Jul 2019 07:55:42
Message-Id: 20190721075510.31524-4-graaff@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/6] ruby-ng.eclass: add EAPI 7 support by graaff@gentoo.org
1 From: Hans de Graaff <graaff@g.o>
2
3 Consistently use ruby_rbconfig_value to get ruby configuration
4 information.
5
6 Signed-off-by: Hans de Graaff <graaff@g.o>
7 ---
8 eclass/ruby-ng.eclass | 6 +++---
9 1 file changed, 3 insertions(+), 3 deletions(-)
10
11 diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
12 index 59d4450a9954..8663033a499c 100644
13 --- a/eclass/ruby-ng.eclass
14 +++ b/eclass/ruby-ng.eclass
15 @@ -515,10 +515,10 @@ _each_ruby_check_install() {
16 # we have a Mach-O object here
17 [[ ${CHOST} == *-darwin ]] && scancmd=scanmacho
18
19 - local libruby_basename=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBY_SO"]')
20 + local libruby_basename=$(ruby_rbconfig_value 'LIBRUBY_SO')
21 local libruby_soname=$(basename $(${scancmd} -F "%S#F" -qS "${EPREFIX}/usr/$(get_libdir)/${libruby_basename}") 2>/dev/null)
22 - local sitedir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitedir"]')
23 - local sitelibdir=$(${RUBY} -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
24 + local sitedir=$(ruby_rbconfig_value 'sitedir')
25 + local sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
26
27 # The current implementation lacks libruby (i.e.: jruby)
28 [[ -z ${libruby_soname} ]] && return 0
29 --
30 2.21.0