Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 06 Feb 2022 07:09:32
Message-Id: 1644131323.977028cbd42c10e624205435f97f7f34ba2a8b29.graaff@gentoo
1 commit: 977028cbd42c10e624205435f97f7f34ba2a8b29
2 Author: Andrew Aladjev <aladjev.andrew <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 6 21:44:43 2021 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 6 07:08:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977028cb
7
8 eclass/ruby-fakegem.eclass: updated extensions dir according to formula from rubygems
9
10 Closes: https://bugs.gentoo.org/423589
11 Closes: https://bugs.gentoo.org/832268
12
13 Signed-off-by: Andrew Aladjev <aladjev.andrew <AT> gmail.com>
14 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
15
16 eclass/ruby-fakegem.eclass | 5 ++++-
17 1 file changed, 4 insertions(+), 1 deletion(-)
18
19 diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
20 index 3832165761c9..cafb5dc04788 100644
21 --- a/eclass/ruby-fakegem.eclass
22 +++ b/eclass/ruby-fakegem.eclass
23 @@ -561,7 +561,10 @@ ruby_fakegem_extensions_installed() {
24 # The directory where rubygems expects extensions for this package
25 # version.
26 ruby_fakegem_extensionsdir() {
27 - echo "$(ruby_fakegem_gemsdir)/extensions/$(ruby_rbconfig_value 'arch')/$(ruby_rbconfig_value 'ruby_version')/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}"
28 + # Using formula from ruby src/lib/rubygems/basic_specification.
29 + extensions_dir=$(${RUBY} --disable=did_you_mean -e "puts File.join('extensions', Gem::Platform.local.to_s, Gem.extension_api_version)")
30 +
31 + echo "$(ruby_fakegem_gemsdir)/${extensions_dir}/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}"
32 }
33
34 # @FUNCTION: each_fakegem_install