From patchwork Mon May 22 09:04:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50220 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C3C3927BBE9; Mon, 22 May 2023 10:05:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E07227BBE2 for ; Mon, 22 May 2023 10:05:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11TU-0001bZ-Un; Mon, 22 May 2023 05:05:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TS-0001YA-Rc for guix-patches@gnu.org; Mon, 22 May 2023 05:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TS-00047J-En for guix-patches@gnu.org; Mon, 22 May 2023 05:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TS-00077I-9B for guix-patches@gnu.org; Mon, 22 May 2023 05:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 1/8] hurd-boot: Add urandom and default-pager translators. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474626227208 (code B ref 63641); Mon, 22 May 2023 09:05:02 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:22 +0000 Received: from localhost ([127.0.0.1]:33528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sn-00074k-Qo for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:22 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sm-00074T-Gv for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:21 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3E0D9185328; Mon, 22 May 2023 09:04:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QhqdQxZCKm8jU7GbDDeK1iDzm18DQAhaNgsGJw5V8/c=; b=mwmZ0cGtyTceI7MI9a1Y5iJ/z0IHYR9TOqRtgqJL7Fe3Vx/Ig7a6mIBZrw8vPnczBysxsn S4Zr17rgy0qMQcFQ7F28pVweng1dXE2K4FEkUFENBw5TUE4S25LvVcCkhZOaLlEA0rRpsh RJCwGSGAtq67tpPCZEIHd81fEQvqchI1/DVCPaCHFTRsb1oV+i9uqUUSBlEmbup9LhL7EQ CeTQ7spP7+WSUA1rzpiYi7l0nFMGeskN0eGtAHRbYghvI5aW6Lr3VZKHrGIy1tRT5TVc1o c3D1oJWBAoRnfQSA/vg5grkd1WSDc4RBna5Uj9bk0al3vFSD7OhXBN5Djre+9w== Date: Mon, 22 May 2023 11:04:11 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/build/hurd-boot.scm (set-hurd-device-translators): Set up urandom and default-pager on boot. --- gnu/build/hurd-boot.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm index 95c15907dd..14bfc5e809 100644 --- a/gnu/build/hurd-boot.scm +++ b/gnu/build/hurd-boot.scm @@ -188,6 +188,7 @@ (define* (set-hurd-device-translators #:optional (root "/")) ("servers/crash-suspend" ("/hurd/crash" "--suspend")) ("servers/password" ("/hurd/password")) ("servers/socket/1" ("/hurd/pflocal")) + ("servers/default-pager" ("/hurd/proxy-defpager")) ;; /servers/socket/2 and /26 are created by 'static-networking-service'. ;; XXX: Spawn pfinet without arguments on these nodes so that a DHCP ;; client has someone to talk to? @@ -198,6 +199,8 @@ (define* (set-hurd-device-translators #:optional (root "/")) ("dev/null" ("/hurd/null") #o666) ("dev/random" ("/hurd/random" "--seed-file" "/var/lib/random-seed") #o644) + ("dev/urandom" ("/hurd/random" "--seed-file" "/var/lib/random-seed" + "--fast") #o644) ("dev/zero" ("/hurd/storeio" "--store-type=zero") #o666) ("dev/console" ("/hurd/term" "/dev/console" "device" "console")) From patchwork Mon May 22 09:04:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50222 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CFF4D27BBE9; Mon, 22 May 2023 10:05:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F74727BBE2 for ; Mon, 22 May 2023 10:05:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11Tm-0001eP-TU; Mon, 22 May 2023 05:05:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TT-0001aE-7p for guix-patches@gnu.org; Mon, 22 May 2023 05:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TS-00047S-RG for guix-patches@gnu.org; Mon, 22 May 2023 05:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TS-00077P-MY for guix-patches@gnu.org; Mon, 22 May 2023 05:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 2/8] gnu: glibc/hurd-headers: Properly cross-build. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474626227214 (code B ref 63641); Mon, 22 May 2023 09:05:02 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:22 +0000 Received: from localhost ([127.0.0.1]:33530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11So-00074m-5J for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:22 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sn-00074W-5z for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:21 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 7018B1853FC; Mon, 22 May 2023 09:04:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ISGCMo6d8OSC+hxZvwNU2qJPL5J+Bw+0BrhGPc6aQAA=; b=P/gzX2AHJkSYx0HG9YXCmRKvHwarIZFbEChKi+aAHPKYaTUtDlHw8tBOGIYW4Wh2N3TiPC STxXDZmWykN5HQZjM5gn1xd4gMIZLkGot/9vACou6L8m3ETJF7FRUukKL9yV2Gq5tuQyOL ybX6lbIDL5fjspCggZL1SAk/Xm+LV4K+k9rUPtxohYzmV9ktnTahOyTz3npiu2KGaqLrmO spNMs9lUmeeOdsJJXlmMsLsnOJs7Bh4DrBfW4L1wiJ3PWvxz/EYDzh7rZ7VcCmC7RQXtSZ /CtmwgMt4xAKs/0+ldlyw+owqGwPYKceoYaJckHquTYadBKB5t4wunJChf65/A== Date: Mon, 22 May 2023 11:04:12 +0200 Message-Id: <873b5a865c24b22b98332cc6f26e2ebef31ae68b.1684745752.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/base.scm (glibc/hurd-headers): Rely on cross-mig, and remove hardcoded configure flag `--host=i586-pc-gnu`. * gnu/packages/cross-base.scm (cross-kernel-headers*): Add `--host` and `--build` configure flags. --- gnu/packages/base.scm | 13 ++++++------- gnu/packages/cross-base.scm | 6 +++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d2f276c447..f944ab5d47 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1423,17 +1423,15 @@ (define-public glibc/hurd-headers (native-inputs (modify-inputs (package-native-inputs glibc) (prepend (if (%current-target-system) - ;; XXX: When targeting i586-pc-gnu, we need a 32-bit MiG, - ;; hence this hack. - (package (inherit mig) - (arguments `(#:system "i686-linux"))) - mig)))) + (let* ((cross-base (resolve-interface '(gnu packages cross-base))) + (cross-mig (module-ref cross-base 'cross-mig))) + (cross-mig (%current-target-system))) + mig)))) (arguments (substitute-keyword-arguments (package-arguments glibc) ;; We just pass the flags really needed to build the headers. ((#:configure-flags flags) `(list "--enable-add-ons" - "--host=i586-pc-gnu" ,@%glibc/hurd-configure-flags)) ((#:phases _) '(modify-phases %standard-phases @@ -1448,7 +1446,8 @@ (define-public glibc/hurd-headers (close-port (open-output-file (string-append out "/include/gnu/stubs.h")))))) - (delete 'build))))))) ; nothing to build + (delete 'build))))) ; nothing to build + (supported-systems %hurd-systems))) (define-public tzdata (package diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 8d0b41180b..50e86083c3 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -492,7 +492,11 @@ (define* (cross-kernel-headers* target hurd "/include"))) (for-each (cut setenv <> cpath) ',%gcc-cross-include-paths) - #t))))))) + #t))))) + ((#:configure-flags flags) + `(cons* ,(string-append "--build=" (%current-system)) + ,(string-append "--host=" target) + ,flags)))) (propagated-inputs `(("gnumach-headers" ,xgnumach-headers) ("hurd-headers" ,xhurd-headers))) From patchwork Mon May 22 09:04:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50224 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 99D5E27BBE2; Mon, 22 May 2023 10:05:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3856B27BBEB for ; Mon, 22 May 2023 10:05:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11U7-0001sK-SE; Mon, 22 May 2023 05:05:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TT-0001aq-OU for guix-patches@gnu.org; Mon, 22 May 2023 05:05:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TT-000485-Cm for guix-patches@gnu.org; Mon, 22 May 2023 05:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TT-00077X-4O for guix-patches@gnu.org; Mon, 22 May 2023 05:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 3/8] gnu: gnumach-headers: Cross-build without relying on x86. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474626827231 (code B ref 63641); Mon, 22 May 2023 09:05:03 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:28 +0000 Received: from localhost ([127.0.0.1]:33534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11St-000759-JV for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:27 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11So-00074n-DH for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:22 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 600E6185328; Mon, 22 May 2023 09:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UqN3hY9UA0R53I8m6cJCaGO8jDOo2mBea+3Tbx4HL/8=; b=oubY/veU4GjB8pQ1n11lktPun4ULSV24JKTDsVEKNF/du9ccrzDLx6GtM7/RZBGZvZPJRN nrzxI3ckFwBAU9iSFr4tZTJeHGuhTsxjzq2GKW9OqYL9nQORaW/2nov0eV3Yso4JbYpirI U7/o1DacxTTYRwQmk3y83J9v3sQFTLes40WJbeWC4EITiCpvHfNDHJDpAhppeUvzhPi1XQ V2NLABiqLCVcgkB/k74GwXWFChpttJXk4F7WTHzTsX6jzq7t1QBeluIP/j3pTUgTmEADKE jojI/s7/comXjWTPuyMzTuXhewxExwmvu1Dk/hzUcO/Jv55g31MxdiGU2KaETA== Date: Mon, 22 May 2023 11:04:13 +0200 Message-Id: <9ce52afdf9e69355ba0011bbaba3bbeefab3fb11.1684745752.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/hurd.scm (gnumach-headers): Remove configure flags where we say the builder is running x86. * gnu/packages/cross-base.scm (cross-gnumach-headers): Work around limitation of build system, by manually changing the target host_cpu without relying on --host, because we don't have a working cross-compiler yet. --- gnu/packages/cross-base.scm | 18 ++++++++++++++++++ gnu/packages/hurd.scm | 10 ---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 50e86083c3..01c2295853 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -374,6 +374,24 @@ (define* (cross-gnumach-headers target (inherit gnumach-headers) (name (string-append (package-name gnumach-headers) "-cross-" target)) + (arguments + (substitute-keyword-arguments (package-arguments gnumach-headers) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + ;; Cheat by setting the host_cpu variable manually, since using + ;; --host= would require a working cross-compiler, which we don't + ;; have yet. + (add-after 'unpack 'substitute-host-cpu + (lambda _ + (substitute* "configure.ac" + (("AC_CANONICAL_HOST") + #$(string-append + "host_cpu=" + (match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))))))))))) (native-inputs (modify-inputs (package-native-inputs gnumach-headers) (prepend xgcc xbinutils))))) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 34c7c00f2d..a6f0f76009 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -88,16 +88,6 @@ (define-public gnumach-headers (lambda _ (invoke "make" "install-data"))) (delete 'build)) - - ;; GNU Mach supports only IA32 currently, so cheat so that we can at - ;; least install its headers. - ,@(if (%current-target-system) - '() - ;; See - ;; - '(#:configure-flags '("--build=i586-pc-gnu" - "--host=i686-linux-gnu"))) - #:tests? #f)) (native-inputs (list autoconf automake texinfo-4)) From patchwork Mon May 22 09:04:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50227 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EC3F727BBE9; Mon, 22 May 2023 10:06:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D46727BBE2 for ; Mon, 22 May 2023 10:06:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11UH-0001xw-KB; Mon, 22 May 2023 05:05:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TU-0001bB-Kd for guix-patches@gnu.org; Mon, 22 May 2023 05:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TT-0004AN-OG for guix-patches@gnu.org; Mon, 22 May 2023 05:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TT-00077e-JR for guix-patches@gnu.org; Mon, 22 May 2023 05:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 4/8] gnu: hurd: Update supported systems. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474627227267 (code B ref 63641); Mon, 22 May 2023 09:05:03 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:32 +0000 Received: from localhost ([127.0.0.1]:33544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sy-00075b-03 for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:32 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Su-00075G-Fc for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:28 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id D60591853FC; Mon, 22 May 2023 09:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HQcQeI6yXAGojPPY7KKAi2tupen5rBGwvkCdlTaxfnk=; b=D28GYT9PTX4NO7+dRifEknTtvJnGjy8J+IiuwJ2rSYLKkjVKJ7jdKdSWp6S3bzUBaRMysF d1llSOs2hlvJFggDPAlwSwj5qUYPqAjFhSWZkwn0I5oEgwI62dzLDghNTxEw/BdCvZrWgr bDhe7aSZ3y4fIJDaObNDY5butzeKLhW92xC2xMOiflQuNlIclbZiwYNXLF3XFkGWMDMRaT HXvdBikZZZ4yv9+515mUyppI1lTkV825/nCTHJy02bwDfoQoD3YwGIBukfgjWAEtAUxKZR ZPFvfuEONg3iqfGHDBMBPNpBKh6Ghuxr/Qm6scp5j/W/kMAdAWaGSG0BwHUqTQ== Date: Mon, 22 May 2023 11:04:14 +0200 Message-Id: <8387fe7ff108e8d9593666a9b0c921c3854112bb.1684745752.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal, hurd-core-headers, gnumach): Update supported systems to %hurd-systems. --- gnu/packages/hurd.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index a6f0f76009..314e2b5a3c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -91,6 +91,7 @@ (define-public gnumach-headers #:tests? #f)) (native-inputs (list autoconf automake texinfo-4)) + (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html") (synopsis "GNU Mach kernel headers") (description @@ -201,6 +202,7 @@ (define-public hurd-headers "ac_cv_func_file_futimens=no") #:tests? #f)) + (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd headers") (description @@ -236,6 +238,7 @@ (define-public hurd-minimal ;; Build libihash. (invoke "make" "-Clibihash" "libihash.a"))))))) + (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/hurd.html") (synopsis "GNU Hurd libraries") (description @@ -268,6 +271,7 @@ (define-public hurd-core-headers directories) #t)))))) (inputs (list gnumach-headers hurd-headers hurd-minimal)) + (supported-systems %hurd-systems) (synopsis "Union of the Hurd headers and libraries") (description "This package contains the union of the Mach and Hurd headers and the @@ -303,7 +307,7 @@ (define-public gnumach mig) perl texinfo-4)) - (supported-systems (cons "i686-linux" %hurd-systems)) + (supported-systems %hurd-systems) (synopsis "Microkernel of the GNU system") (description "GNU Mach is the microkernel upon which a GNU Hurd system is based."))) From patchwork Mon May 22 09:04:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50225 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D07C227BBE9; Mon, 22 May 2023 10:06:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6CA5627BBE2 for ; Mon, 22 May 2023 10:06:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11Tz-0001ig-D2; Mon, 22 May 2023 05:05:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TV-0001cZ-Jk for guix-patches@gnu.org; Mon, 22 May 2023 05:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TV-0004J5-8z for guix-patches@gnu.org; Mon, 22 May 2023 05:05:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TV-00078A-48 for guix-patches@gnu.org; Mon, 22 May 2023 05:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 5/8] gnu: Add libc-for-target and glibc/hurd. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474627627310 (code B ref 63641); Mon, 22 May 2023 09:05:05 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:36 +0000 Received: from localhost ([127.0.0.1]:33554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11T1-00076J-RN for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:36 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sv-00075O-Sf for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:34 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id B2B39185310; Mon, 22 May 2023 09:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZpshIGAUVRqKI2x1Bq0FwKrewa4fP6B931pUaNGpwfc=; b=T+564JN2viLP+V9TF4MGlaw4LwcuV21/FfaGNJu+swBapTTyRAJi7gvAUY9Q0RsBiKJ+DR QkIy+Jfl1cEUARHRwgk1rIggxo98STVBak8lREY1hHqoiFbzMLheImTw+R14Px4nL/Tzx3 /ppQYJrrt6T9v6pUOai/t6rLBlCj85q15wHcfTXgalhx8ccqpIU+cb+b+iwCKfLjyG7Rb9 qFfM1Lo9jMGdvHp6ZC3ni3PcbAo+XjEsgHlmHr6HOFHjxhDaYOIY6Qxe9JGXcl7Hl/GAh8 3B96m4vEU54SyPYZQzSSbDBnEdeCX8QsxHTywRTy4F/Tm93qNN5YzPriQrksKA== Date: Mon, 22 May 2023 11:04:15 +0200 Message-Id: <6159809904a724d5db977063feb0bb6c260063d1.1684745752.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/base.scm (glibc/hurd, libc-for-target): New variables. (glibc/hurd-headers): Use glibc/hurd. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash, glibc-final): Use libc-for-target. * gnu/packages/cross-base.scm (cross-libc/deprecated, cross-libc*): Use libc-for-target. --- gnu/packages/base.scm | 38 ++++++++++++++++++-- gnu/packages/commencement.scm | 66 +++++++++++++++++------------------ gnu/packages/cross-base.scm | 4 +-- 3 files changed, 70 insertions(+), 38 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f944ab5d47..59c9632551 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -75,6 +75,7 @@ (define-module (gnu packages base) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (glibc + libc-for-target make-ld-wrapper libiconv-if-needed)) @@ -1415,20 +1416,42 @@ (define-public which command.") (license gpl3+))) ; some files are under GPLv2+ +(define-public glibc/hurd + (package/inherit glibc + (name "glibc-hurd") + (version "2.37") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) + (sha256 + (base32 + "0hqsp4dzrjx0iga6jv0magjw26dh82pxlmk8yis5v0d127qyymr2")) + (patches (search-patches "glibc-ldd-powerpc.patch" + "glibc-2.37-ldd-x86_64.patch" + "glibc-dl-cache.patch" + "glibc-2.37-versioned-locpath.patch" + "glibc-reinstate-prlimit64-fallback.patch" + "glibc-supported-locales.patch" + "glibc-2.37-hurd-clock_t_centiseconds.patch" + "glibc-2.37-hurd-local-clock_gettime_MONOTONIC.patch" + "glibc-hurd-mach-print.patch" + "glibc-hurd-gettyent.patch")))) + (supported-systems %hurd-systems))) + (define-public glibc/hurd-headers - (package (inherit glibc) + (package/inherit glibc/hurd (name "glibc-hurd-headers") (outputs '("out")) (propagated-inputs (list gnumach-headers hurd-headers)) (native-inputs - (modify-inputs (package-native-inputs glibc) + (modify-inputs (package-native-inputs glibc/hurd) (prepend (if (%current-target-system) (let* ((cross-base (resolve-interface '(gnu packages cross-base))) (cross-mig (module-ref cross-base 'cross-mig))) (cross-mig (%current-target-system))) mig)))) (arguments - (substitute-keyword-arguments (package-arguments glibc) + (substitute-keyword-arguments (package-arguments glibc/hurd) ;; We just pass the flags really needed to build the headers. ((#:configure-flags flags) `(list "--enable-add-ons" @@ -1449,6 +1472,15 @@ (define-public glibc/hurd-headers (delete 'build))))) ; nothing to build (supported-systems %hurd-systems))) +(define* (libc-for-target #:optional + (target (or (%current-target-system) + (%current-system)))) + (match target + ((? target-hurd?) + glibc/hurd) + (_ + glibc))) + (define-public tzdata (package (name "tzdata") diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ab07fb37ab..a24c60ebf8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2816,13 +2816,13 @@ (define (%boot1-inputs) ("binutils-cross" ,binutils-boot0) ,@(alist-delete "binutils" (%boot0-inputs)))) -(define glibc-final-with-bootstrap-bash +(define/system-dependent glibc-final-with-bootstrap-bash ;; The final libc, "cross-built". If everything went well, the resulting ;; store path has no dependencies. Actually, the really-final libc is ;; built just below; the only difference is that this one uses the ;; bootstrap Bash. (package - (inherit glibc) + (inherit (libc-for-target)) (name "glibc-intermediate") (outputs (delete "debug" (package-outputs glibc))) (source (bootstrap-origin (package-source glibc))) @@ -2991,39 +2991,39 @@ (define gettext-boot0 (("^PROGRAMS =.*$") "PROGRAMS =\n"))))))))) -(define glibc-final +(define/system-dependent glibc-final ;; The final glibc, which embeds the statically-linked Bash built above. ;; Use 'package/inherit' so we get the 'replacement' of 'glibc', if any. - (package/inherit - glibc - (name "glibc") - (source (bootstrap-origin (package-source glibc))) - (inputs `(("static-bash" ,static-bash-for-glibc) - ,@(alist-delete - "static-bash" - (package-inputs glibc-final-with-bootstrap-bash)))) - - ;; This time we need 'msgfmt' to install all the libc.mo files. - (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash) - ("gettext" ,gettext-boot0))) - - (propagated-inputs - (package-propagated-inputs glibc-final-with-bootstrap-bash)) - - ;; The final libc only refers to itself, but the 'debug' output contains - ;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great - ;; if 'allowed-references' were per-output. - (arguments - `(#:allowed-references - (,(gexp-input gcc-boot0 "lib") - ,(kernel-headers-boot0) - ,static-bash-for-glibc - ,@(if (hurd-system?) - `(,gnumach-headers-boot0 - ,hurd-headers-boot0) - '()) - ,@(package-outputs glibc-final-with-bootstrap-bash)) - ,@(package-arguments glibc-final-with-bootstrap-bash))))) + (let ((libc (libc-for-target))) + (package/inherit libc + (name "glibc") + (source (bootstrap-origin (package-source glibc))) + (inputs `(("static-bash" ,static-bash-for-glibc) + ,@(alist-delete + "static-bash" + (package-inputs glibc-final-with-bootstrap-bash)))) + + ;; This time we need 'msgfmt' to install all the libc.mo files. + (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash) + ("gettext" ,gettext-boot0))) + + (propagated-inputs + (package-propagated-inputs glibc-final-with-bootstrap-bash)) + + ;; The final libc only refers to itself, but the 'debug' output contains + ;; references to GCC-BOOT0 and to the Linux headers. XXX: Would be great + ;; if 'allowed-references' were per-output. + (arguments + `(#:allowed-references + (,(gexp-input gcc-boot0 "lib") + ,(kernel-headers-boot0) + ,static-bash-for-glibc + ,@(if (hurd-system?) + `(,gnumach-headers-boot0 + ,hurd-headers-boot0) + '()) + ,@(package-outputs glibc-final-with-bootstrap-bash)) + ,@(package-arguments glibc-final-with-bootstrap-bash)))))) (define/system-dependent gcc-boot0-wrapped ;; Make the cross-tools GCC-BOOT0 and BINUTILS-BOOT0 available under the diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 01c2295853..b2823c73c5 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -577,7 +577,7 @@ (define* (cross-libc . args) (define* (cross-libc/deprecated target #:optional - (libc glibc) + (libc (libc-for-target target)) (xgcc (cross-gcc target)) (xbinutils (cross-binutils target)) (xheaders (cross-kernel-headers target))) @@ -590,7 +590,7 @@ (define* (cross-libc/deprecated target (define* (cross-libc* target #:key - (libc glibc) + (libc (libc-for-target target)) (xgcc (cross-gcc target)) (xbinutils (cross-binutils target)) (xheaders (cross-kernel-headers target))) From patchwork Mon May 22 09:04:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50223 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 083E027BBEA; Mon, 22 May 2023 10:05:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 49B6A27BBEC for ; Mon, 22 May 2023 10:05:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11U7-0001pW-N3; Mon, 22 May 2023 05:05:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TU-0001bN-NT for guix-patches@gnu.org; Mon, 22 May 2023 05:05:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TU-0004Cu-6W for guix-patches@gnu.org; Mon, 22 May 2023 05:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TT-00077m-Uz for guix-patches@gnu.org; Mon, 22 May 2023 05:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 6/8] gnu: gnumach: Update to 1.8+git20221224. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474627527288 (code B ref 63641); Mon, 22 May 2023 09:05:03 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:35 +0000 Received: from localhost ([127.0.0.1]:33548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11T0-000762-Ob for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:34 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sw-00075P-OO for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:31 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 1DAED1853FC; Mon, 22 May 2023 09:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mSYPSEOkivIzZxigct5PidTacJf1Mp/wiZoDlzUL0gA=; b=u8H1Ula3J5OJjS62VhVfmUKVryrp1E72+LBlAeJUfNcORWSXYw/mZ4+9YYujAstkiKRFJk nbjtfobCy2ZhyBTw5gU5JS/SMn9IaDbl46h1V7KGFBMxNwyCMrXwtmSiP2D9/cePzj5uN0 61Urjzrcy9lE5M8eU9CteR+6dtiRGvYxj4GeIBnkcJMgUsKN5lmbNwglNZHev/wk3iNr6I 2qaSCN00pWoNshLpe/sL+7YV4uTxQbUYSIVMHrpqQtidQ2/0a7SOS7Zz8Z5OPiKUL/Sl72 48NHBX1VhjxFhJpMCNStP7MMS8XITiPo5a+vQvgCRJYnenf3pXa7l65a3cbz4A== Date: Mon, 22 May 2023 11:04:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/hurd.scm (gnumach-headers): Update to 1.8+git20221224. --- gnu/packages/hurd.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 314e2b5a3c..d44962ae55 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -68,7 +68,7 @@ (define (hurd-source-url version) (define-public gnumach-headers (package (name "gnumach-headers") - (version "1.8+git20220827") ;; This is an upstream tag + (version "1.8+git20221224") ;; This is an upstream tag (source (origin (method git-fetch) @@ -78,8 +78,7 @@ (define-public gnumach-headers (file-name (git-file-name "gnumach" version)) (sha256 (base32 - "07qlaf8vw029y7xdnhjyiiyn788zjzwmyzj79inz7idpswqsnyhf")) - (patches (search-patches "gnumach-add-missing-const_mach_port_name_array_t-type.patch")))) + "0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs")))) (build-system gnu-build-system) (arguments `(#:phases From patchwork Mon May 22 09:04:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50226 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 891AB27BBE9; Mon, 22 May 2023 10:06:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6320A27BBE2 for ; Mon, 22 May 2023 10:06:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11UH-0001xv-KJ; Mon, 22 May 2023 05:05:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TV-0001cn-QC for guix-patches@gnu.org; Mon, 22 May 2023 05:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TU-0004Er-Gb for guix-patches@gnu.org; Mon, 22 May 2023 05:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TU-00077t-AN for guix-patches@gnu.org; Mon, 22 May 2023 05:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 7/8] gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474627527295 (code B ref 63641); Mon, 22 May 2023 09:05:04 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:35 +0000 Received: from localhost ([127.0.0.1]:33550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11T1-000764-1L for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:35 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sx-00075Z-Rz for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:32 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id E82EF18540C; Mon, 22 May 2023 09:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BJDE+n9PCg00TVHiPJ90LijYwekoZauCWgpw6EM4j9A=; b=jVyJXFiX7iZBxKAobhRxsTdot4a3a6dBN07g6OJdLhSNYLvqlcW4MRfBXJHQLt2J2POeOt N8/CaCq6Z/jZJ0uxqPsxSQ8pnFAvMpNI57vZpTZb5MI6lX+/6gJnoglLAbqYOfw7wf0ZeK 5sI0VQ73gC/tSeOuOzuH2k++3Now8KUoZapATuc7o+yTtBoEKBqv96BqOVEoI3QYkfystl /w4mbDmzSTMB44523O96wtXAEVy7zhNDRxCIPqM7ZZn3T29vGADOC8lWmcMzFX+J5ddU/U 19Mge9t5cppqjSJyUFkpJZ0hJhXvqAIlvVCzxtRnbKlQHUBMkaA9x9gU7XRzVQ== Date: Mon, 22 May 2023 11:04:17 +0200 Message-Id: <84209beabc07d273034f85ce97841519188daa1c.1684745752.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/hurd.scm (mig): Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3. --- gnu/packages/hurd.scm | 74 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index d44962ae55..61d8774075 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -98,49 +98,47 @@ (define-public gnumach-headers (license gpl2+))) (define-public mig - (package - (name "mig") - (version "1.8+git20220827") - (source (origin - (method url-fetch) - ;; XXX: Version 2.35 of glibc can only be built with an - ;; unreleased version of MiG: - ;; . - ;; It cannot be fetched from Git though, as the extra dependency - ;; on Autoconf/Automake would complicate bootstrapping. - (uri (string-append "mirror://gnu/guix/mirror/mig-" - version ".tar.gz")) - (sha256 - (base32 - "163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2")) - (patches (search-patches "mig-cpu.h-generation.patch")))) - (build-system gnu-build-system) - ;; Flex is needed both at build and run time. - (inputs (list gnumach-headers flex)) - (native-inputs (list flex bison)) - (arguments - (list #:tests? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'avoid-perl-dependency - (lambda* (#:key build inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - ;; By default 'mig' (or 'TARGET-mig') uses Perl to - ;; compute 'libexecdir_rel'. Avoid it. - (substitute* (find-files bin "mig$") - (("^libexecdir_rel=.*") - "libexecdir_rel=../libexec\n")))))))) - (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") - (synopsis "Mach 3.0 interface generator for the Hurd") - (description - "GNU MIG is the GNU distribution of the Mach 3.0 interface generator + (let ((revision "1") + (commit "04bfe7a91223ba15d868f7165e49328b1c6e86c3")) + (package + (name "mig") + (version (git-version "1.8" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/mig.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zw2w3hnz76f9602znshciqabylmvavx0h04y01qjlmhd9wh8iw5")))) + (build-system gnu-build-system) + ;; Flex is needed both at build and run time. + (inputs (list gnumach-headers flex)) + (native-inputs (list autoconf automake flex bison)) + (arguments + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'avoid-perl-dependency + (lambda* (#:key build inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + ;; By default 'mig' (or 'TARGET-mig') uses Perl to + ;; compute 'libexecdir_rel'. Avoid it. + (substitute* (find-files bin "mig$") + (("^libexecdir_rel=.*") + "libexecdir_rel=../libexec\n")))))))) + (home-page "https://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html") + (synopsis "Mach 3.0 interface generator for the Hurd") + (description + "GNU MIG is the GNU distribution of the Mach 3.0 interface generator MIG, as maintained by the GNU Hurd developers for the GNU project. You need this tool to compile the GNU Mach and GNU Hurd distributions, and to compile the GNU C library for the Hurd. Also, you will need it for other software in the GNU system that uses Mach-based inter-process communication.") - (license gpl2+))) + (license gpl2+)))) (define-public hurd-headers ;; This commit is now slightly behind 0.9.git20220818 as this one needs a From patchwork Mon May 22 09:04:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 50221 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 50F3627BBEA; Mon, 22 May 2023 10:05:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CBC6127BBE9 for ; Mon, 22 May 2023 10:05:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q11TY-0001eB-GJ; Mon, 22 May 2023 05:05:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q11TV-0001c3-6h for guix-patches@gnu.org; Mon, 22 May 2023 05:05:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q11TU-0004Hl-TJ for guix-patches@gnu.org; Mon, 22 May 2023 05:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q11TU-000782-NZ for guix-patches@gnu.org; Mon, 22 May 2023 05:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63641] [PATCH 8/8] gnu: hurd: Update to v0.9.git20230216. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 09:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63641@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 63641-submit@debbugs.gnu.org id=B63641.168474627627302 (code B ref 63641); Mon, 22 May 2023 09:05:04 +0000 Received: (at 63641) by debbugs.gnu.org; 22 May 2023 09:04:36 +0000 Received: from localhost ([127.0.0.1]:33552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11T1-00076C-Ga for submit@debbugs.gnu.org; Mon, 22 May 2023 05:04:35 -0400 Received: from jpoiret.xyz ([206.189.101.64]:39660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q11Sy-00075i-OX for 63641@debbugs.gnu.org; Mon, 22 May 2023 05:04:33 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 17B411853FC; Mon, 22 May 2023 09:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1684746272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0Txlh8Qp8Kc+U5cyfDQdGL4+fdpbtyncL0HN2G0soIU=; b=hRKqjyklieiVl6UPWISWHn0gh0RE1P+f9wrJ1LlFx9tDK1q3jt5Y6AlY5EIAAe+UhFW5tN OuPnDdaSb9sIovxev3LDs4u4iDyo3IPZH1LhqMliUYPYkH3KK17g7EIevXJOuttFDXsH1+ hXTsQ6BK2qVoPj4on7wm7KRXeKAn2IUCx4UKRgD2+tQd01RXQd+mXHsbrKa/gaizG0eIZB DYOwjwSHWjyrsa38cYy4RFD50MctMP3csb4BJ9SCwoh2zNFYufvrJ+mhC9SkAAvZSuqr9D np6O0986H9a9IaFEOxNARvKyxBNJr0PV2BUu3oC+gD92ibuh1mEJtE6nsv8VOA== Date: Mon, 22 May 2023 11:04:18 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz 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: , Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Josselin Poiret * gnu/packages/hurd.scm (hurd-headers): Update to v0.9.git20230216. --- gnu/packages/hurd.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 61d8774075..a0133482b7 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -144,10 +144,10 @@ (define-public hurd-headers ;; This commit is now slightly behind 0.9.git20220818 as this one needs a ;; newer glibc (let ((revision "2") - (commit "3ff70531ee672f431dbb0c11f286bfe85dce98fc")) + (commit "v0.9.git20230216")) (package (name "hurd-headers") - (version (git-version "0.9" revision commit)) + (version commit) (source (origin (method git-fetch) (uri (git-reference @@ -155,11 +155,8 @@ (define-public hurd-headers (commit commit))) (sha256 (base32 - "1jb9f2h2v4lf6acsji1c12aqg3pixkvjdyb4q6axkd8jp22fdgc0")) - (file-name (git-file-name name version)) - (patches (search-patches "hurd-add-without-rump-configure-option.patch" - "hurd-fix-types-of-read-write-and-readables-methods.patch" - "hurd-fix-types-of-read-write-and-readables-methods-2.patch")))) + "0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -196,7 +193,8 @@ (define-public hurd-headers "ac_cv_func_exec_exec_paths=no" "ac_cv_func__hurd_exec_paths=no" "ac_cv_func__hurd_libc_proc_init=no" - "ac_cv_func_file_futimens=no") + "ac_cv_func_file_futimens=no" + "ac_cv_lib_acpica_acpi_init=no") #:tests? #f)) (supported-systems %hurd-systems)