[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/15: gnu: scilab: Remove uneeded code.
From: |
guix-commits |
Subject: |
02/15: gnu: scilab: Remove uneeded code. |
Date: |
Thu, 23 Nov 2023 06:58:14 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 5b910b4f7cf5f994d42fffb107109808678b706c
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Mon Nov 6 00:51:44 2023 +0100
gnu: scilab: Remove uneeded code.
* gnu/packages/maths.scm (scilab):
[source](snippet): Remove directory Visual-Studio-settings and file
Scilab.sln.
[arguments](configure-flags):
Remove uneeded FFLAGS environment variable set.
[arguments](phases):
prebuild: Remove uneeded SCIHOME setting code.
Change-Id: I71c044e19617bf556bbe95e7ba0cdbd716921055
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/maths.scm | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 34710fc65c..750de949b7 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9559,7 +9559,8 @@ computation is supported via MPI.")
(for-each delete-file-recursively
'("scilab"
"config"
- "libs/GetWindowsVersion"))
+ "libs/GetWindowsVersion"
+ "Visual-Studio-settings"))
(for-each delete-file
(cons* "aclocal.m4"
"configure"
@@ -9571,6 +9572,7 @@ computation is supported via MPI.")
"m4/ltversion.m4"
"m4/lt~obsolete.m4"
"m4/pkg.m4"
+ "Scilab.sln"
(find-files "." "^Makefile\\.in$")))
;; And finally some files in the modules directory:
@@ -9654,10 +9656,7 @@ computation is supported via MPI.")
(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"
- ;; There are some 2018-fortran errors that are ignored
- ;; with this fortran compiler flag.
- "FFLAGS=-fallow-argument-mismatch")
+ "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg")
#:phases
#~(modify-phases %standard-phases
;; The Num library is specified with the OCAMLC and
@@ -9685,14 +9684,12 @@ computation is supported via MPI.")
(lambda* (#:key inputs #:allow-other-keys)
;; Fix scilab script.
(substitute* "bin/scilab"
- (("\\/bin\\/ls")
+ (("/bin/ls")
(search-input-file inputs "bin/ls")))
;; Fix core.start.
(substitute* "modules/core/etc/core.start"
(("'SCI/modules")
- "SCI+'/modules"))
- ;; Set SCIHOME to /tmp before macros compilation.
- (setenv "SCIHOME" "/tmp")))
+ "SCI+'/modules"))))
;; Prevent race condition
(add-after 'pre-build 'build-parsers
(lambda* (#:key (make-flags #~'()) #:allow-other-keys)
- branch master updated (5023424f16 -> 8d596af2c9), guix-commits, 2023/11/23
- 01/15: services: Add oci-container-service-type., guix-commits, 2023/11/23
- 02/15: gnu: scilab: Remove uneeded code.,
guix-commits <=
- 04/15: gnu: scilab: Use gexp for tcl and tk libraries., guix-commits, 2023/11/23
- 09/15: gnu: scilab: Set default SCIHOME value., guix-commits, 2023/11/23
- 11/15: gnu: Add coq-for-coqtail., guix-commits, 2023/11/23
- 15/15: gnu: folly: Update to 2023.11.06.00., guix-commits, 2023/11/23
- 03/15: gnu: scilab: Activate tests and disable failing tests., guix-commits, 2023/11/23
- 05/15: gnu: scilab: Add phase rewrap-scilab-cli., guix-commits, 2023/11/23
- 06/15: gnu: scilab: Reindent., guix-commits, 2023/11/23
- 08/15: gnu: scilab: Add phase set-version., guix-commits, 2023/11/23
- 07/15: gnu: scilab: Update to 2024.0.0., guix-commits, 2023/11/23
- 10/15: gnu: Add vim-vader., guix-commits, 2023/11/23