From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cHlOE4sQImKCGgEAgWs5BA (envelope-from ) for ; Fri, 04 Mar 2022 14:13:47 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id oLS9EIsQImKyAgEA9RJhRA (envelope-from ) for ; Fri, 04 Mar 2022 14:13:47 +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 11668816F for ; Fri, 4 Mar 2022 14:13:47 +0100 (CET) Received: from localhost ([::1]:44970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ7kg-00075N-74 for larch@yhetil.org; Fri, 04 Mar 2022 08:13:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ7iJ-0004LQ-82 for bug-guix@gnu.org; Fri, 04 Mar 2022 08:11:19 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ7iA-0005VN-QH for bug-guix@gnu.org; Fri, 04 Mar 2022 08:11:18 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQ7iA-0007Uj-LX for bug-guix@gnu.org; Fri, 04 Mar 2022 08:11:10 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#50299: [PATCH v5 10/24] gnu: swi-prolog: Correct reference to 'bin/swi-prolog'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 04 Mar 2022 13:11:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50299 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 50299@debbugs.gnu.org Received: via spool by 50299-submit@debbugs.gnu.org id=B50299.164639942328604 (code B ref 50299); Fri, 04 Mar 2022 13:11:10 +0000 Received: (at 50299) by debbugs.gnu.org; 4 Mar 2022 13:10:23 +0000 Received: from localhost ([127.0.0.1]:44805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ7hO-0007RB-4D for submit@debbugs.gnu.org; Fri, 04 Mar 2022 08:10:22 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:42750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQ7Yk-00079z-LJ for 50299@debbugs.gnu.org; Fri, 04 Mar 2022 08:01:43 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by andre.telenet-ops.be with bizsmtp id 2D1P2700M4UW6Th01D1RjX; Fri, 04 Mar 2022 14:01:25 +0100 From: Maxime Devos Date: Fri, 4 Mar 2022 13:01:05 +0000 Message-Id: <20220304130119.14858-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220304130119.14858-1-maximedevos@telenet.be> References: <20220304130119.14858-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1646398885; bh=NeqCXmRzxgiqE35Mq5xCaqIeLZOSwkb77RFhcydoKlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G/Xr086h3fiYBU5kzqGDDpexQd7PbRXJPRBHJVWxPhvpOwXoVNL6YgUXb9fyX2Nz5 SY1TciNiLp+j20GJXy8IUuliCvUOIFSKv7hqxoMKGMDFlKNmlUrWJrgnj5svQJ8ilQ 4Q9+asjMGFAFg9lOaL7xteHXXPSPHG6tb/ZmhzfIXajQEl/KS8+u8VEeDfjTO6Z4Wa LkURA7/XNU02YzlZY25enn0SyRkIiJu0Oqm6Bx9ajH/wv3rEoh+LGVg+tIwXknp/eK 8K/ChUOOhSrGcSiTUsAbKwBxhdAInWIyfywbomj/KL1LmmbCFyKKOrQ2zf2JjGQdpn 5g45qwcVcU6ZQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646399627; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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:dkim-signature; bh=NeqCXmRzxgiqE35Mq5xCaqIeLZOSwkb77RFhcydoKlQ=; b=WJkgF2tNzN+lKUhyoH1nTBrOOOv22nxE/Rj+TLGCuYEvHoS4/vogS1RrVSF+2QSPS+C4od t+Ab5tYFaEpfHjv9KdPiuX5P9C6sIDYPiOEkOXcMk5inRdceefGMO29J/gLtynK/G+vZ9E OHWLijsbrlroxCa6paWnbRK3YYNdIEeMDFwwWoq0CBN1aX8dmE0Jvn54k18JHaXRlwLiEy 4hJ3g539KmLSHjSAWUH8pzvtlY6C17LhPIcKt+v8ERkf3Rpk8gf7m7+lINUhmGVabDvYed +CIJZatOMjx8zGKp0vST4NVV6Qq1xOT/4KX9Vt9qQfdUzVfgw/zVOI1N71ktrg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646399627; a=rsa-sha256; cv=none; b=r23E4Ny7hfvQ8qHEKZVX541T1IOoSZmsWSqZjQfESdeDOq1sxkQp+uA8etFaGIe3yoHZED RjyN3i98FuURF6tMPs7hfF/fi4b3o9jAyAkrQaN9l6ZV2mOyhghBOKmFudVcvYYSO5E7t5 SKp6Il0/UljLDaqfErDg726HFvfz22BlgmYVsavL9FG2I2ldJSHTRCJhmwi6qBhaYyhvGc 6GkpAzMe+MBXPxQ283e6Q2hOe2PefvzaSRnCzs7EYjfmibc/AQc7HTVpSKgWpB/Zf8DAOX 6OwC75/IjH3uDbOoTctALOT1RgtqB79HLMfeDrvsc17WXAfv7o/Ikvsg5vH4ig== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b="G/Xr086h"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.04 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b="G/Xr086h"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 11668816F X-Spam-Score: 6.04 X-Migadu-Scanner: scn0.migadu.com X-TUID: WL7g6OlAlfx3 * gnu/packages/prolog.scm (swi-prolog)[arguments]<#:phases>{fix-cross-references}: New phase. --- gnu/packages/prolog.scm | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 00f09b49cc..86ac2c2bb1 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -120,19 +120,30 @@ manner. It also features an interactive interpreter.") "-DINSTALL_DOCUMENTATION=ON" "-DSWIPL_INSTALL_IN_LIB=OFF") ; FIXME: Breaks RUNPATH validation. #:phases - (modify-phases %standard-phases - ;; XXX: Delete the test phase that attempts to write to the - ;; immutable store. - (add-after 'unpack 'delete-failing-tests - (lambda _ - (substitute* "src/CMakeLists.txt" - ((" save") "")) - (substitute* "src/test.pl" - (("testdir\\('Tests/save'\\).") "")) - (with-directory-excursion "src/Tests" - (for-each delete-file-recursively - '("save"))) - #t))))) + ,#~(modify-phases %standard-phases + ;; XXX: Delete the test phase that attempts to write to the + ;; immutable store. + (add-after 'unpack 'delete-failing-tests + (lambda _ + (substitute* "src/CMakeLists.txt" + ((" save") "")) + (substitute* "src/test.pl" + (("testdir\\('Tests/save'\\).") "")) + (with-directory-excursion "src/Tests" + (for-each delete-file-recursively + '("save"))) + #t)) + #$@(if (%current-target-system) + ;; Prevent man_server.pl and swipl-lfr.pl from keeping a + ;; reference to the native swi-prolog. + ;; FIXME: libswipl.so and swipl-ld keep a reference to the + ;; cross-compiler. + #~((add-after 'install 'fix-cross-references + (lambda _ + (define bin `(,(string-append #$output "/bin"))) + (for-each (lambda (file) (patch-shebang file bin)) + (find-files #$output ".pl$"))))) + #~())))) (native-inputs `(,@(if (%current-target-system) (begin -- 2.30.2