From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 0GqHBsEtSGVQAgAA9RJhRA:P1 (envelope-from ) for ; Mon, 06 Nov 2023 01:05:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0GqHBsEtSGVQAgAA9RJhRA (envelope-from ) for ; Mon, 06 Nov 2023 01:05:21 +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 D7D6F5A27B for ; Mon, 6 Nov 2023 01:05:20 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699229120; 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-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=baffY5UzjBBPjQ+/tQoTErpHkEZzW4zXqVA+0F7kw6A=; b=UKVSF7fCxK4jrZK6AYIESKqyjkaraxyJJ6YE/ugmUJpUG2wW58TwGX6KacqIj/resAHIqK Cb7j4OCGWrSJj1CqdrCnww8dn03GUvICrnBxD1KJR4qi6T6+X97gTxOEkco1QYYtM7A7Wb yL3hJbHgEtWc89Axh/+HwNvKgmNlFkPAyZ/+4DBwLT92rdDAuDVpPkHIgOq3Iu8tJY0BqS xcr7k6L8JnQb7JJMMElIN+feFl/f12hqiDzuzzd2kHjTJje9DRmCOalQgM9X/+6Gy0oxzt ASi8pGjvOThhhhboH4ce5XIPe0ic2+C2hHfLqyoKKTFLFV/5SVj8A8gqcIsb6g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699229120; a=rsa-sha256; cv=none; b=GQVkCsj1MgcTv2+J3Bka62h8YLTE3z86lSPxxk3xqn+hixfAOZEF9fpELGnX+2MT29F1Fs 5tw45QhrHVvzYS9aNY9P7wRTYuh4bvMi9STYrk3s4Tqu1IOyLkIDsJwdjvs3f9IQ9w4Jlq QjAAD6lP0MQVeQ04/kd0bMHpAqKOUfZ547FOetWR1hpISymiXj/LF0Zhx/5uUHs9Agypfp iX+0OX1C/hSpCHDl8wFr6ZeVj5r/E0YE1BOV+mFWZEPr2+/dVyGhi5WikLzNgRYju+x6Ac LiOREvyfeBouBTbSpaKYZbSh0sAgdAMTzPJ0IK9EGCRVIXkkXBlnWp55gwFXYA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6W-0004kO-6f; 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 1qzn6S-0004ij-BD for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -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 1qzn6S-0000Rp-3O for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn73-0008Vq-2q for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 1/8] gnu: scilab: Remove uneeded code. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:05 +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.169922909032642 (code B ref 65853); Mon, 06 Nov 2023 00:05:05 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:50 +0000 Received: from localhost ([127.0.0.1]:38410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6n-0008UJ-Gp for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:50 -0500 Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:60185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6a-0008SX-T8 for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:45 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.146.163]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 6138521472 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:03:58 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-scm5b (unknown [10.110.171.120]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2387C1FD39; Mon, 6 Nov 2023 00:03:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-scm5b with ESMTPSA id DQIiBm4tSGVWywQA/zfxXA (envelope-from ); Mon, 06 Nov 2023 00:03:58 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Mon, 6 Nov 2023 00:51:44 +0100 Message-ID: <20231106000354.32423-2-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-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3273553981138658018 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheekheefseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth 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-Spam-Score: -4.61 X-Spam-Score: -4.61 X-Migadu-Queue-Id: D7D6F5A27B X-Migadu-Scanner: mx13.migadu.com X-TUID: nne4N9lb8Igk * 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 --- 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 ed1708c77b..88b52eb4fc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9554,7 +9554,8 @@ (define-public scilab (for-each delete-file-recursively '("scilab" "config" - "libs/GetWindowsVersion")) + "libs/GetWindowsVersion" + "Visual-Studio-settings")) (for-each delete-file (cons* "aclocal.m4" "configure" @@ -9566,6 +9567,7 @@ (define-public scilab "m4/ltversion.m4" "m4/lt~obsolete.m4" "m4/pkg.m4" + "Scilab.sln" (find-files "." "^Makefile\\.in$"))) ;; And finally some files in the modules directory: @@ -9649,10 +9651,7 @@ (define-public scilab (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 @@ -9680,14 +9679,12 @@ (define-public scilab (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) -- 2.41.0