commit:     b34146172c4b69231795cfed3379c1b0391d6ace
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 07:20:51 2024 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 07:24:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3414617

dev-lang/ruby: fix doc and test when ruby 3.1 is not installed yet

Backport fixes from ruby 3.2 to set LD_LIBRARY_PATH where needed.

Closes: https://bugs.gentoo.org/938020
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-lang/ruby/ruby-3.1.6-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-lang/ruby/ruby-3.1.6-r1.ebuild 
b/dev-lang/ruby/ruby-3.1.6-r1.ebuild
index bf2c830a4665..8ee6c384862b 100644
--- a/dev-lang/ruby/ruby-3.1.6-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.1.6-r1.ebuild
@@ -94,7 +94,7 @@ src_prepare() {
        rm -fr ext/fiddle/libffi-3.2.1 || die
 
        # Remove webrick tests because setting LD_LIBRARY_PATH does not work 
for them.
-       # rm -rf tool/test/webrick || die
+       rm -rf tool/test/webrick || die
 
        # Remove tests that are known to fail or require a network connection
        rm -f test/ruby/test_process.rb 
test/rubygems/test_gem{,_path_support}.rb || die
@@ -222,10 +222,12 @@ src_configure() {
 }
 
 src_compile() {
+       local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
        emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" 
MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
 }
 
 src_test() {
+       local -x LD_LIBRARY_PATH="${S}${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
        emake V=1 check
 }
 

Reply via email to