From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id WLDXGrUtSGU0pAAA9RJhRA:P1 (envelope-from ) for ; Mon, 06 Nov 2023 01:05:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id WLDXGrUtSGU0pAAA9RJhRA (envelope-from ) for ; Mon, 06 Nov 2023 01:05:09 +0100 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 062FF44E1E for ; Mon, 6 Nov 2023 01:05:09 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699229109; a=rsa-sha256; cv=none; b=uCUHK8RSp7IIp9Evba1dF9Sq9aZXZuoAY+IvJq61jY24AdxFgAiIrzPRUGdR1AmJ0Mk0dt koui3LzLUNOMBp6cWsGh43MxLRC4gACMQm6gEzlKiV8tfZBzvmA2yA3etZD4NllCF8nOW7 B6XFw+C8+unyMbnsPaxzQb2b7KBZIojO2sKx0PoqYiey440FZ4eq/JDM6zT6MdZ6Hma9iA aLqEgvAnVxxc/18/IdiMZEKNwfZh2Ru8HajyHqKlIk4ZPWX2yYZPkb27k22BLJYzdaFJCe TFzlZeT1uI7sroWp6UtB4jAY1CY9rV73mIt3zEUs6nMRrsekxxHGBAh93rdrew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699229109; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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; bh=Lj1RoqNHlsckq+IYQ+/+SMC1jv8gfi5iKmd7hPQRtdY=; b=gjdEfoh/CVzfpwYB5zXjl2ltZjOJ8Lsq828kf0qvOBFtb54W2pehhJhjUoSau//tW1umcv glOyKXxSSADJADFnRErAkZ4J2HuFbFpeZP3wzDi7z4bkSTA47myupoq2KGEewqhEfv+eya 5aAgIVBupLpUEYhiXe3Tx1u6kaRGLbIEWh+18XFbSWqPXnHJc61DOPi4tp5DWIPIZOkQlr 0nAVqvqeSUqg0X3YrONvGpHpjou0g26YweMvufXMnlgfPJ56baOS5yZdq82vQz1R12UmdA syBo7Lo3ETkbxiGkWw5KtdJOebeY2uhQ7EFJQ2NUJJyFor7uPEnaxAI1UHLbzQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6V-0004k9-1Q; Sun, 05 Nov 2023 19:04:32 -0500 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 1qzn6R-0004iG-CK for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 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 1qzn6R-0000RO-40 for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn72-0008Vb-2R for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 5/8] gnu: scilab: Reindent. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908932627 (code B ref 65853); Mon, 06 Nov 2023 00:05:04 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:49 +0000 Received: from localhost ([127.0.0.1]:38406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6m-0008U7-BV for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:48 -0500 Received: from 9.mo581.mail-out.ovh.net ([46.105.60.248]:50155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6g-0008So-DN for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:43 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.20.16]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 10EDE2297E for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:04 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-z95g8 (unknown [10.110.115.73]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C75471FD15; Mon, 6 Nov 2023 00:04:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-z95g8 with ESMTPSA id t2uoLXMtSGUjJwAAxMSzsg (envelope-from ); Mon, 06 Nov 2023 00:04:03 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Mon, 6 Nov 2023 00:51:48 +0100 Message-ID: <20231106000354.32423-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3275242829699015394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeuhfdukeffvdetfeffudfggefhueejvdeigeekgfeigfellefgudekveeiudeggeenucffohhmrghinhepmhhouggvlhhitggrrdgrmhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -5.11 X-Migadu-Queue-Id: 062FF44E1E X-Migadu-Spam-Score: -5.11 X-TUID: QzmS67FbrIDD * gnu/packages/maths.scm (scilab): Reindent. Change-Id: I4813863a8ef5cb36de597ed31bcce0b34cfb1160 --- gnu/packages/maths.scm | 139 +++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 68e041c33b..e3045f4fee 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2022, 2023 Liliana Marie Prikler ;;; Copyright © 2022 Maximilian Heisinger ;;; Copyright © 2022 Akira Kyle +;;; Copyright © 2022, 2023 Nicolas Graves ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2023 Jake Leporte ;;; Copyright © 2023 Camilo Q.S. (Distopico) @@ -9572,18 +9573,18 @@ (define-public scilab ;; And finally some files in the modules directory: (for-each - (lambda (file) - (delete-file - (string-append "modules/dynamic_link/src/scripts/" file))) - '("aclocal.m4" - "configure" - "compile" - "config.guess" - "config.sub" - "ltmain.sh" - "depcomp" - "install-sh" - "missing")) + (lambda (file) + (delete-file + (string-append "modules/dynamic_link/src/scripts/" file))) + '("aclocal.m4" + "configure" + "compile" + "config.guess" + "config.sub" + "ltmain.sh" + "depcomp" + "install-sh" + "missing")) (delete-file-recursively "modules/dynamic_link/src/scripts/m4") (for-each delete-file '("modules/ast/src/cpp/parse/scanscilab.cpp" @@ -9623,38 +9624,38 @@ (define-public scilab (arguments (let* ((tcl (this-package-input "tcl")) (tk (this-package-input "tk"))) - (list - #:configure-flags - #~(list - "--enable-relocatable" - "--disable-static-system-lib" - "--enable-build-parser" - ;; Disable all java code. - "--without-gui" - "--without-javasci" - "--disable-build-help" - "--with-external-scirenderer" - ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" #$tcl "/include") - (string-append "--with-tcl-library=" #$tcl "/lib") - (string-append "--with-tk-include=" #$tk "/include") - (string-append "--with-tk-library=" #$tk "/lib") - (string-append "--with-eigen-include=" - (search-input-directory %build-inputs "include/eigen3")) - ;; Find and link to the OCaml Num package - "OCAMLC=ocamlfind ocamlc -package num" - "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg") - #:phases - #~(modify-phases %standard-phases - ;; The Num library is specified with the OCAMLC and - ;; OCAMLOPT variables above. - (add-after 'unpack 'fix-ocaml-num - (lambda _ - (substitute* - '("modules/scicos/Makefile.modelica.am" - "modules/scicos/src/translator/makefile.mak" - "modules/scicos/src/modelica_compiler/makefile.mak") - (("nums\\.cmx?a") "")))) + (list + #:configure-flags + #~(list + "--enable-relocatable" + "--disable-static-system-lib" + "--enable-build-parser" + ;; Disable all java code. + "--without-gui" + "--without-javasci" + "--disable-build-help" + "--with-external-scirenderer" + ;; Tcl and Tk library locations. + (string-append "--with-tcl-include=" #$tcl "/include") + (string-append "--with-tcl-library=" #$tcl "/lib") + (string-append "--with-tk-include=" #$tk "/include") + (string-append "--with-tk-library=" #$tk "/lib") + (string-append "--with-eigen-include=" + (search-input-directory %build-inputs "include/eigen3")) + ;; Find and link to the OCaml Num package + "OCAMLC=ocamlfind ocamlc -package num" + "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg") + #:phases + #~(modify-phases %standard-phases + ;; The Num library is specified with the OCAMLC and + ;; OCAMLOPT variables above. + (add-after 'unpack 'fix-ocaml-num + (lambda _ + (substitute* + '("modules/scicos/Makefile.modelica.am" + "modules/scicos/src/translator/makefile.mak" + "modules/scicos/src/modelica_compiler/makefile.mak") + (("nums\\.cmx?a") "")))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop @@ -9680,31 +9681,31 @@ (define-public scilab (substitute* "modules/types/Makefile" (("\\$\\(MAKE\\) \\$\\(AM_MAKEFLAGS\\) check-am") "")))) - ;; These generated files are assumed to be present during - ;; the build. - (add-after 'bootstrap 'bootstrap-dynamic_link-scripts - (lambda _ - (with-directory-excursion "modules/dynamic_link/src/scripts" - ((assoc-ref %standard-phases 'bootstrap))))) - (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") - "SCI+'/modules")))) - ;; Prevent race condition - (add-after 'pre-build 'build-parsers - (lambda* (#:key (make-flags #~'()) #:allow-other-keys) - (with-directory-excursion "modules/ast" - (apply invoke "make" - "src/cpp/parse/parsescilab.cpp" - "src/cpp/parse/scanscilab.cpp" - make-flags)))) - ;; The startup script is mostly there to define the following env + ;; These generated files are assumed to be present during + ;; the build. + (add-after 'bootstrap 'bootstrap-dynamic_link-scripts + (lambda _ + (with-directory-excursion "modules/dynamic_link/src/scripts" + ((assoc-ref %standard-phases 'bootstrap))))) + (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") + "SCI+'/modules")))) + ;; Prevent race condition + (add-after 'pre-build 'build-parsers + (lambda* (#:key (make-flags #~'()) #:allow-other-keys) + (with-directory-excursion "modules/ast" + (apply invoke "make" + "src/cpp/parse/parsescilab.cpp" + "src/cpp/parse/scanscilab.cpp" + make-flags)))) + ;; The startup script is mostly there to define the following env ;; variables properly. We can do this with guix directly. (add-after 'install 'rewrap-scilab-cli (lambda _ -- 2.41.0