From patchwork Thu Aug 29 16:25:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 30463 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F8AF27BBE2; Thu, 29 Aug 2024 17:27:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 21F0027BBEA for ; Thu, 29 Aug 2024 17:27:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhzQ-00057y-J6; Thu, 29 Aug 2024 12:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjhzG-00054X-PP for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sjhzG-0006Ix-Ga for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=E04UtBuW1EaWQVYGUmrO6PCGPdPB3PDTjDRJ9o4kues=; b=NRDoIgVZ+svIMCXOjsAOZjcZK6ngoQnv/lCUmzg5n07O9if1maCo5vfg2R46ciNbzn9QhZYxyqLa/2yxEcL1TAxcdG3UfZdvXZ4oMqV3XHwBNdV7FVV2ypWqykav5cdMXKKvuwGsnjU6wx7gNHyDouxyKWTZvFHpGkkD8qUDGEuxMfoSZ+LdYe34yZ5bqPlAGtalHqQioWsmtb+FCfneWB35VPy2NatNEIMiVzvezcEB2mpdB3DAwtwQC0nE1T5mCMeFMyFuq3COkkGHCVlfXRPRXLyYz8tZ14AZRsTJvlUYiEms71z74/UlIHDNsrQ7hNFHbJYfP/ugqXJWuLmXtQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sji0A-0005Eb-0K for guix-patches@gnu.org; Thu, 29 Aug 2024 12:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72873] [PATCH 3/4] gnu: scilab: Fix the scilab build script. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72873@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 72873-submit@debbugs.gnu.org id=B72873.172494882720011 (code B ref 72873); Thu, 29 Aug 2024 16:28:01 +0000 Received: (at 72873) by debbugs.gnu.org; 29 Aug 2024 16:27:07 +0000 Received: from localhost ([127.0.0.1]:52060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzG-0005Ch-R6 for submit@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:07 -0400 Received: from 5.mo550.mail-out.ovh.net ([178.33.45.107]:42295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzA-0005Bc-Ey for 72873@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:02 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.139.47]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4WvmqZ6KW1z18Dw for <72873@debbugs.gnu.org>; Thu, 29 Aug 2024 16:26:02 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ltbt4 (unknown [10.110.101.52]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6BED51FEA9; Thu, 29 Aug 2024 16:26:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-6684bf9d7b-ltbt4 with ESMTPSA id 4I48Fhqh0GZ0OwEA3EXDwA (envelope-from ); Thu, 29 Aug 2024 16:26:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G003b9ab7008-0b47-4b31-bc23-3ef41a1a3a2c, 6F600CF742B1A60B32D51C2DEF6090C4F326D718) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.214.77.241 Date: Thu, 29 Aug 2024 18:25:45 +0200 Message-ID: <20240829162554.28746-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240829162554.28746-1-ngraves@ngraves.fr> References: <20240829162554.28746-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11608590992660751074 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrudefgedgleelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdektddrvddugedrjeejrddvgedupdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedvkeejfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=E04UtBuW1EaWQVYGUmrO6PCGPdPB3PDTjDRJ9o4kues=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1724948763; v=1; b=EU2vtz2LtaSAeZiczKCsqCP7hRBtubVu0yIjc1hkAsoLGhw49mW+aOgHQo3DeN/xDpDWbON+ lh4H82Y8iVjtlQaS2H+btVSWfT3Wen9RsROA+znxHfVzISCWgK0pmFRJnk0l3dS3g/0OtEt9Wq2 WsKHh6U5DpCXU9b9Hs1qNfu0eJ+dpHzBk5AOWSVLh8amtxhiHzZffiIFpQVYs37YYdyzEeZIFO4 GfjUCVIbGiW8phMuTaevP8ACjnfeqvZCKBSQunSNlzbh4oFABiOGqrnr/rWKiIYGE3xTQX/NtTS Dt60RrAQstRz9FLORjv98dHo0Soqb7qr4VlP8tcDgbuMg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (scilab): [arguments]<#:phases>: Reintroduce a manual patch for /bin/ls in phase pre-build. This is necessary because the file is used when scilab builds macros, even if it is discarded later. [inputs]: Add coreutils-minimal. Change-Id: I692fd6696273bfdce0e50b0f688a60e7dc289ce6 --- gnu/packages/maths.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a211121375..48a22bb6a1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9907,6 +9907,7 @@ (define-public scilab autoconf-archive automake bison + coreutils-minimal eigen flex gfortran @@ -10014,6 +10015,10 @@ (define-public scilab (("PROGNAME.*") "\n"))))) (add-before 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) + ;; Fix scilab script. + (substitute* "bin/scilab" + (("/bin/ls") + (search-input-file inputs "bin/ls"))) ;; Fix core.start. (substitute* "modules/core/etc/core.start" (("'SCI/modules")