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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAAFB1382C5 for ; Sat, 1 May 2021 06:12:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0D31E0D1B; Sat, 1 May 2021 06:12:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C3DEE0D1B for ; Sat, 1 May 2021 06:12:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B16A5335DBA for ; Sat, 1 May 2021 06:12:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3D96735 for ; Sat, 1 May 2021 06:12:14 +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: <1619849530.81f9f39f05b60fc25865aa4d5b103cd90701f4e6.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-2.7.3-r1.ebuild X-VCS-Directories: dev-lang/ruby/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 81f9f39f05b60fc25865aa4d5b103cd90701f4e6 X-VCS-Branch: master Date: Sat, 1 May 2021 06:12:14 +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: 6419eade-d122-47e0-b6f5-8b50a598f209 X-Archives-Hash: 74c20311284537cfca042c40f92bf2af commit: 81f9f39f05b60fc25865aa4d5b103cd90701f4e6 Author: Hans de Graaff gentoo org> AuthorDate: Sat May 1 06:12:03 2021 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat May 1 06:12:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f9f39f dev-lang/ruby: fix build during bootstrap Fix building during a bootstrap situation where no ruby is present yet. Normally ruby uses a pregenerated miniprelude.c file for a miniruby that is functional enough to assist the build process. Since we now patch gem_prelude.rb in f6aa0fc2dcee195658e697026e607dbb91bfd31d the Makefile tries to regenerate miniprelude.c, but this first requires a working ruby, leading to build failures. By resetting the date of the patched gem_prelude.c we can avoid this. The gem_predule.rb patch is intended to be used in an installed ruby and does not affect the miniruby usage. Closes: https://bugs.gentoo.org/787137 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Hans de Graaff gentoo.org> dev-lang/ruby/ruby-2.7.3-r1.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-lang/ruby/ruby-2.7.3-r1.ebuild b/dev-lang/ruby/ruby-2.7.3-r1.ebuild index 682230b1d99..26d8593d705 100644 --- a/dev-lang/ruby/ruby-2.7.3-r1.ebuild +++ b/dev-lang/ruby/ruby-2.7.3-r1.ebuild @@ -67,6 +67,10 @@ src_prepare() { # compiles ruby in a non-standard way, may be dropped eapply "${FILESDIR}"/2.7/{002,003,010}*.patch + # Reset time on patched gem_prelude.rb to avoid the need for a base + # ruby during bootstrapping, bug 787137 + touch -t 202001010000 gem_prelude.rb || die + einfo "Unbundling gems..." cd "$S" # Remove bundled gems that we will install via PDEPEND, bug