From patchwork Sun Nov 5 23:51:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 19010 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 A3BD127BBE2; Mon, 6 Nov 2023 00:04:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 0F4B327BBE9 for ; Mon, 6 Nov 2023 00:04:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6S-0004ih-5l; Sun, 05 Nov 2023 19:04:28 -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 1qzn6Q-0004ho-Dv for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:26 -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 1qzn6Q-0000Qr-5g for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn71-0008VM-49 for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 3/8] gnu: scilab: Use gexp for tcl and tk libraries. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:03 +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.169922908432582 (code B ref 65853); Mon, 06 Nov 2023 00:05:03 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:44 +0000 Received: from localhost ([127.0.0.1]:38400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6i-0008TR-7z for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:44 -0500 Received: from 20.mo582.mail-out.ovh.net ([178.32.124.17]:44021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6d-0008Sb-Jv for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:42 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.156.25]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 14C97236D6 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:00 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-dcn65 (unknown [10.110.103.46]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B6A1E1FD27; Mon, 6 Nov 2023 00:03:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-dcn65 with ESMTPSA id Fa6wKG8tSGWoJwAA3Hx/ow (envelope-from ); Mon, 06 Nov 2023 00:03:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S00196bec1d2-0ab9-40ee-82f8-a620852c79bf, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Mon, 6 Nov 2023 00:51:46 +0100 Message-ID: <20231106000354.32423-4-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 X-Ovh-Tracer-Id: 3274116931470877410 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeekgeevkeffudelveevveekjeetkefgtdejhefgfedvvdffvdefffejudfgfffgnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht 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): Use gexp for tcl and tk libraries. [argments](configure-flags): Use gexp for tcl and tk libraries. Change-Id: I31fe9a9e2afd9b6266a2e7a2c7044b3c9d0dfa4f --- gnu/packages/maths.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f6d0575979..62c935a868 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9621,6 +9621,8 @@ (define-public scilab tcl tk)) (arguments + (let* ((tcl (this-package-input "tcl")) + (tk (this-package-input "tk"))) (list #:configure-flags #~(list @@ -9633,18 +9635,10 @@ (define-public scilab "--disable-build-help" "--with-external-scirenderer" ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" - (dirname - (search-input-file %build-inputs "include/tcl.h"))) - (string-append "--with-tcl-library=" - (dirname - (search-input-directory %build-inputs "lib/tcl8"))) - (string-append "--with-tk-include=" - (dirname - (search-input-file %build-inputs "include/tk.h"))) - (string-append "--with-tk-library=" - (dirname - (search-input-directory %build-inputs "lib/tk8.6"))) + (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 @@ -9709,7 +9703,7 @@ (define-public scilab (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" - make-flags))))))) + make-flags)))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab