From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 GLJFJ/v1zmEvrgAAgWs5BA (envelope-from ) for ; Fri, 31 Dec 2021 13:22:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sHTuI/v1zmF+NwEAauVa8A (envelope-from ) for ; Fri, 31 Dec 2021 13:22:19 +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 4D4D619128 for ; Fri, 31 Dec 2021 13:22:19 +0100 (CET) Received: from localhost ([::1]:50120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3GvI-0007Qp-Vr for larch@yhetil.org; Fri, 31 Dec 2021 07:22:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3GpJ-0007tH-Fb for bug-guix@gnu.org; Fri, 31 Dec 2021 07:16:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43785) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3GpJ-0004Lp-5a for bug-guix@gnu.org; Fri, 31 Dec 2021 07:16:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3GpJ-0001yf-1e for bug-guix@gnu.org; Fri, 31 Dec 2021 07:16:05 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#50299: [PATCH v4 09/25] 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: Fri, 31 Dec 2021 12:16: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.16409529317394 (code B ref 50299); Fri, 31 Dec 2021 12:16:05 +0000 Received: (at 50299) by debbugs.gnu.org; 31 Dec 2021 12:15:31 +0000 Received: from localhost ([127.0.0.1]:55298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3Gol-0001v6-F2 for submit@debbugs.gnu.org; Fri, 31 Dec 2021 07:15:31 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:35832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3God-0001rz-Nd for 50299@debbugs.gnu.org; Fri, 31 Dec 2021 07:15:26 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by baptiste.telenet-ops.be with bizsmtp id d0FM260074UW6Th010FNLD; Fri, 31 Dec 2021 13:15:23 +0100 From: Maxime Devos Date: Fri, 31 Dec 2021 12:14:51 +0000 Message-Id: <20211231121507.70323-10-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=3a/IyBdFIs76fPgtBDjE73UskfscHGJREiq1jR6ssLE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VQtk64S87/mKjri3mC3QsPwoNmjJMlp4Ff0PyhIeVUOWK3ay3P37SorC9d22uUJ/w Dj7RBVYg0O/cYYTiSyUKzQQMfv9ijHHt7evFfyz7eedl883m5zVYaOQEvy/GXbE8mv eqQDdiAZzx2vS2hn0ea69jj5K+uNBHALmqmv0ij7qmpLHTKaJ0ct/c/qJB+DssxBAb uCRc8YWYQBnOREf71LKaKFsdAcqNtFmCmHLu6p7FaYZexj6AIkj3mO541AaL2e2kDG 7lO0YSDGWax3VzwT0pjsMdM0wLZG9nepGwWarns7npESEuVgVqskagjUc3qirLTMxl WVyxY5zMM+FfA== 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=1640953339; 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=3a/IyBdFIs76fPgtBDjE73UskfscHGJREiq1jR6ssLE=; b=ovQaIv232czjyP7YdYZx1TV/VX+jOiLzf8zAOMlHpChfie6Hps2cVNVpPJpHz1HGMMXW5J 1/KnZNMY/D+pi66pvRZavDCZe4LnTn4tvcVN4RxiYmU8qplUcwJNlM0MymUB9FDMzS+pgT 0BNkbWo9wHQACGxazg5Ze2WBKtujFTWAscKHcmvEY8s3NcO7cMFwsTGS9miMpVEsdtexga zTEqDtCbZPS6sZXf0Q/i7VFo4MJU/0iMHa5vtm3C7/kg9/BsTf0ydXfzfD90wQabHiK2yE WwSOEzT5HHHGR/0SIztcXmJJm0Xc7rc1y6/bzC0hZ1uogUz+kHSUQEDXYCDlyw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640953339; a=rsa-sha256; cv=none; b=mi6oXIBDnUCpjKyb9YsYwDE3DwD8v2FNQiiya06BNAiKNNDL60X/YdA46AgBVWXmldElup jzKCSWDjlVmQ6mRsxJ8DCTKPVWfZTOWLFT/AlNetuRunLTIIxAnpoJ3zzyhu67dXuBX3kR JcwxTCqI1OF6hD2dT8Xjimf9fosDAWm6C7sP3f/QrGlXsCvat815XpoiOLajRd30NGS7BB HHzqRiGJ5pFpSBg3m9ypD9wueB3zD3ybuyY9Lx2aInQ2e/mx7ilo9h3R0UYz9vHemxPafY 5Tjkq1Ex2IX0IfLDqXiovh7v/opg4bMpdBm5KrHIzb5ysssXUG/uaJbUCvTkvw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=VQtk64S8; 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.58 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=VQtk64S8; 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: 4D4D619128 X-Spam-Score: -0.58 X-Migadu-Scanner: scn1.migadu.com X-TUID: EZshvMoqbNOm * gnu/packages/prolog.scm (swi-prolog)[arguments]<#:configure-flags>: Set PROG_SWIPL and SWIPL_NATIVE_FRIEND when cross-compiling and make this a G-expression. (swi-prolog)[native-inputs]: Add 'this-package' when cross-compiling. --- gnu/packages/prolog.scm | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 3eaec533d7..00f09b49cc 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -22,11 +22,13 @@ (define-module (gnu packages prolog) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #: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) @@ -100,16 +102,23 @@ manner. It also features an interactive interpreter.") (arguments `(#:parallel-build? #t #:configure-flags - (list ,@(if (%current-target-system) - ;; Set this manually, otherwise CMake would need to - ;; run a cross-compiled binary, which it can't do. - ;; These values were found on a Linux system. - '("-DBSD_SIGNALS=1" "-DQSORT_R_GNU=1" + ,#~(list + #$@(if (%current-target-system) + ;; Set this manually, otherwise CMake would need to + ;; run a cross-compiled binary, which it can't do. + ;; These values were found on a Linux system. + #~("-DBSD_SIGNALS=1" "-DQSORT_R_GNU=1" ;; If absent, the non-existent 'cc' is used. "-DCMAKE_HOST_CC=gcc" - '()) - "-DINSTALL_DOCUMENTATION=ON" - "-DSWIPL_INSTALL_IN_LIB=OFF") ; FIXME: Breaks RUNPATH validation. + ;; swi-prolog needs a native copy of itself for + ;; cross-compilation. + "-DSWIPL_NATIVE_FRIEND=/nowhere" + (string-append "-DPROG_SWIPL=" + #+(this-package-native-input "swi-prolog") + "/bin/swipl")) + #~()) + "-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 @@ -125,7 +134,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.30.2