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 YOl/GDLH7mAnAQAAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 13:14:58 +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 OEIwFDLH7mB3DwAA1q6Kng (envelope-from ) for ; Wed, 14 Jul 2021 11:14:58 +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 C10E2159BB for ; Wed, 14 Jul 2021 13:14:57 +0200 (CEST) Received: from localhost ([::1]:48032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3cqu-0002jn-RI for larch@yhetil.org; Wed, 14 Jul 2021 07:14:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3cq5-0000w5-9c for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3cq3-0000wo-RB for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3cq3-0001Pa-O4 for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v6 02/22] utils: Define 'target-hurd?' predicate. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Jul 2021 11:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: Mathieu Othacehe , Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.16262612045165 (code B ref 49025); Wed, 14 Jul 2021 11:14:03 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jul 2021 11:13:24 +0000 Received: from localhost ([127.0.0.1]:43125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpP-0001Ku-Ml for submit@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:24 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpL-0001Je-KL for 49025@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:21 -0400 Received: from localhost.localdomain ([188.188.219.228]) by andre.telenet-ops.be with bizsmtp id UzDG2500W4wFxCU01zDJEs; Wed, 14 Jul 2021 13:13:19 +0200 From: Maxime Devos Date: Wed, 14 Jul 2021 13:12:47 +0200 Message-Id: <20210714111307.19324-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210714111307.19324-1-maximedevos@telenet.be> References: <20210714111307.19324-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=1626261199; bh=RPB2Fq+qwogIoKSxRZMQuB8cGMzdD3KornK1JVJPU0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F0C0nUh67P8lATVm9qJKperEKHXc3U7ciWAfTWmSTwREhi8zG8qqVx+wKpo8r6JHp OubrfTVLEMnb4cfu+a361uyOQxonIzOo9wsQfOObLsaPTZuZv9n3A+5dYOZqkyumaJ 9HcBFA0OZD8zJJez3BgHB887mvWLtXubkFFpL6iJhRStd4Gp1qduaRLkgJJksZ3Gxr JvtuonS1en5XIr2kO2t/55NWP1eV/nIdLFbwhb7NymbRnRDIvD/Zo0qXj38NbENaAV wnGu82sFEqA5uVj2m1TzGBZmsIBc/W1CB/eN6tyCy84njJX1DC11QxwSt6ByD7ZIHf mkZZ1rVyccxuA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626261297; 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=RPB2Fq+qwogIoKSxRZMQuB8cGMzdD3KornK1JVJPU0w=; b=pAa7DdBt4MKIjrZ487B2KA6NVOX99RrytBeMe/GALM31/wfmEpUIGMm5kBxqOzrg+YwUy4 oJBtXxUiD0WbIeiKLxPhtbxkEA9pFksmGUI1tjfu/5faf2KCOfXIccPWbdPz8GyThwXTnh ejIV67QCR1rLh4wVZ/x/0LIIaUvg4r04OpZgXcZ/evfeEghFM7zKGEAIPQp6W2OMS/doKq JGKNnijGsAbCdNrM9BFfdxQEgxVfdOZubcVUvXupeOOzMRG4sq36+Gq09hAM8p5EI6VqMH eNrNSl/QUucxAzxeis+XGvHbsFkVFhheCTOpLiF9lKtYQnYu5jKHojjEQTkkJw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626261297; a=rsa-sha256; cv=none; b=lROa7GdXaIMY/zgyCrBL5DiuNosa8l98mXC1/l2cgv2nb/0JRQ33rxU9ndihWxtgvqO7AM 73SZFcXbwmSjPJHQRnHfGjxY0KcfiMZrV6/O+YF24V7P6WRUm2mhZoHHd2Em7aRpC1SSh8 uB/ARc18bOuf5TAp1HTsk0c/JMSdYMSeph9+cFoxd2tgQ2ocbvOf8g9SJaAwZzirVLBE0k og+vJMr0mGOzrmBQYkZjEw3uZ5oCLKfY8Nh1u1wszbN8fNwO7T4MXsErF//KvYdmApD/9+ 3u7zV8PqxnaHAmVQo2Ku4/NxIKDGwlNlMj2rS6WXYr91K3KqyGP4MsXnw2S29Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=F0C0nUh6; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-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=F0C0nUh6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C10E2159BB X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: I4yI5XzK+DAs It behaves similarily to the other target-...? procedures. The usage of hurd-triplet? / target-hurd? in libgc appears incorrect to me, as (%current-system) is normally never false. * gnu/packages/hurd.scm (hurd-triplet?): Move to ... * guix/util.scm (target-hurd?): ... here, let its argument default to (%current-target-system) or (%current-system), and write a docstring. * gnu/packages/hurd.scm (hurd-target?, hurd-system?): Use target-hurd? instead of hurd-triplet?. * gnu/packages/bdw-gc.scm (libgc): Likewise. * gnu/packages/cross-base.scm (cross-libc)[arguments]<#:configure-flags>: Likewise. (cross-libc)[arguments]<#:phases>: Likewise. (cross-libc)[arguments]<#:native-inputs>: Likewise. * gnu/packages/make-boostrap.scm (%glibc-stripped)[inputs]: Likewise. --- gnu/packages/bdw-gc.scm | 4 ++-- gnu/packages/cross-base.scm | 6 +++--- gnu/packages/hurd.scm | 10 +++------- gnu/packages/make-bootstrap.scm | 2 +- guix/utils.scm | 7 +++++++ 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index 0d82889bac..5ced11bb64 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -56,8 +56,8 @@ ;; to configure script. See bug report and discussion: ;; ;; - ,@(if (hurd-triplet? (or (%current-system) - (%current-target-system))) + ,@(if (target-hurd? (or (%current-system) + (%current-target-system))) '("--disable-gcj-support") '())))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index ced226ef34..78cbf871ac 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -505,7 +505,7 @@ and the cross tool chain." ,@(package-arguments libc)) ((#:configure-flags flags) `(cons ,(string-append "--host=" target) - ,(if (hurd-triplet? target) + ,(if (target-hurd? target) `(cons "--disable-werror" ,flags) flags))) ((#:phases phases) @@ -519,7 +519,7 @@ and the cross tool chain." (setenv "CROSS_LIBRARY_PATH" (string-append kernel "/lib")) ; for Hurd's libihash #t))) - ,@(if (hurd-triplet? target) + ,@(if (target-hurd? target) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) @@ -536,7 +536,7 @@ and the cross tool chain." (native-inputs `(("cross-gcc" ,xgcc) ("cross-binutils" ,xbinutils) - ,@(if (hurd-triplet? target) + ,@(if (target-hurd? target) `(("cross-mig" ,@(assoc-ref (package-native-inputs xheaders) "cross-mig"))) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 59a7b55943..222ddbce65 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -51,20 +51,16 @@ hurd-target? hurd-triplet?)) -(define (hurd-triplet? triplet) - (and (string-suffix? "-gnu" triplet) - (not (string-contains triplet "linux")))) - (define (hurd-target?) "Return true if the cross-compilation target or the current system is GNU/Hurd." - (or (and=> (%current-target-system) hurd-triplet?) + (or (and=> (%current-target-system) target-hurd?) (and (not (%current-target-system)) - (and=> (%current-system) hurd-triplet?)))) + (and=> (%current-system) target-hurd?)))) (define (hurd-system?) "Return true if the current system is the Hurd." - (and=> (%current-system) hurd-triplet?)) + (and=> (%current-system) target-hurd?)) (define (hurd-source-url version) (string-append "mirror://gnu/hurd/hurd-" diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 265884020e..5c306c145d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -439,7 +439,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (assoc-ref %build-inputs "kernel-headers"))))) (inputs `(("kernel-headers" ,(if (or (and (%current-target-system) - (hurd-triplet? (%current-target-system))) + (target-hurd? (%current-target-system))) (string-suffix? "-hurd" (%current-system))) gnumach-headers linux-libre-headers)) diff --git a/guix/utils.scm b/guix/utils.scm index 58bbff2b36..5657a9d025 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -83,6 +83,7 @@ %current-target-system package-name->name+version target-linux? + target-hurd? target-mingw? target-arm32? target-aarch64? @@ -550,6 +551,12 @@ a character other than '@'." "Does the operating system of TARGET use the Linux kernel?" (->bool (string-contains target "linux"))) +(define* (target-hurd? #:optional (target (or (%current-target-system) + (%current-system)))) + "Does TARGET represent the GNU(/Hurd) system?" + (and (string-suffix? "-gnu" target) + (not (string-contains target "linux")))) + (define* (target-mingw? #:optional (target (%current-target-system))) (and target (string-suffix? "-mingw32" target))) -- 2.32.0