From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WFF5FABTB2NKDQEAbAwnHQ (envelope-from ) for ; Thu, 25 Aug 2022 12:46:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id SGx0EwBTB2NWOwAAG6o9tA (envelope-from ) for ; Thu, 25 Aug 2022 12:46:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F179411F80 for ; Thu, 25 Aug 2022 12:46:23 +0200 (CEST) Received: from localhost ([::1]:57974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRANS-0004Uy-Hk for larch@yhetil.org; Thu, 25 Aug 2022 06:46:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRAN8-0004Uh-4V for bug-guix@gnu.org; Thu, 25 Aug 2022 06:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59375) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRAN7-0004YO-Rm for bug-guix@gnu.org; Thu, 25 Aug 2022 06:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oRAN7-0007oE-O5 for bug-guix@gnu.org; Thu, 25 Aug 2022 06:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#56322: [PATCH] gnu: ruby: regenerate parse.c References: In-Reply-To: Resent-From: Remco van 't Veer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 25 Aug 2022 10:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56322 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 56322@debbugs.gnu.org, Maxime Devos Cc: Remco van 't Veer Received: via spool by 56322-submit@debbugs.gnu.org id=B56322.166142432129970 (code B ref 56322); Thu, 25 Aug 2022 10:46:01 +0000 Received: (at 56322) by debbugs.gnu.org; 25 Aug 2022 10:45:21 +0000 Received: from localhost ([127.0.0.1]:49124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRAMT-0007nJ-C0 for submit@debbugs.gnu.org; Thu, 25 Aug 2022 06:45:21 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:46103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oRAMR-0007n3-2b for 56322@debbugs.gnu.org; Thu, 25 Aug 2022 06:45:19 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 06A2A5C01A4; Thu, 25 Aug 2022 06:45:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 25 Aug 2022 06:45:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=remworks.net; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm3; t=1661424314; x=1661510714; bh=0iOpFC4fG8d/Ek37ynpBwLFuW ZUYkVhXE0sqYWZZgag=; b=ETGq4b9TFjmjWGpP8moc3suEkf9T+ET38hBeJnekb icdieqWhAeuGC2h/V0r/yFNGuAiySY8Z+j4xw+Z06zsdDxN77coI8isk4qjJB+Ih dlkNykX5pOxFCg5xzN67ntXmEfXjEMNLwT97kUt0d9rUytPXgOGvhKt0W+1db2HT bscdCpWtfNyZ849t60mMPM8lV8LlzQAutZgssaKjI8YXDGOIEGXR2l9SaAOAgj30 9fCsFNQmT7scBboknFIWzbJx5a69SieYjGVkQIsjilt8oDdCXW+rKXlFRW6FJSvk YAHg/nMgLOVH0a9K+rcH/k8pDud48YEymwXjfTV+TBl6Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1661424314; x=1661510714; bh=0iOpFC4fG8d/Ek37ynpBwLFuWZUYkVhXE0s qYWZZgag=; b=5Eq/j9Jt11PEY0ak4enVekts7iFEu2nNn0teeiwYyck+cotw3kR a78OairOtb0WtucNZSATV0Poj8l2mhMMWDdgvESm7T616b8H3jnqYzHZ2lf5VXdh 8bGsR/MzrxVE7sK9LbqJoqLGM5P33uAkJJBolc4FXDB17OA9GPI3mPAHw3767hyf 9CmIhOUjNa2Y3Yud2FIebyf6fWhE74+t/Zup8/HH62o0iFdk5FlkEswryy8rkk3m 6VM/Rcam2w2wHNs+HkRMoTy05Txu0Um+SrXUdR3CCjFKKM3LnyBiC9y2Bq6M1le1 rIPKxUPZjThkZIYyxZ8Jn3ePfQXLQfhMUiA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdejfedgfedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheptfgvmhgtohcu vhgrnhcukdhtucggvggvrhcuoehrvghmtghosehrvghmfihorhhkshdrnhgvtheqnecugg ftrfgrthhtvghrnhepgeeugefgtdehffehtdeijeduudfggfdtvdeufeettdeuhfdtffej leegfedvteeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homheprhifvhesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Feedback-ID: i568842cc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 25 Aug 2022 06:45:13 -0400 (EDT) From: Remco van 't Veer Date: Thu, 25 Aug 2022 12:45:10 +0200 Message-Id: <20220825104510.17727-1-remco@remworks.net> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1661424384; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0iOpFC4fG8d/Ek37ynpBwLFuWZUYkVhXE0sqYWZZgag=; b=gefhHaiEjgCZGB6MsACVRbR465hgelqg8QQsdKu8AZAwXVi2wmipLZTWIYc9i88NgGyTPp 7RNguqmgfLMKxwSmgwPUAZBC7cmVG9vuf5LL08inMTvs4DTQGeJl4hZME5Q7/tnjmMH4+O ING5D6XkB30jvi4VSrnfdWcC0vFwIDMhDuSkuQ+J2nHJU2Q2Dhg2LL5iKiWy+FmUFqgxsS OIPQW3RP8piCZD8hfyswHdZPEG9Gl8MR1+b8/jbkBlIjvK44NtIwnLxdNGp8u2KsijK6n8 zsZwCJGl0CwsnlO2mW7AaePrCirVsxbAOlgFoirFFC5RgmdVae9IIeem2n6mZA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1661424384; a=rsa-sha256; cv=none; b=ElsTzAEBer0N06go7FEthFDSO4G1jULQIAV22WOy31EfGb7+X875erL+qvxU+7LRY9Yst+ 3SSJSVtPIaxtWf/BCgWWga7US/BSKP/3qQNaCg6Tuvcqt5s74CPrak94CD4tYv7kF4R9gg tXtN+MzGMRqGa+t07XyLLPmHd72U7rRWNqFikWYVAMJ9IXzjgpEqb4TlOWGdNo3LvkfmGG IJUT3isncC0iwXRILI59a1tYHlOGHdXk9Ddrb1CZWX46CkiUsFu3QPiCTo1X4zIG2GNtGt mXjz4cLgn5FiIGgvvIR8bsIlp16ysJ7pWbW0zSYxqhCBBNihLxwm9XGyYdFlIA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=remworks.net header.s=fm3 header.b=ETGq4b9T; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="5Eq/j9Jt"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.59 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=remworks.net header.s=fm3 header.b=ETGq4b9T; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="5Eq/j9Jt"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: F179411F80 X-Spam-Score: 2.59 X-Migadu-Scanner: scn1.migadu.com X-TUID: M5jCDd8RZwUA * gnu/packages/ruby.scm (baseruby, ruby-2.7): Use bootstrap baseruby to regenerate parse.c --- gnu/packages/ruby.scm | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e98814da6d..8de6cda257 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -161,7 +161,16 @@ (define-public ruby-2.7 version ".tar.gz")) (sha256 (base32 - "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh")))) + "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh")) + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively "ext/fiddle/libffi-3.2.1") + ;; Trigger bootstap + (delete-file "configure") + (delete-file "aclocal.m4") + ;; Trigger rebuild of parse.c from parse.y + (delete-file "parse.c") + #t)))) (arguments `(#:test-target "test" #:configure-flags '("--enable-shared") ;dynamic linking @@ -181,7 +190,24 @@ (define-public ruby-2.7 "test/ruby/test_system.rb" "tool/rbinstall.rb") (("/bin/sh") - (which "sh"))) #t))))))) + (which "sh"))) #t))))) + (native-inputs (list autoconf automake baseruby bison)))) + +(define baseruby ;; used to build ruby by parser generator + (package + (inherit ruby-2.7) + (name "baseruby") + (source (origin + (inherit (package-source ruby-2.7)) + ;; override snippet to not include deletion of bundled parse.c + (snippet `(begin + ;; Remove bundled libffi + (delete-file-recursively "ext/fiddle/libffi-3.2.1") + ;; Trigger bootstap + (delete-file "configure") + (delete-file "aclocal.m4") + #t)))) + (native-inputs (list autoconf automake)))) (define-public ruby-3.0 (package -- 2.37.2