From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SEy0Ja3wUWHpLQAAgWs5BA (envelope-from ) for ; Mon, 27 Sep 2021 18:26:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yL5wIa3wUWHzJAAA1q6Kng (envelope-from ) for ; Mon, 27 Sep 2021 16:26:21 +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 1D9D61BCE7 for ; Mon, 27 Sep 2021 18:26:21 +0200 (CEST) Received: from localhost ([::1]:43724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUssQ-00049q-C2 for larch@yhetil.org; Mon, 27 Sep 2021 11:49:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUsqR-0001HU-Ac for bug-guix@gnu.org; Mon, 27 Sep 2021 11:47:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59264) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUsqR-0007n6-2M for bug-guix@gnu.org; Mon, 27 Sep 2021 11:47:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mUsqQ-000475-WE for bug-guix@gnu.org; Mon, 27 Sep 2021 11:47:07 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#50299: [PATCH v2 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: Mon, 27 Sep 2021 15:47:06 +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: Maxim Cournoyer Received: via spool by 50299-submit@debbugs.gnu.org id=B50299.163275757315535 (code B ref 50299); Mon, 27 Sep 2021 15:47:06 +0000 Received: (at 50299) by debbugs.gnu.org; 27 Sep 2021 15:46:13 +0000 Received: from localhost ([127.0.0.1]:42538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUspY-00042P-QU for submit@debbugs.gnu.org; Mon, 27 Sep 2021 11:46:13 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:41940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mUspB-0003xV-JD for 50299@debbugs.gnu.org; Mon, 27 Sep 2021 11:45:56 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id z3li2500H0mfAB4013lons; Mon, 27 Sep 2021 17:45:48 +0200 From: Maxime Devos Date: Mon, 27 Sep 2021 17:45:19 +0200 Message-Id: <20210927154537.28227-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927154537.28227-1-maximedevos@telenet.be> References: <20210927154537.28227-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=1632757548; bh=W4sSkAwH56k6bEs6lBCHGaVA59yMyKKWqlBqmlTRZdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=B2EXFYXDQd1W5P7ZjQefX2Kpl5diGwKaM3S5q3t3FdiQn0mf4kkwIUML3J6ZFWHDC hrylyLWyiTK0hzSIn1tuMuiIPpl7KxBp6KgzIv4xtSzI6PbPiOIfq66igwGXzocpPi qDrlq90yPtR7uyzQioqrfGOuog6yucci0HTnY8VhRGT+Quo92tQNXGx0HXiRgyqnXN 0JuY34VKrjKlfQZuwX5AVvtm4mFLEK8EXtSMq+mo8PvN6isOc6bk9N911pAOpGRPFw psOCfOkWFbUhofUzXhmcFCVaAysrGQP6OjwrcX72hpf0yx8xUNPwNB1ErCSVlmDTo5 HjGp2KVxgwVDQ== 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: 50299@debbugs.gnu.org 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=1632759981; 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=FDY/dZnPJMm4zHopmmT4C5vDJzH6V8iueP3DO3qvY6bFX0tJpvEIOcd2nk7jYb51W082EY 2OrSI+vCbFjLD9mhmgUbbCKYr00DrOHUBnOYchiRKnObuvYSM3Uo5Lb+/j7hP3bZe9hFTy ykMSxwhz95tf+OEFgP4eLCB7PCqTdteP5sD3FuxzJSCCtnW56kvw3jMvMsRBMnhk+zxylx kWK2YTcVVeQ8KpJF3Xypj+wAuM5q2zQAKRkUHBLaZSqdqm75iCApzNYvCz0UqH465cED2z TUjD/RBD1+Gmfe8kpk1w6jCeo1pXxt0Bf/Ne+SvwYTyOgmy3IBqeUN0eTePPaw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632759981; a=rsa-sha256; cv=none; b=JRClBEqsH3WaqVGMX67H1lSVRrYm5XxB3Iz4O1zKhzs1AoZ3o/LY3jV4EmQlXrTvKKCPpl 3INzMhLwaKcHlfi6Ntd2H6n92GPUDaDjapWiUC5n6K5z7aVgxl3co4B+MlNtnDoa1aMQLO ux8X+3txgt7tl6oyb08wZqJmEH/kcI3V5QbdbtbTaMXbQrANwddc4qxP5PxG1Xz/ON66ny dJnrsow/kV+8wF97UcbBFgTi63DJkQUkCvVjl5OKrdQBteNYOQzyXyHZRzrC8I/IZfecKM j3KznYCylt2EpdsakOKodKSWKznyroG11VC+39fVc5I+Fz1fUqGe8Gu95FY9iA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=B2EXFYXD; 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: 5.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=B2EXFYXD; 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: 1D9D61BCE7 X-Spam-Score: 5.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: MpHq5kQ5N/06 * 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