From patchwork Sat Jun 20 21:32:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 22809 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 C020927BBE6; Sat, 20 Jun 2020 22:33:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9D70127BBE5 for ; Sat, 20 Jun 2020 22:33:09 +0100 (BST) Received: from localhost ([::1]:57528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jml6r-0008Tv-3C for patchwork@mira.cbaines.net; Sat, 20 Jun 2020 17:33:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jml6k-0008Sq-GJ for guix-patches@gnu.org; Sat, 20 Jun 2020 17:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jml6k-0005kX-61 for guix-patches@gnu.org; Sat, 20 Jun 2020 17:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jml6k-0007BY-3p for guix-patches@gnu.org; Sat, 20 Jun 2020 17:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41971] [PATCH 4/5] gnu: lcalc: Don't rename the include directory. References: <20200620212802.31906-1-kuba@kadziolka.net> In-Reply-To: <20200620212802.31906-1-kuba@kadziolka.net> Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Jun 2020 21:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41971 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41971@debbugs.gnu.org Received: via spool by 41971-submit@debbugs.gnu.org id=B41971.159268873327538 (code B ref 41971); Sat, 20 Jun 2020 21:33:02 +0000 Received: (at 41971) by debbugs.gnu.org; 20 Jun 2020 21:32:13 +0000 Received: from localhost ([127.0.0.1]:58863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jml5w-0007A6-W9 for submit@debbugs.gnu.org; Sat, 20 Jun 2020 17:32:13 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:38918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jml5u-00079x-Nh for 41971@debbugs.gnu.org; Sat, 20 Jun 2020 17:32:11 -0400 Received: (qmail 20236 invoked by uid 1009); 20 Jun 2020 23:32:09 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25848. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.009267 secs); 20 Jun 2020 21:32:09 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 20 Jun 2020 23:32:09 +0200 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Sat, 20 Jun 2020 23:32:08 +0200 Message-Id: <20200620213208.2435-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Qmailux-2.08st: added fake Content-Type header 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Sage no longer renames the directory, so we shouldn't either. * gnu/packages/sagemath.scm (lcalc)[arguments]: Remove a substitution from the prepare-build phase. --- gnu/packages/sagemath.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index c94020f13e..8c837fdaeb 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -368,10 +368,7 @@ used as internal storage type for polynomial structures.") (let ((out (assoc-ref outputs "out"))) (substitute* "Makefile" (("^INSTALL_DIR= /usr/local") - (string-append "INSTALL_DIR=" out)) - ;; Sage renames the include directory, so we do it also. - (("include/Lfunction") - "include/libLfunction"))) + (string-append "INSTALL_DIR=" out)))) #t)) (add-before 'install 'make-output-dirs (lambda* (#:key outputs #:allow-other-keys)