From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8FudOZztVGFiNQAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 00:50:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4N9aNZztVGGAIgAA1q6Kng (envelope-from ) for ; Wed, 29 Sep 2021 22:50:04 +0000 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 6B8AE35788 for ; Thu, 30 Sep 2021 00:50:04 +0200 (CEST) Received: from localhost ([::1]:37502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mViOp-0006ox-8W for larch@yhetil.org; Wed, 29 Sep 2021 18:50:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mViNu-0005Rz-6x for bug-guix@gnu.org; Wed, 29 Sep 2021 18:49:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mViNt-0000lw-Tr for bug-guix@gnu.org; Wed, 29 Sep 2021 18:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mViNt-0001aG-RP for bug-guix@gnu.org; Wed, 29 Sep 2021 18:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#50299: [PATCH v3 09/27] gnu: swi-prolog: Set PROG_SWIPL when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 29 Sep 2021 22:49:05 +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.16329557085863 (code B ref 50299); Wed, 29 Sep 2021 22:49:05 +0000 Received: (at 50299) by debbugs.gnu.org; 29 Sep 2021 22:48:28 +0000 Received: from localhost ([127.0.0.1]:50851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mViNH-0001WO-J5 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:48:27 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:53654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mViMw-0001T7-Kn for 50299@debbugs.gnu.org; Wed, 29 Sep 2021 18:48:07 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id zyo1250090mfAB406yo60i; Thu, 30 Sep 2021 00:48:06 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:47:41 +0200 Message-Id: <20210929224759.21803-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929224759.21803-1-maximedevos@telenet.be> References: <20210929224759.21803-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=1632955686; bh=W4sSkAwH56k6bEs6lBCHGaVA59yMyKKWqlBqmlTRZdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=B30o3BfWq2ZAxKHKG/EPQxneoaZv3jTPlt33JIUMWFuEapmCXQLJZf0fE+hg5emfU xlCYAuZyg3nc4IcekDZcu3/DOmfHWOJA0cDfqOs8liu5QgsCTUtMZARnQOWGAObYfr ae22DX2mOn+wzoJcd7wKpaRTDnAvuAELmqQtj4WsAUXM5ZD8dLBzsv6MGI4pWgYmzH CrIYrNTvnn+aV7z9RNi4QkhxxO715AfOjlmZC1e0uSaTItgGB2XSVPWPGPAh4SyhOM NrRAXABtrJH1G99k3Tl2mAVa/BpNOt1JXtkGn9FtUD4KuXrqRpldfyEyXZ+Kve5DuB rENpjRHT+z+3g== 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632955804; 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=W4sSkAwH56k6bEs6lBCHGaVA59yMyKKWqlBqmlTRZdQ=; b=M5RxDrEk+wp2u4vko+ogFcCbEQQZxe0bkTnvfSjX9uCPMLsM1X5PAZhttUFYO1emfWNlDN tMAJ3aGpToBU2OpQjkvAnmZBLS/HgNHTtKhwf31epbsbxOkWB/Pp1HvLs/Rd1MX6ouC9Ok Mub3pSoZNdxQHRq1YPbnhgFvM5jbzD7r5FhU3kG5DzUM25/yu2nGmUjUyPseGHTHko05R5 XOw9ntACRbZ0dbJrWJ1eq4NOCcR+xkYpOf7Ggd5cr2FbF6UXK89oQJQeQPcEy3aJYlZxX8 J7l+Jg2nhv+N/oT9wE2qGhHEonQ7qc4fBmVMaO+7n0oQ5FPUYlO0LpmKQ/KRlA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632955804; a=rsa-sha256; cv=none; b=eGKJJ3t/1ORWHh4RMYmpnLbmDOq7Tpcf8NXNlcWfulwNuWrWeMzDxkMIpSu+wFqFANo1Vj 9NrufJ0sz3fkUCfTy/HXfn/TXwDD1bm+AhB3MKfxd2MuZJGW+7rSeH+OzlmQT2f9dW3qt+ K8ZqBxhmSebQ8qayEV6ZoLVvhbxHnk1Tk+HkSxNW1R/YZCWDZ+cdFDYbnj2TQp0WBvvxfW ODEkQzJ/bkCQz9DB0p1H2AEOAsOLPHaR1Hg6uihDmss/ykpWSfmq0n57NZDm+VKyBGFKEL DSZh6UcwMlXHYtLNWS16PCg+OcfB5EKc1xmDTe7XvvT3/wqObBvipr73PVgofw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=B30o3BfW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 3.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=B30o3BfW; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 6B8AE35788 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: g2FfCCNX0mhO * gnu/packages/prolog.scm (swi-prolog)[arguments]<#:configure-flags>: Set PROG_SWIPL and SWIPL_NATIVE_FRIEND when cross-compiling. (swi-prolog)[native-inputs]: Add 'this-package' when cross-compiling. --- gnu/packages/prolog.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 3eaec533d7..7a5ac04a0c 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -27,6 +27,7 @@ #:use-module (guix packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module (gnu packages backup) #:use-module (gnu packages bash) #:use-module (gnu packages compression) @@ -107,6 +108,12 @@ manner. It also features an interactive interpreter.") '("-DBSD_SIGNALS=1" "-DQSORT_R_GNU=1" ;; If absent, the non-existent 'cc' is used. "-DCMAKE_HOST_CC=gcc" + ;; swi-prolog needs a native copy of itself for + ;; cross-compilation. + "-DSWIPL_NATIVE_FRIEND=/nowhere" + (string-append "-DPROG_SWIPL=" + (assoc-ref %build-host-inputs "swi-prolog") + "/bin/swipl")) '()) "-DINSTALL_DOCUMENTATION=ON" "-DSWIPL_INSTALL_IN_LIB=OFF") ; FIXME: Breaks RUNPATH validation. @@ -125,7 +132,15 @@ manner. It also features an interactive interpreter.") '("save"))) #t))))) (native-inputs - `(("texinfo" ,texinfo) + `(,@(if (%current-target-system) + (begin + (unless (equal? (target-64bit?) + (target-64bit? (%current-system))) + (error "swi-prolog requires --system and --target to have \ +the same word size")) + `(("swi-prolog" ,this-package))) + '()) + ("texinfo" ,texinfo) ("perl" ,perl) ("pkg-config" ,pkg-config))) (inputs -- 2.33.0