From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D5F415852A for ; Sat, 17 Aug 2024 07:24:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EE16E2A2B; Sat, 17 Aug 2024 07:24:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08D0AE2A2B for ; Sat, 17 Aug 2024 07:24:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0BB06340DC8 for ; Sat, 17 Aug 2024 07:24:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E8581ED6 for ; Sat, 17 Aug 2024 07:24:28 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1723879456.b34146172c4b69231795cfed3379c1b0391d6ace.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ruby/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ruby/ruby-3.1.6-r1.ebuild X-VCS-Directories: dev-lang/ruby/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: b34146172c4b69231795cfed3379c1b0391d6ace X-VCS-Branch: master Date: Sat, 17 Aug 2024 07:24:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e8df08e-b18f-49d0-8796-f9fb42a2bb44 X-Archives-Hash: 6f5b637f6d8433e86451760a84a5408b commit: b34146172c4b69231795cfed3379c1b0391d6ace Author: Hans de Graaff gentoo org> AuthorDate: Sat Aug 17 07:20:51 2024 +0000 Commit: Hans de Graaff gentoo 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 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 }