From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4OeDJz/2zmEsrgAAgWs5BA (envelope-from ) for ; Fri, 31 Dec 2021 13:23:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id oNDnJD/2zmFTRgAA9RJhRA (envelope-from ) for ; Fri, 31 Dec 2021 13:23:27 +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 561BE191C8 for ; Fri, 31 Dec 2021 13:23:27 +0100 (CET) Received: from localhost ([::1]:54024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3GwQ-0001dG-Ga for larch@yhetil.org; Fri, 31 Dec 2021 07:23:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3GqF-0000C5-9i for bug-guix@gnu.org; Fri, 31 Dec 2021 07:17:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3GqE-0004WO-QK for bug-guix@gnu.org; Fri, 31 Dec 2021 07:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3GqE-00022r-Md for bug-guix@gnu.org; Fri, 31 Dec 2021 07:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#50299: [PATCH v4 10/25] 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, 31 Dec 2021 12:17:02 +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.16409530017781 (code B ref 50299); Fri, 31 Dec 2021 12:17:02 +0000 Received: (at 50299) by debbugs.gnu.org; 31 Dec 2021 12:16:41 +0000 Received: from localhost ([127.0.0.1]:55352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3Gps-00021L-M2 for submit@debbugs.gnu.org; Fri, 31 Dec 2021 07:16:41 -0500 Received: from newton.telenet-ops.be ([195.130.132.45]:37252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3Goe-0001s0-7z for 50299@debbugs.gnu.org; Fri, 31 Dec 2021 07:15:32 -0500 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4JQPGz23MMzMqw7y for <50299@debbugs.gnu.org>; Fri, 31 Dec 2021 13:15:23 +0100 (CET) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by baptiste.telenet-ops.be with bizsmtp id d0FM260074UW6Th010FPLJ; Fri, 31 Dec 2021 13:15:23 +0100 From: Maxime Devos Date: Fri, 31 Dec 2021 12:14:52 +0000 Message-Id: <20211231121507.70323-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211231121507.70323-1-maximedevos@telenet.be> References: <20211231121507.70323-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=r21; t=1640952923; bh=NeqCXmRzxgiqE35Mq5xCaqIeLZOSwkb77RFhcydoKlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oGD4x/PmcpN6ep+xM+XRQt9hi8LDo4Q+39VnD/fYfA0q6F8WVNejQWORy/7aaUuFm qnw06b1sPnqtTqlViQwMpQc8EntpZQMF+KXE3jJkbmtBaWTWaUhu4O5Ap7ynG7r9zo UzQq3stBU0SAONkfA8mSsW+kl/EaGaQKxCXXAALtp2iCt1+j5tdezixOwo2oK+qEjw RQaPrggX8JRsCFwifvPqO8rKVCOSMNXbz+BK+vko+yepGi791rO5eJptIdS1IR46lx 1l+ek7UsWEODRmBNaz38761FeRW+HNUcV79ttSrvUC0Ks+X/RWa9dy4/t/mTN3ZPMt DVqvsEwGfdKWw== 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: , Cc: Maxim Cournoyer 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=1640953407; h=from:from:sender:sender: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:dkim-signature; bh=NeqCXmRzxgiqE35Mq5xCaqIeLZOSwkb77RFhcydoKlQ=; b=hHs6+oWTgPCFBKqT7yT7h6DmR7FqWUQgu6UiAdZF7WWW7vfTH2Dnsx/AKHfwtwFpnIW8b1 AHTxGOlIEOj1VK5senGvfXj8LvVqfGjnR5V+++NWik75DBnKzcfbqX5eRGLfFoAy9uCpHE /qbX1EbSQTaFZoWaEsYj4R//vbNAGrvfQQeCP9JUqu0oPRVkfjvlOZqkVT6r+Q0Oq5FhAT Cx2DeWrzNzEmAKDUcX1m+cGHC7WlCu/TqzgrGGF6Kvr7/6MSh9Ouy25MOP+zXEGdZTRsC8 0fomj1I3F/DIrvmoGl3ncg03iCPgiYP+kslBm+f2cTLoeHqLDkxiJNzDii7CZQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640953407; a=rsa-sha256; cv=none; b=WQ97Sr8L9rDYFkmZEA72leheWQO6DtG7o8btrQ61r5ok3bw+enCvGylVgVkIUN+g27gBKC SGivyZ93jreHIOqzky6qn51hqK0W/EyzTLALQUTgEENzNF/bCWTCk43iBKn0uGXxzpe9FC kBgZ/mP/2jZlZVaptHC+B+nhS7VWuRcIhIrhwiQinTQ69E/nH4qTjb8dk55N4+4Gpmi58h XvjGGFTMZPhPTEtNjQDYdHetOGKQjCCX1ZGM5HKSJ68zlSQ8tY+OdcLhFgaCCWd4HYx2IT GD0MJRabONc8e8zsoo2Q7QGO4wV8aA2XMgA7CC78VVesEvlYArqQzGw1WEgTHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="oGD4x/Pm"; 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: -0.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b="oGD4x/Pm"; 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: 561BE191C8 X-Spam-Score: -0.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: 5WW5mvm7x+V9 * 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