From patchwork Tue Nov 12 16:25:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70284 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 8AD0D27BBEA; Tue, 12 Nov 2024 16:29:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 EF32627BBE2 for ; Tue, 12 Nov 2024 16:29:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtlM-00039b-CO; Tue, 12 Nov 2024 11:29:08 -0500 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 1tAtlJ-00038n-KN for guix-patches@gnu.org; Tue, 12 Nov 2024 11:29:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtlJ-0005cK-B2; Tue, 12 Nov 2024 11:29:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QJPMtd8aAOkFD4VxDmYDXqQcnOvfHBrwXS4dXGMagZY=; b=D7Ecw2WeXCl+wrKdo0katt/FfuMkCgFWN0YHFJUJ3qcqe00oX65WsjA3+7PxYlKSD/VejCUWkwXWS4RmWlMbNqCJ0kbJ42XCNNhPBEuVJcNQCavGCvHjoDdHsKP8mv+y8yAhGEMFuHy++TyieA8zC7VpNUgt2hfdO2YOjwSAvNbhE4uwIYh2JOmU4iWNQ8G0SnqzUTT/lvxYpMWbmi6eq1wMcRxjfOT8T0iyC8/xWx0Agd7RosmFTpqOy/XEketxKOcSFXiogGjI3hMPXAKxcLeV8RbTZbrhhny4qKOF/q23yfjksuqnz7UDRSynr+LfYV7C/j98XCCyxVVuZaCgwg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtlG-0000FD-SI; Tue, 12 Nov 2024 11:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 01/40] gnu: gnumach: Update to v1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.1731428908872 (code B ref 74290); Tue, 12 Nov 2024 16:29:02 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:28:28 +0000 Received: from localhost ([127.0.0.1]:39031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtki-0000E0-18 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:28:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtke-0000DZ-2C for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:28:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtiT-0005Hk-Cp; Tue, 12 Nov 2024 11:26:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=QJPMtd8aAOkFD4VxDmYDXqQcnOvfHBrwXS4dXGMagZY=; b=Nn7/TOQVidsL9Ahc+Uvf YYLod0LffqmQgeZVZlGcKCqFx1OO+dgCtTzgX67FP3lOZKl/KjWKJpp08y56RohH2updTvhHIo3rQ fmh8O+aChiy3zbCegRKD4ImvETzYaKCpmeq8CN4RoRz/o8sWQaOdTFl3R8RKCPmVvxqQn+G9L5K7k E35yhZEzgq++azwft7q4AzXACIP4mnvFAoFyT2LmEeD2qcwbHqw94fGxnlcL7BH+NQxm/gkGeHHJ+ QsFJdGQ/FeuMljo+5ZLk2ofIAqdIfgL3RKW177ylkcK2co9GUAsHm8+BX+UTUQ5/dgju9CchsujIV jeBQ9R6PAf6pfA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:10 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/gnumach-version.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (gnumach-headers): Update to v1.8+git20240714 and use it. * gnu/packages/commencement.scm (gnumach-headers-boot0)[origin]: Reset patches. Change-Id: I147c64021c2ee79dfc4cd4fd9a29529eef8890c5 --- gnu/local.mk | 1 + gnu/packages/commencement.scm | 1 + gnu/packages/hurd.scm | 9 ++++----- gnu/packages/patches/gnumach-version.patch | 23 ++++++++++++++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1f48fddc9e..2bd857e7ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1460,6 +1460,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnulib-bootstrap.patch \ + %D%/packages/patches/gnumach-version.patch \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnupg-1-build-with-gcc10.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ce40f0cea6..1cfaaae1e7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2639,6 +2639,7 @@ (define gnumach-headers-boot0 (source (origin (inherit (package-source gnumach-headers)) + (patches '()) (method (git-fetch-from-tarball (origin diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 9c1681f236..a22d0cadce 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -57,21 +57,20 @@ (define (hurd-source-url version) version ".tar.gz")) (define-public gnumach-headers - (let ((revision "0") - (commit "2556fdece900d67529d5eda01f1bdaae4ffe96b0")) + (let ((commit "v1.8+git20240714")) (package (name "gnumach-headers") - (version (git-version "1.8" revision commit)) + (version (string-drop commit 1)) (source (origin (method git-fetch) (uri (git-reference (url "https://git.savannah.gnu.org/git/hurd/gnumach.git") (commit commit))) + (patches (search-patches "gnumach-version.patch")) (file-name (git-file-name "gnumach" version)) (sha256 - (base32 - "1lzsbix0l4jhab38pvwnmk7ip1lsn7m5smhnrciqajsqnadsnlzs")))) + (base32 "0ykav1kx0bgxcxw04bpcsh5s4531fzdkahjgrlsfs2h3w3vfkga0")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/gnumach-version.patch b/gnu/packages/patches/gnumach-version.patch new file mode 100644 index 0000000000..aec3c86a16 --- /dev/null +++ b/gnu/packages/patches/gnumach-version.patch @@ -0,0 +1,23 @@ +Upstream-status: Taken from Debian upstream: + + +Index: gnumach/configure.ac +=================================================================== +--- gnumach.orig/configure.ac ++++ gnumach/configure.ac +@@ -19,6 +19,7 @@ AC_PREREQ([2.57]) + m4_include([version.m4]) + AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT], + [AC_PACKAGE_TARNAME]) ++AC_SUBST([PACKAGE_VERSION_SUFFIX]) + AC_CONFIG_SRCDIR([kern/ipc_kobject.c]) + + if test -z "${CFLAGS+set}"; then +Index: gnumach/version.c.in +=================================================================== +--- gnumach.orig/version.c.in ++++ gnumach/version.c.in +@@ -1,2 +1,2 @@ + /* @configure_input@ */ +-const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@"; ++const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@@PACKAGE_VERSION_SUFFIX@"; From patchwork Tue Nov 12 16:25:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70285 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 7F6C827BBEA; Tue, 12 Nov 2024 16:30:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 47D9427BBE2 for ; Tue, 12 Nov 2024 16:30:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmG-0003O0-CZ; Tue, 12 Nov 2024 11:30:04 -0500 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 1tAtmF-0003N2-7t for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmE-0005mI-UJ for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=tm1iGKQ/2ZZuwBK2NEVKrbQO+OmudYcojk19hQ5x8U8=; b=ew15s876oG2ffwq2qIHj7+IaGNPVeG4PUFbkvl1zkiLYjzcVJruIaVQoQmTa7zQH63TYh2TuCEfO/vIgEqqIGVHlFOa4Tb8+xP1JYU17n02CsfoFTEgXchV45e+dNu77CyHGR0anLopQqqn+CP13yJNaGRGdhxygmk2FRBGiaFpgi/2SlTeMmT41ZYmrdzssqFTyQs+2+hL3082SALFjhdVmM2fp1umYzJcAI6azZW3PUSOUgC9DdZFdD8geaCA7zuq4sUzRP3zvMEa8SuAgMYZzu4Sev/rlsFsqWVLnKgxtTjwPdiQaCU7pHvD2xlg6AbmxSIJ/gR2Y8Et4FUjImA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmE-0000OS-Ju for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 02/40] gnu: mig: Update to 1.8+git20231217. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.1731428943953 (code B ref 74290); Tue, 12 Nov 2024 16:30:02 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:03 +0000 Received: from localhost ([127.0.0.1]:39036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlG-0000FC-OR for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlE-0000Ej-UA for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:01 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtj3-0005Jj-2H; Tue, 12 Nov 2024 11:26:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=tm1iGKQ/2ZZuwBK2NEVKrbQO+OmudYcojk19hQ5x8U8=; b=nxAZ/fqfY1Z+A5tXI+WI Xv47dxEnZ+SCWf+dg0CHNHA+9lKuUcPX3EodOSQlpAnX5m8A1TOravgNEEK38H9aFI3GMc0xTZ3jl UZbdz33BDC2xMjKk2zxScxpXCq41iyNBkwk7CXLfcT94Y3rCAWnm1FErqLAVLmjGHGlwNLzPKiOPA M9+jl4NrzLKzUKPPtpH34/C0IsmxRI3NWRVhVjVQaXqXxtYfUK6HxI9i6m0/LjDzYLOwV1Isfs49x W7luaPge4ib3IiJ9bxNoVqmTYeMNY4KqwEtOSaGApNC6t4Ef1dutgcsFMKLELJ8aEF49nNIBv5qqD WTEj6kB1FQ9HKw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:11 +0100 Message-ID: <216c0ef048600378b213add34715705e2c728363.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hurd.scm (mig): Update to 1.8+git20231217. Change-Id: I0e531ecc7fdcfbefe2e0e24d7b2fb5e0fe8a3ae2 --- gnu/packages/hurd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index a22d0cadce..28f39cc448 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -92,7 +92,7 @@ (define-public gnumach-headers (define-public mig (package (name "mig") - (version "1.8+git20230520") + (version "1.8+git20231217") (source (origin (method git-fetch) (uri (git-reference @@ -101,7 +101,7 @@ (define-public mig (file-name (git-file-name name version)) (sha256 (base32 - "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz")))) + "1mx7w5vzw5ws0zplm1y6s679jb1g2hjkiwl3dlk5lxys0dxs5g4g")))) (build-system gnu-build-system) ;; Flex is needed both at build and run time. (inputs (list gnumach-headers flex)) From patchwork Tue Nov 12 16:25:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70288 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 D010127BBEA; Tue, 12 Nov 2024 16:30:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7240F27BBE2 for ; Tue, 12 Nov 2024 16:30:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmH-0003T5-Ta; Tue, 12 Nov 2024 11:30:05 -0500 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 1tAtmG-0003O3-CD for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmG-0005rf-2Z for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=8LFHZpZcjLjaAjS0I/16HGtQeIfLQFNJAfIVuhFJKxs=; b=mvwnRtRlonPzoO/RzA5S2x8Zy/IfVqwEK4hMuDTUZopuWWQaQW6ItOR0lrDf/6omGSKQttvimlY0bwhpyVSZU+3fII+L+Zor6oYJCjUENrU+N/Mc1hZy9SNcl83u8jr/U9S5hLZ5NHv1r+XfiJcmLHG80LmpuAgV/TLhUoLoDe/9ltHrkUSlXP5hDM1NM+Lw1bt9Ril2jRnkOF6kDbgRDmBdPWfT995oRxSQ7Gjrw4tiF3jtoZPmUKMCGAFABJayPecU36ciRISBIGgFSVnh1mpUHeEHBWDLggHrdpNaKgu17Ji8TSpfRY1I1U0ST/7VofzSoFczLaivQaXISlpQaA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmF-0000P6-Rb for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 03/40] gnu: hurd: Update to 0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.1731428948999 (code B ref 74290); Tue, 12 Nov 2024 16:30:03 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:08 +0000 Received: from localhost ([127.0.0.1]:39045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlL-0000Fz-8Z for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlG-0000Eo-Vl for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:03 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtj4-0005Jx-Sa; Tue, 12 Nov 2024 11:26:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=8LFHZpZcjLjaAjS0I/16HGtQeIfLQFNJAfIVuhFJKxs=; b=lNIah1yUNq9tqbpIH0bq qfKD66qauiaDxaCsvKBnqks+pB/204zav8UwUHIXp6x3hUyVrTBTs/iOxR4mo6LmHvv65q8ixAi4t Jf7Q/emGvF0lE6056iav9MM7yPejvMtZsfx1Sy2n5f8BJhCzkv+oSJq8NOnyVdQHZBNEH4ErNLcd0 51uUJYt5y56CT0cWtXwKf6vh51kCOLd7mr2Hf7TGiDRUGUgi4JEejfBHBMmrMTuuWvuymmpsy7Hjx 7bKIiWmSSEVonpx05HZLkGQBhz2rxPSaJgNqPF2MwIF6X+XHXUmY6jRyglq0pvANGCYgUkq88KADY dQlQ8hNxH3KF3w==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:12 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hurd.scm (hurd-headers): Update to 0.9.git20240714. (hurd)[arguments]: Remove rumpdisk build hack from "prepare-addons" stage. Instead, when cross-compiling, add stage "fixup-cross-configure" to enable rumpdisk. * gnu/system.scm (hurd-multiboot-modules): Remove "--x-xattr-translator-records" option that has been removed and is now the default. Change-Id: I4609b5a959c1ece98e2fe1aedbb1d31d6edadcca --- gnu/packages/hurd.scm | 12 +++++++++--- gnu/system.scm | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 28f39cc448..06fae1bd3b 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -132,7 +132,7 @@ (define-public mig (define-public hurd-headers (let ((revision "3") - (commit "v0.9.git20231217")) + (commit "v0.9.git20240714")) (package (name "hurd-headers") (version (string-drop commit 1)) @@ -143,7 +143,7 @@ (define-public hurd-headers (commit commit))) (sha256 (base32 - "1d138kzhil6s5gf9di8grpz1iziakyfv037wkc8s7qyd61imm31d")) + "0wvzil3llmrjg7ymwqs86d11bm5fl771jwncv7kk679lsvqca0ll")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -336,7 +336,7 @@ (define-public hurd ;; Makefile. libdde_linux26 is built later in its own phase. (substitute* "Makefile" (("libbpf ") - "libbpf libmachdevdde libddekit rumpdisk")))) + "libbpf libmachdevdde libddekit ")))) (add-after 'unpack 'find-tirpc (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (var) @@ -362,6 +362,12 @@ (define-public hurd (("#include " m) (string-append "#include \n#include \n" m))) #t)) + ,@(if (%current-target-system) + '((add-after 'configure 'fixup-cross-configure + (lambda _ + (substitute* "config.make" + (("HAVE_LIBRUMP = no") "HAVE_LIBRUMP = yes"))))) + '()) (add-before 'build 'pre-build (lambda _ ;; Don't change the ownership of any file at this time. diff --git a/gnu/system.scm b/gnu/system.scm index 074cd04a0e..dfcb8fb279 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1539,7 +1539,6 @@ (define (hurd-multiboot-modules os) "--multiboot-command-line='${kernel-command-line}'" "--exec-server-task='${exec-task}'" "--store-type=typed" - "--x-xattr-translator-records" "'${root}'" "'$(fs-task=task-create)'")) (target (%current-target-system)) From patchwork Tue Nov 12 16:25:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70310 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 0A4D627BBEC; Tue, 12 Nov 2024 16:31:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2625627BBE2 for ; Tue, 12 Nov 2024 16:31:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmN-0003gz-RM; Tue, 12 Nov 2024 11:30:11 -0500 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 1tAtmK-0003aa-TI for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmK-0005sl-Jh; Tue, 12 Nov 2024 11:30:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=lNpp8unVC1S4xA8SGX38DNcZ2TU0KgaeWMPoa+jQXxI=; b=TRI4iu2AMZupyIp3is8278Xx55CSTvJvYVDAGlS9tog+hTNeHeGLytMO1mTmJf0iw1iBZBzEYDqx21spvJE7psF+nocEqNwS8J38OTs/1e8fPr15WC1zWTTByDanZGllAk3PHF3N0g/mDbtugIDtBCtj2Ke3ZZ3L8sjaEuGTDErhcxMbfsE6E8bysIrIQ2H8jnZS1PVWxCvTtmh/nwjwGrsXD6zhVxCS5l/9hFnFczdlV2gDWCogpW6SQwKfoSemKVM+0iSLlODSNey7EBPF7ajnLfz5g6hJc2n1dMbUEkFa4yl16Wixs8bvKS0UVhnaAsIv9W30FhJAw2sVQEF87g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmH-0000Qe-Q6; Tue, 12 Nov 2024 11:30:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 04/40] gnu: gcc: Add indirections current-gcc, current-gcc-toolchain. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, glv@posteo.net, cox.katherine.e+guix@gmail.com, ludo@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, zimon.toutoune@gmail.com, vagrant@debian.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Guillaume Le Vaillant , Katherine Cox-Buday , Ludovic =?utf-8?q?Cou?= =?utf-8?q?rt=C3=A8s?= , Munyoki Kilyungi , Sharlatan Hellseher , Simon Tournier , Vagrant Cascadian , jgart X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Guillaume Le Vaillant , Katherine Cox-Buday , Ludovic =?utf-8?q?Cou?= =?utf-8?q?rt=C3=A8s?= , Munyoki Kilyungi , Sharlatan Hellseher , Simon Tournier , Vagrant Cascadian , jgart Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289601101 (code B ref 74290); Tue, 12 Nov 2024 16:30:05 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:20 +0000 Received: from localhost ([127.0.0.1]:39067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlW-0000HH-0K for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlN-0000Fo-4L for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:13 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjC-0005KP-18; Tue, 12 Nov 2024 11:26:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=lNpp8unVC1S4xA8SGX38DNcZ2TU0KgaeWMPoa+jQXxI=; b=p269hebtf/g7pgqxjRXr AJlqcisHZf9RyzsiyOGgBL0l3K8OIsH8odmgsdpLVKj1R3xQSpoE7RwhBxII2mmT1JjZUROAWUEtq bYjkFyZrMSL6zyfLklTBLyFDWN+kDE83i0rGWHlhV0SQbhi5kc6UsYgyzXAubsbpBKbvBaKcMTeXd 1yJ7PSf3010q+AUrCinSfACpg5rPSzK566VdMr9ptEBnfr4Xn+eOkhgyY+nG4ckRG+UHXm0Bl2dmA ZK9E2NFjcQaMyKSW4yfTY4pPf6diHmEGpXqhIL1BVH6DMsiNQ2w59kco99Z0/n0vJQseJHYfyvNHF ZBLJGKQh0TEYEA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:13 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Throughout: use (current-gcc) and (current-gcc-toolchain) instead of gcc and gcc-toolchain. * gnu/packages/gcc.scm (current-gcc): New procedure. (gcc): Deprecate. * gnu/packages/commencement.scm (current-gcc-toolchain): New procedure. (gcc-toolchain): Deprecate. Change-Id: I538897e53e2c9956abdc53c67621bb52cbd78a50 --- gnu/packages/avr.scm | 7 ++++--- gnu/packages/benchmark.scm | 6 ++++-- gnu/packages/bootloaders.scm | 2 +- gnu/packages/bootstrap.scm | 4 ++-- gnu/packages/c.scm | 4 ++-- gnu/packages/chicken.scm | 7 ++++--- gnu/packages/commencement.scm | 33 +++++++++++++++++++-------------- gnu/packages/containers.scm | 5 +++-- gnu/packages/cross-base.scm | 4 ++-- gnu/packages/dlang.scm | 3 ++- gnu/packages/engineering.scm | 4 ++-- gnu/packages/gawk.scm | 3 ++- gnu/packages/gcc.scm | 21 ++++++++++++++------- gnu/packages/golang.scm | 3 ++- gnu/packages/julia-xyz.scm | 3 ++- gnu/packages/lisp.scm | 3 ++- gnu/packages/llvm.scm | 7 ++++--- gnu/packages/make-bootstrap.scm | 20 ++++++++++---------- gnu/packages/mpi.scm | 3 ++- gnu/packages/parallel.scm | 5 +++-- gnu/packages/rocm.scm | 3 ++- 21 files changed, 88 insertions(+), 62 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 6042c1bd55..00dc124aa9 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,7 +54,7 @@ (define make-avr-binutils (inherit (cross-binutils "avr")) (name "avr-binutils")))) -(define* (make-avr-gcc/implementation #:key (xgcc gcc)) +(define* (make-avr-gcc/implementation #:key (xgcc (current-gcc))) "Return a XGCC-base cross-compiler for the AVR target." (let ((xgcc (cross-gcc "avr" #:xgcc xgcc #:xbinutils (make-avr-binutils)))) (package @@ -96,7 +97,7 @@ (define* (make-avr-gcc/implementation #:key (xgcc gcc)) (variable "CROSS_LIBRARY_PATH") (files '("avr/lib"))))) (native-inputs - `(("gcc" ,gcc) + `(("gcc" ,(current-gcc)) ,@(package-native-inputs xgcc)))))) (define make-avr-gcc @@ -136,7 +137,7 @@ (define* (make-avr-libc/implementation #:key (define make-avr-libc (memoize make-avr-libc/implementation)) -(define* (make-avr-toolchain/implementation #:key (xgcc gcc)) +(define* (make-avr-toolchain/implementation #:key (xgcc (current-gcc))) (let ((avr-binutils (make-avr-binutils)) (avr-libc (make-avr-libc #:xgcc (cross-gcc "avr" #:xgcc xgcc))) (avr-gcc (make-avr-gcc #:xgcc xgcc))) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 326bbc99b4..c802e105ed 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Arun Isaac ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2024 Nicolas Graves +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,8 +76,8 @@ (define-module (gnu packages benchmark) ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. (define gcc-toolchain* - (delay (module-ref (resolve-interface '(gnu packages commencement)) - 'gcc-toolchain))) + (delay ((module-ref (resolve-interface '(gnu packages commencement)) + 'current-gcc-toolchain)))) (define-public fio (package @@ -379,6 +380,7 @@ (define-public phoronix-test-suite (list bash coreutils (force gcc-toolchain*) + gcc-toolchain* gnu-make gzip php diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 52a077ecea..e188553910 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1710,7 +1710,7 @@ (define u-boot-ts-mx6 (add-before 'build 'adjust-for-current-gcc (lambda _ (let ((gcc-major-version #$(version-major - (package-version gcc)))) + (package-version (current-gcc))))) (copy-file "include/linux/compiler-gcc6.h" (string-append "include/linux/compiler-gcc" gcc-major-version ".h"))) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3743abf9fe..c4640b62e1 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012-2020, 2024 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018, 2019 Mark H Weaver ;;; Copyright © 2017, 2020, 2024 Efraim Flashner -;;; Copyright © 2018, 2020, 2022 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2020, 2022, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2019 Léo Le Bouter ;;; Copyright © 2020 Jakub Kądziołka @@ -311,7 +311,7 @@ (define* (glibc-dynamic-linker gnu-triplet->nix-system) (%current-system)))) "Return the name of Glibc's dynamic linker for SYSTEM." - ;; See the 'SYSDEP_KNOWN_INTERPRETER_NAMES' cpp macro in libc. + ;; See the appropriate 'shlib-versions' file in libc. (let ((platform (false-if-platform-not-found (lookup-platform-by-system system)))) (cond diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 13fdb99424..f52a7c603e 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019, 2020, 2022-2024 Efraim Flashner ;;; Copyright © 2019, 2021 Guillaume Le Vaillant ;;; Copyright © 2019 Andreas Enge -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer @@ -178,7 +178,7 @@ (define-public cproc (string-append "--with-ld=" #$(ld-for-target)) (string-append "--with-gcc-libdir=" gcc-lib)))))))) (inputs `(("qbe" ,qbe) - ("gcc:lib" ,gcc "lib"))) + ("gcc:lib" ,(current-gcc) "lib"))) (supported-systems (list "x86_64-linux" "aarch64-linux")) (synopsis "Simple C11 compiler backed by QBE") (description "@code{cproc} is a C compiler using QBE as a backend, diff --git a/gnu/packages/chicken.scm b/gnu/packages/chicken.scm index a499c5d9ee..02674577ed 100644 --- a/gnu/packages/chicken.scm +++ b/gnu/packages/chicken.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Ekaitz Zarraga ;;; Copyright © 2020 Evan Hanson ;;; Copyright © 2020 raingloom +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,9 +70,9 @@ (define-public chicken (files (list "var/lib/chicken/11"))))) ;; Reference gcc-toolchain lazily to avoid circular module dependency ;; problems. - (propagated-inputs (list (module-ref (resolve-interface - '(gnu packages commencement)) - 'gcc-toolchain))) + (propagated-inputs (list ((module-ref (resolve-interface + '(gnu packages commencement)) + 'current-gcc-toolchain)))) (home-page "https://www.call-cc.org/") (synopsis "R5RS Scheme implementation that compiles native code via C") (description diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 1cfaaae1e7..70641267a8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -73,7 +73,8 @@ (define-module (gnu packages commencement) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 vlist) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:export (current-gcc-toolchain)) ;;; Commentary: ;;; @@ -908,7 +909,7 @@ (define gcc-core-mesboot0 ;; with gcc-2.95.3, binutils (2.14.0, 2.20.1a) and glibc-2.2.5 we found a ;; GNU toolchain triplet "that works". (package - (inherit gcc) + (inherit (current-gcc)) (name "gcc-core-mesboot0") (version "2.95.3") (source (origin @@ -2319,19 +2320,19 @@ (define libstdc++-boot0-gcc7 (define gcc-boot0 (package - (inherit gcc) + (inherit (current-gcc)) (name "gcc-cross-boot0") - (outputs (delete "debug" (package-outputs gcc))) + (outputs (delete "debug" (package-outputs (current-gcc)))) (source (bootstrap-origin (origin - (inherit (package-source gcc)) + (inherit (package-source (current-gcc))) (snippet #~(begin ;; XXX: The GCC test suite contains files with non-ASCII file ;; names, which cannot be repacked by BOOTSTRAP-ORIGIN. Nor ;; can it be deleted from Guile, so resort to this evil hack. - #$(origin-snippet (package-source gcc)) + #$(origin-snippet (package-source (current-gcc))) (system* #$(file-append (let-system system ;; 'coreutils-boot0' is Linux-only. (if (target-hurd? system) @@ -2348,7 +2349,7 @@ (define gcc-boot0 (ice-9 regex) (srfi srfi-1) (srfi srfi-26)) - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments (current-gcc)) ((#:configure-flags flags) #~(append (list #$(string-append "--target=" (boot-triplet)) @@ -2436,7 +2437,7 @@ (define gcc-boot0 (with-directory-excursion (string-append out "/lib/gcc/" #$(boot-triplet) - "/" #$(package-version gcc)) + "/" #$(package-version (current-gcc))) (symlink "libgcc.a" "libgcc_eh.a")))))))))) (inputs `(("gmp-source" ,(bootstrap-origin (package-source gmp-6.0))) @@ -2952,7 +2953,7 @@ (define/system-dependent glibc-final-with-bootstrap-bash (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC that makes it available under the native tool names." - (package (inherit gcc) + (package (inherit (current-gcc)) (name (string-append (package-name gcc) "-wrapped")) (source #f) (build-system trivial-build-system) @@ -3219,7 +3220,7 @@ (define gcc-final (srfi srfi-26) ,@%default-gnu-modules) - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments (current-gcc)) ((#:make-flags flags) ;; Since $LIBRARY_PATH is not honored, add the relevant flags. #~(let ((zlib (assoc-ref %build-inputs "zlib"))) @@ -3542,8 +3543,8 @@ (define* (make-gcc-toolchain gcc (let ((gcc (if libc (make-gcc-libc gcc libc) gcc)) (libc (if libc libc glibc-final))) (package - (name (string-append (package-name gcc) "-toolchain")) - (version (package-version gcc)) + (name (string-append (package-name (current-gcc)) "-toolchain")) + (version (package-version (current-gcc))) (source #f) (build-system trivial-build-system) (arguments @@ -3640,13 +3641,17 @@ (define-public gcc-toolchain-14 (make-gcc-toolchain gcc-14)) ;; The default GCC -(define-public gcc-toolchain +(define (current-gcc-toolchain) + "The current default gcc-toolchain version." gcc-toolchain-11) +(define-public gcc-toolchain + (deprecated-package "gcc-toolchain" gcc-toolchain-11)) + (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package ;; automatically "redirects" them to 'gcc-toolchain'. - (deprecated-package "gcc" gcc-toolchain)) + (deprecated-package "gcc" (current-gcc-toolchain))) (define-public gdc-toolchain-10 diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index adae2f5bfc..80b9c6e03d 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Foundation Devices, Inc. ;;; Copyright © 2024 Jean-Pierre De Jesus DIAZ +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -533,7 +534,7 @@ (define-public podman (,(string-append #$catatonit "/bin") ,(string-append #$conmon "/bin") ,(string-append #$crun "/bin") - ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$(current-gcc) "/bin") ; cpp ,(string-append #$iptables "/sbin") ,(string-append #$passt "/bin") ,(string-append #$procps "/bin") ; ps @@ -667,7 +668,7 @@ (define-public buildah (,(string-append #$output "/_guix"))) `("PATH" suffix (,(string-append #$crun "/bin") - ,(string-append #$gcc "/bin") ; cpp + ,(string-append #$(current-gcc) "/bin") ; cpp ,(string-append #$passt "/bin") "/run/privileged/bin"))))) (add-after 'install 'install-completions diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index cecc21083e..9c701efae8 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013-2018, 2020, 2023-2024 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver -;;; Copyright © 2016, 2019, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2019, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Marius Bakke @@ -61,7 +61,7 @@ (define-syntax %xgcc ;; ;; Note: This is a macro so that we do not refer to 'gcc' from the top ;; level, which would lead to circular-dependency issues. - (identifier-syntax gcc)) + (identifier-syntax (current-gcc))) (define %gcc-include-paths ;; Environment variables for header search paths. diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 8bf0ee685e..654d5b2281 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2021, 2024 Maxim Cournoyer ;;; Copyright © 2022 ( ;;; Copyright © 2022 Esther Flashner +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -426,7 +427,7 @@ (define dmd-bootstrap (build-system gnu-build-system) (arguments (list - #:disallowed-references (list (gexp-input (canonical-package gcc) + #:disallowed-references (list (gexp-input (canonical-package (current-gcc)) "lib")) ;; Disable tests, as gdmd cannot cope with some arguments used such as ;; '-conf'. diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3ceeb4425a..5abca92ebf 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2340,8 +2340,8 @@ (define-public freehdl coreutils ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. - (module-ref (resolve-interface '(gnu packages commencement)) - 'gcc-toolchain) + ((module-ref (resolve-interface '(gnu packages commencement)) + 'current-gcc-toolchain)) guile-2.2 perl diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 6a77a692f5..a8b8369d7b 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018, 2022-2024 Efraim Flashner ;;; Copyright © 2021, 2022 Marius Bakke ;;; Copyright © 2022 Paul A. Patience +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ (define-public cppawk (inputs (list coreutils ; For dirname, mktemp, printf, rm gawk-mpfr ; Default variant, but supports others - gcc ; For cpp + (current-gcc) ; For cpp sed)) (home-page "https://www.kylheku.com/cgit/cppawk/") (synopsis "Wrapper script that adds C preprocessing to Awk") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c9e475b676..3b5d05b9a9 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2023 Bruno Victal ;;; Copyright © 2023 Maxim Cournoyer ;;; Copyright © 2024 Nguyễn Gia Phong +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,8 @@ (define-module (gnu packages gcc) #:use-module (guix utils) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:use-module (ice-9 regex)) + #:use-module (ice-9 regex) + #:export (current-gcc)) (define %gcc-infrastructure ;; Base URL for GCC's infrastructure. @@ -857,7 +859,12 @@ (define-public gcc-14 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-11) +(define (current-gcc) + "The current default gcc version." + gcc-11) + +(define-public gcc + (deprecated-package "gcc" gcc-11)) ;;; @@ -868,7 +875,7 @@ (define-public gcc-2.95 ;; Note: 'gcc-core-mesboot0' in commencement.scm provides 2.95 as well, but ;; with additional tricks to support compilation with TinyCC and Mes-libc. (package - (inherit gcc) + (inherit (current-gcc)) (version "2.95.3") (source (origin (method url-fetch) @@ -1045,7 +1052,7 @@ (define-public (make-libstdc++ gcc) (define libstdc++ ;; Libstdc++ matching the default GCC. - (make-libstdc++ gcc)) + (make-libstdc++ (current-gcc))) (define libstdc++-headers ;; XXX: This package is for internal use to work around @@ -1100,7 +1107,7 @@ (define (make-libiberty gcc) (synopsis "Collection of subroutines used by various GNU programs"))) (define-public libiberty - (make-libiberty gcc)) + (make-libiberty (current-gcc))) (define* (custom-gcc gcc name languages #:optional @@ -1157,7 +1164,7 @@ (define-public gfortran-13 (define-public gfortran (hidden-package - (custom-gcc gcc + (custom-gcc (current-gcc) "gfortran" '("fortran") %generic-search-paths))) @@ -1186,7 +1193,7 @@ (define-public gdc-11 ;;; Alias tracking the latest GDC version. (define-public gdc (hidden-package - (custom-gcc gcc "gdc" '("d") + (custom-gcc (current-gcc) "gdc" '("d") %generic-search-paths))) (define-public (make-libgccjit gcc) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 894e878cf2..244e85f17c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2024 Greg Hogan ;;; Copyright © 2024 Brennan Vincent ;;; Copyright © 2024 André Batista +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -253,7 +254,7 @@ (define-public go-1.4 (inputs `(("tzdata" ,tzdata) ("pcre" ,pcre) - ("gcc:lib" ,(canonical-package gcc) "lib"))) + ("gcc:lib" ,(canonical-package (current-gcc)) "lib"))) (native-inputs (list pkg-config which net-base perl)) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 77385ee6e0..3860da608e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 jgart ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2024 Spencer King +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -5170,7 +5171,7 @@ (define-public julia-quadmath (propagated-inputs (list julia-requires)) (inputs - `(("gcc:lib" ,gcc "lib"))) + `(("gcc:lib" ,(current-gcc) "lib"))) (native-inputs (list julia-specialfunctions)) (home-page "https://github.com/JuliaMath/Quadmath.jl") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6c16d8ab71..8dc3208327 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2024 Andreas Enge ;;; Copyright © 2024 bigbug ;;; Copyright © 2024 Ashish SHUKLA +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -388,7 +389,7 @@ (define-public clasp-cl (base32 "10jjhcid6qp64gx29iyy5rqqijwy8hrvx66f0xabdj8w3007ky39")))) (build-system gnu-build-system) (inputs - (list boost clang-15 fmt `(,gcc "lib") gmp libelf libunwind llvm-15)) + (list boost clang-15 fmt `(,(current-gcc) "lib") gmp libelf libunwind llvm-15)) (native-inputs (list binutils-gold ninja pkg-config sbcl)) (arguments diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c6566a3339..1d4a7f5277 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2023 Hilton Chain ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,8 +90,8 @@ (define-module (gnu packages llvm) ;; Lazily resolve the gcc-toolchain to avoid a circular dependency. (define gcc-toolchain* - (delay (module-ref (resolve-interface '(gnu packages commencement)) - 'gcc-toolchain))) + (delay ((module-ref (resolve-interface '(gnu packages commencement)) + 'current-gcc-toolchain)))) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -250,7 +251,7 @@ (define* (clang-from-llvm llvm clang-runtime (native-inputs (package-native-inputs llvm)) (inputs `(("libxml2" ,libxml2) - ("gcc-lib" ,gcc "lib") + ("gcc-lib" ,(current-gcc) "lib") ,@(package-inputs llvm) ,@(if tools-extra `(("clang-tools-extra" ,tools-extra)) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index edc536bff4..c6293b9a38 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2021 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Mark H Weaver -;;; Copyright © 2018, 2019, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2021 Pierre Langlois @@ -108,13 +108,13 @@ (define gcc-for-bootstrap (mlambdaq (glibc) "Return a variant of GCC that uses the bootstrap variant of GLIBC." (package - (inherit gcc) + (inherit (current-gcc)) (outputs '("out")) ;all in one so libgcc_s is easily found (inputs `( ;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") - ,@(package-inputs gcc)))))) + ,@(package-inputs (current-gcc))))))) (define (package-with-relocatable-glibc p) "Return a variant of P that uses the libc as defined by @@ -153,7 +153,7 @@ (define (package-with-relocatable-glibc p) (cons (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) - (package-search-paths gcc))))) + (package-search-paths (current-gcc)))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap glibc)) @@ -481,11 +481,11 @@ (define (%glibc-stripped) (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc) + (package (inherit (current-gcc)) (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments (current-gcc)) ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) @@ -536,7 +536,7 @@ (define %gcc-static (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") - ,@(package-inputs gcc))) + ,@(package-inputs (current-gcc)))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -549,13 +549,13 @@ (define %gcc-static ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc)) - (package-native-inputs gcc)))))) + ,@(package-native-inputs (current-gcc))) + (package-native-inputs (current-gcc))))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. (package - (inherit gcc) + (inherit (current-gcc)) (name "gcc-stripped") (build-system trivial-build-system) (source #f) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index bc1fd797d6..e956167137 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Paul Garlick ;;; Copyright © 2019, 2021 Ricardo Wurmus ;;; Copyright © 2024 Romain Garbage +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -378,7 +379,7 @@ (define-public openmpi-5 "ompi/tools/ompi_info/param.c") (("_ABSOLUTE") ""))))) - #:disallowed-references (list (canonical-package gcc)))))) + #:disallowed-references (list (canonical-package (current-gcc))))))) (define-public openmpi-c++ (package/inherit openmpi diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 7459a6a02c..e13bf04277 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 David Elsing ;;; Copyright © 2024 Romain Garbage +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -666,7 +667,7 @@ (define-public openpmix ;; Don't keep a reference to GCC. #:disallowed-references (and (not (%current-target-system)) - (list (canonical-package gcc))) + (list (canonical-package (current-gcc)))) #:phases #~(modify-phases %standard-phases @@ -738,7 +739,7 @@ (define-public prrte (string-append "prte_launch_agent = \"" #$output "/bin/prted\";\n")))))) - #:disallowed-references (list (canonical-package gcc)))) + #:disallowed-references (list (canonical-package (current-gcc))))) (inputs (list libevent `(,hwloc "lib") openpmix)) diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm index e883371928..2f315e3985 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2022, 2023 John Kehayias +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This program is free software; you can redistribute it and/or modify it ;;; under the terms of the GNU General Public License as published by @@ -131,7 +132,7 @@ (define-public roct-thunk-interface (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Not sure how to run tests. (inputs (list libdrm numactl)) - (native-inputs (list `(,gcc "lib") pkg-config)) + (native-inputs (list `(,(current-gcc) "lib") pkg-config)) (home-page "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface") (synopsis "Radeon Open Compute Thunk Interface") (description "User-mode API interfaces used to interact with the ROCk From patchwork Tue Nov 12 16:25:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70319 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 0BFAB27BBEA; Tue, 12 Nov 2024 16:32:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 14C9427BBE9 for ; Tue, 12 Nov 2024 16:32:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmZ-00043z-B7; Tue, 12 Nov 2024 11:30:23 -0500 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 1tAtmT-0003xV-FV for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:17 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmT-0005x5-5S; Tue, 12 Nov 2024 11:30:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=H5qy9XPsB/mEj4r6U2Yh+9AIAYWfh1xGVuKd1oqGgEc=; b=ccflDRm9OUCgF1MO/FVqwMQTbzPc9GWD1WVw0+PkfwKP0V2DjZMBdVbwaAFzkJsekm8E1Vegzv8cvyzPfjLBYozmauy9e25SkdldcUgF8qT/4mv+fHyVzPkuZGKvwiLPwStpfihOevWnSv7zMqBDpuluSvwuFE3BUHVjlSny6XNtvE72dJSp3YDDqk84S7IIxYn64bYU9sG9My9Uz9AGSsQ7kGSWqEDK15YILMmssn0eH4grU2/A0d4CWI4cGx7saDUy5WULOuIA7HShIvubloPRgfuuBd8cgRujQVbnp5PCcho3T95eSJuTejsKfj6s85kk6TqSpRlWQgIduCtauA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmG-0000PU-QY; Tue, 12 Nov 2024 11:30:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 05/40] gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix@cbaines.net, efraim@flashner.co.il, ekaitz@elenq.tech, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Christopher Baines , Efraim Flashner , Ekaitz Zarraga , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Christopher Baines , Efraim Flashner , Ekaitz Zarraga , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289571064 (code B ref 74290); Tue, 12 Nov 2024 16:30:04 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:17 +0000 Received: from localhost ([127.0.0.1]:39057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlS-0000Gg-3V for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlP-0000Fv-5f for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:12 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjD-0005KX-3Z; Tue, 12 Nov 2024 11:26:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=H5qy9XPsB/mEj4r6U2Yh+9AIAYWfh1xGVuKd1oqGgEc=; b=bVTaJOPRlnMPS+NX+1Su idTw6wGHrRYQg4k98YBLr1ZyeOEi3fWyslWpTTBEjT2QgA8V3u6QdjgyFv24J3ds9HyXWq5gwz0f0 Ag5uSqnxI9klcCc6RHWPX158EWT13o7dH+YkGxsmLcFYTI3s5xK2j5z9mYZeKEPfqcQPr3X5sC8eo B3dtwbJicD8uPAsgBGpjzYKDAo4HBpXeMCqdSAQ0MQ8/hhqcMRV3JWmDb1ZvlbQAAVfxCdjmlDEyM tcX8UEJFFcrQ2p5iFgWabmjXaa5OKavQdIFjmkFvD0Xsnk/gUkEZSCYqCPeuEPAhByVIs4Z42SXwu ib4HlZ5A/BcIXg==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:14 +0100 Message-ID: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Update comment on where to find shared linker name. (make-raw-bag): Also use raw-build-guile3 when building for the 64bit Hurd. * guix/platforms/x86.scm (x86_64-gnu): New exported variable. * guix/utils.scm (target-hurd64? system-hurd64?): New procedures. * gnu/packages/gcc.scm: (current-gcc): Use target-hurd64? in new procedure to select gcc-14 on 64bit Hurd. (libstdc++): Change to procedure. (libstdc++-headers): Update accordingly. * gnu/packages/commencement.scm (current-gcc-toolchain): Likewise, to select gcc-toolchain-14 on 64bit Hurd. * gnu/packages/cross-base.scm (%xgcc): Use current-gcc. (cross-kernel-headers*): Use target-hurd? instead of custom "i586..." matching to also use xhurd-core-headers for target-hurd64. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc): Capture (current-gcc) before resetting %current-target-system. [native-inputs]: Move final-inputs before cross-packages. (%glibc-stripped): Likewise. (%gcc-static): Change to procedure. (%gcc-stripped): Likewise, update accordingly. (%gcc-bootstrap-tarball): Likewise, update accordingly. (make-guile-static)[arguments]: When building for the 64bit Hurd, add "lt_cv_prog_compiler_static_works=yes" to #:configure-flags to convince libtool to actually link guile statically. (%binutils-static)[arguments]: When building for the 64bit Hurd, add "lt_cv_prog_compiler_static_works=yes", "lt_cv_prog_compiler_static_works_CXX=yes" to #:make-flags to convince to actually link the binaries statically. * gnu/ci.scm (%core-packages): Update accordingly. * gnu/packages/patches/gcc-14-cross-without-bootstrap.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cross-base.scm (cross-gcc)[origin]: Use it when cross-building gcc >= 14. Change-Id: I4ae189e7e5188ced91744b89fe9d753b6a1fca78 --- gnu/ci.scm | 4 +-- gnu/packages/bootstrap.scm | 3 +- gnu/packages/commencement.scm | 6 ++-- gnu/packages/cross-base.scm | 6 ++-- gnu/packages/gcc.scm | 32 ++++++++++--------- gnu/packages/make-bootstrap.scm | 56 ++++++++++++++++++++++----------- guix/platforms/x86.scm | 11 ++++++- guix/utils.scm | 15 ++++++++- 8 files changed, 90 insertions(+), 43 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index 4e282d197f..e7e839d968 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012-2024 Ludovic Courtès -;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2017, 2020, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2020, 2021 Mathieu Othacehe @@ -146,7 +146,7 @@ (define %core-packages %bootstrap-binaries-tarball %binutils-bootstrap-tarball (%glibc-bootstrap-tarball) - %gcc-bootstrap-tarball + (%gcc-bootstrap-tarball) %guile-bootstrap-tarball %bootstrap-tarballs)) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c4640b62e1..234d001fc1 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -558,7 +558,8 @@ (define* (make-raw-bag name (name name) (system system) (build-inputs inputs) - (build (cond ((target-riscv64?) + (build (cond ((or (target-riscv64?) + (target-hurd64?)) raw-build-guile3) (else raw-build))))) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 70641267a8..a000cbfdc5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3643,10 +3643,12 @@ (define-public gcc-toolchain-14 ;; The default GCC (define (current-gcc-toolchain) "The current default gcc-toolchain version." - gcc-toolchain-11) + (if (target-hurd64?) + gcc-toolchain-14 + gcc-toolchain-11)) (define-public gcc-toolchain - (deprecated-package "gcc-toolchain" gcc-toolchain-11)) + (deprecated-package "gcc-toolchain" (current-gcc-toolchain))) (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 9c701efae8..7b32a6b64e 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -641,9 +641,9 @@ (define* (cross-kernel-headers* target ("hurd-headers" ,xhurd-headers) ("hurd-minimal" ,xhurd-minimal))))) - (match target - ((or "i586-pc-gnu" "i586-gnu") xhurd-core-headers) - (_ xlinux-headers))) + (if (target-hurd? target) + xhurd-core-headers + xlinux-headers)) (define* (cross-libc . args) (if (or (= (length args) 1) (contains-keyword? args)) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3b5d05b9a9..fc3746fb05 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -861,10 +861,12 @@ (define-public gcc-14 ;; the gcc-toolchain-* definitions. (define (current-gcc) "The current default gcc version." - gcc-11) + (if (target-hurd64?) + gcc-14 + gcc-11)) (define-public gcc - (deprecated-package "gcc" gcc-11)) + (deprecated-package "gcc" (current-gcc))) ;;; @@ -903,15 +905,15 @@ (define-public gcc-2.95 (outputs '("out")) (arguments (let ((matching-system - (match (%current-system) - ;; This package predates our 64-bit architectures. - ;; Force a 32-bit build targeting a similar architecture. - ("aarch64-linux" - "armhf-linux") - ("x86_64-linux" - "i686-linux") - (_ - (%current-system))))) + (match (%current-system) + ;; This package predates our 64-bit architectures. + ;; Force a 32-bit build targeting a similar architecture. + ("aarch64-linux" + "armhf-linux") + ("x86_64-linux" + "i686-linux") + (_ + (%current-system))))) (list #:system matching-system #:configure-flags #~'("--disable-werror") @@ -1050,8 +1052,8 @@ (define-public (make-libstdc++ gcc) (propagated-inputs '()) (synopsis "GNU C++ standard library"))) -(define libstdc++ - ;; Libstdc++ matching the default GCC. +(define (current-libstdc++) + ;; Libstdc++ matching the CURRENT-GCC. (make-libstdc++ (current-gcc))) (define libstdc++-headers @@ -1061,7 +1063,7 @@ (define libstdc++-headers ;; is right under include/c++ and not under ;; include/c++/x86_64-unknown-linux-gnu (aka. GPLUSPLUS_TOOL_INCLUDE_DIR). (package - (inherit libstdc++) + (inherit (current-libstdc++)) (name "libstdc++-headers") (outputs '("out")) (build-system trivial-build-system) @@ -1072,7 +1074,7 @@ (define libstdc++-headers (mkdir (string-append out "/include")) (symlink (string-append libstdc++ "/include") (string-append out "/include/c++"))))) - (inputs `(("libstdc++" ,libstdc++))) + (inputs `(("libstdc++" ,(current-libstdc++)))) (synopsis "Headers of GNU libstdc++"))) (define-public libstdc++-4.9 diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index c6293b9a38..f4165178fe 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -124,8 +124,11 @@ (define (package-with-relocatable-glibc p) (glibc-for-bootstrap ;; `cross-libc' already returns a cross libc, so clear ;; %CURRENT-TARGET-SYSTEM. - (parameterize ((%current-target-system #f)) - (cross-libc target)))) + (let ((xgcc (cross-gcc target #:xgcc (current-gcc)))) + (parameterize ((%current-target-system #f)) + (cross-libc target #:xgcc xgcc + #:xheaders (cross-kernel-headers + target #:xgcc xgcc)))))) ;; Standard inputs with the above libc and corresponding GCC. @@ -145,7 +148,10 @@ (define (package-with-relocatable-glibc p) target #:xbinutils (cross-binutils target) #:libc (cross-bootstrap-libc target)))) - `(("cross-gcc" ,(package + `(,@(%final-inputs) + ;; As versions for gcc and cross-gcc can differ, make sure to have + ;; cross-gcc behind gcc in CPLUS_INCLUDE_PATH. + ("cross-gcc" ,(package (inherit xgcc) (search-paths ;; Ensure the cross libc headers appears on the @@ -154,8 +160,7 @@ (define (package-with-relocatable-glibc p) (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) (package-search-paths (current-gcc)))))) - ("cross-binutils" ,(cross-binutils target)) - ,@(%final-inputs))) + ("cross-binutils" ,(cross-binutils target)))) `(("libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") ("gcc" ,(gcc-for-bootstrap glibc)) @@ -395,10 +400,15 @@ (define %binutils-static ((#:configure-flags flags _ ...) flags))) #:make-flags - (match (memq #:make-flags (package-arguments binutils)) - ((#:make-flags flags _ ...) - flags) - (_ #~'())) + #~(append + #$(if (target-hurd64?) + #~'("lt_cv_prog_compiler_static_works=yes" + "lt_cv_prog_compiler_static_works_CXX=yes") + #~'()) + #$(match (memq #:make-flags (package-arguments binutils)) + ((#:make-flags flags _ ...) + flags) + (_ #~'()))) #:strip-flags #~'("--strip-all") #:phases #~(modify-phases %standard-phases @@ -446,7 +456,8 @@ (define (%glibc-stripped) ;; GNU libc's essential shared libraries, dynamic linker, and headers, ;; with all references to store directories stripped. As a result, ;; libc.so is unusable and need to be patched for proper relocation. - (let ((glibc (glibc-for-bootstrap glibc))) + (let ((glibc (glibc-for-bootstrap glibc)) + (gcc (current-gcc))) (package (inherit glibc) (name "glibc-stripped") (build-system trivial-build-system) @@ -463,8 +474,13 @@ (define (%glibc-stripped) `(("libc" ,(let ((target (%current-target-system))) (if target (glibc-for-bootstrap - (parameterize ((%current-target-system #f)) - (cross-libc target))) + (let* ((xgcc (cross-gcc target #:xgcc gcc)) + (xheaders (cross-kernel-headers target + #:xgcc xgcc))) + (parameterize ((%current-target-system #f)) + (cross-libc target + #:xgcc xgcc + #:xheaders xheaders)))) glibc))))) (inputs `(("kernel-headers" @@ -478,11 +494,12 @@ (define (%glibc-stripped) ;; Only one output. (outputs '("out"))))) -(define %gcc-static +(define (%gcc-static) ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc (package (inherit (current-gcc)) (name "gcc-static") + (source (package-source (current-gcc))) (outputs '("out")) ; all in one (arguments (substitute-keyword-arguments (package-arguments (current-gcc)) @@ -552,7 +569,7 @@ (define %gcc-static ,@(package-native-inputs (current-gcc))) (package-native-inputs (current-gcc))))))) -(define %gcc-stripped +(define (%gcc-stripped) ;; The subset of GCC files needed for bootstrap. (package (inherit (current-gcc)) @@ -575,7 +592,7 @@ (define %gcc-stripped (libdir (string-append out "/lib")) (includedir (string-append out "/include")) (libexecdir (string-append out "/libexec")) - (gcc #$%gcc-static)) + (gcc #$(%gcc-static))) (copy-recursively (string-append gcc "/bin") bindir) (for-each remove-store-references (find-files bindir ".*")) @@ -642,6 +659,9 @@ (define* (make-guile-static guile patches) #$@(if (target-hurd?) #~("--disable-jit") + #~()) + #$@(if (target-hurd64?) + #~("lt_cv_prog_compiler_static_works=yes") #~()))) ((#:phases phases '%standard-phases) #~(modify-phases #$phases @@ -813,9 +833,9 @@ (define (%glibc-bootstrap-tarball) ;; A tarball with GNU libc's shared libraries, dynamic linker, and headers. (tarball-package (%glibc-stripped))) -(define %gcc-bootstrap-tarball +(define (%gcc-bootstrap-tarball) ;; A tarball with a dynamic-linked GCC and its headers. - (tarball-package %gcc-stripped)) + (tarball-package (%gcc-stripped))) (define %guile-bootstrap-tarball ;; A tarball with the statically-linked, relocatable Guile. @@ -856,7 +876,7 @@ (define %bootstrap-tarballs ((or "i686-linux" "x86_64-linux") (list %linux-libre-headers-bootstrap-tarball)) (_ - (list %gcc-bootstrap-tarball + (list (%gcc-bootstrap-tarball) %binutils-bootstrap-tarball (%glibc-bootstrap-tarball) %bootstrap-binaries-tarball))))) diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm index 0c8fc7296c..5617e6dd68 100644 --- a/guix/platforms/x86.scm +++ b/guix/platforms/x86.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Mathieu Othacehe ;;; Copyright © 2023, 2024 Efraim Flashner +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +26,8 @@ (define-module (guix platforms x86) x86_64-linux-x32 i686-mingw x86_64-mingw - i586-gnu)) + i586-gnu + x86_64-gnu)) (define i686-linux (platform @@ -71,3 +73,10 @@ (define i586-gnu (system "i586-gnu") (rust-target "i686-unknown-hurd-gnu") (glibc-dynamic-linker "/lib/ld.so.1"))) + +(define x86_64-gnu + (platform + (target "x86_64-pc-gnu") + (system "x86_64-gnu") + (rust-target "x86_64-unknown-hurd-gnu") + (glibc-dynamic-linker "/lib/ld-x86-64.so.1"))) diff --git a/guix/utils.scm b/guix/utils.scm index f161cb4ef3..e100c03365 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 Philip McGrath -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © 2024 Herman Rimm @@ -94,6 +94,8 @@ (define-module (guix utils) target-linux? target-hurd? system-hurd? + target-hurd64? + system-hurd64? target-mingw? target-x86-32? target-x86-64? @@ -716,6 +718,17 @@ (define* (system-hurd?) "Is the current system the GNU(/Hurd) system?" (and=> (%current-system) target-hurd?)) +(define* (target-hurd64? #:optional (target (or (%current-target-system) + (%current-system)))) + "Does TARGET represent the 64bit GNU(/Hurd) system?" + (and (target-hurd?) + (target-64bit? target))) + +(define* (system-hurd64?) + "Is the current system the 64bit GNU(/Hurd) system?" + (and (system-hurd?) + (target-64bit? (%current-system)))) + (define* (target-mingw? #:optional (target (%current-target-system))) "Is the operating system of TARGET Windows?" (and target From patchwork Tue Nov 12 16:25:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70307 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 DF7A027BBEA; Tue, 12 Nov 2024 16:31:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 CE95827BBE2 for ; Tue, 12 Nov 2024 16:31:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmL-0003ac-3R; Tue, 12 Nov 2024 11:30:09 -0500 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 1tAtmJ-0003Vp-75 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:07 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmI-0005s3-U6; Tue, 12 Nov 2024 11:30:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=U3393vj9SLGcR9xYmbaMJUzCKszCGGKYXMuqOdjZjJg=; b=REyqcAbG5jUvDj1vwJiFirpE2sQZcObJmHFxiY/s7aSTD+R2Oow9FdoEVv9Wfqn/8c1YcT7/ocm2QBf20XbUqczL31WEMAY8gZuv0kzmj1gOHht0uY2CCMv0+XtKO2qSWcacaMlITE8PzrlZYLFxvoWOXq5wR8qUklWZjZyJ/yxrJKlIXmc/YwQMb/c1BcAma6VBc/UzBgqtgMSRivB4LdaD/oLt8SgSEXucIGDyN35XkutnokY7k+syTL3dA4A80V0kC62VnZz3uVrgiFQiJn4gVStA/gUqSxE0Uztzylp7F1GfmNVrlrtVWyL/2VPDVmLvVgxS5gmq/FedYdgnog==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmI-0000Qs-Lz; Tue, 12 Nov 2024 11:30:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 06/40] gnu: cross-libc: Support cross-building for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289621117 (code B ref 74290); Tue, 12 Nov 2024 16:30:06 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:22 +0000 Received: from localhost ([127.0.0.1]:39073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlY-0000Ho-RO for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlP-0000Fw-5b for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:13 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjE-0005Kn-8c; Tue, 12 Nov 2024 11:26:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=U3393vj9SLGcR9xYmbaMJUzCKszCGGKYXMuqOdjZjJg=; b=APk+0XaD1yfgs8ikGtGZ krqVw/TP+AJd0Ih1+rC3ADpA2+lxPM7GFsmiGkdtUboviWpTacFf4Orz1cFf0BSYUl+BWYsM3YKki 5zB7fsOWTwN+St14BgCDCwKm46FilLBk7BRPyffXX/iHM4XqToIQuDChVmVD01vSu35mEX7OZZxaI ajNUdyadDcWDNdILTS6H6ufzyrQkpcyeFwDQs/bj12DxTkhUhh/tAxLIlfUw57yI8mvHGsf2GsrDD rX1NOytxJC/Ot6CrMJom66PZuq19o/oOD5uis3JOoEo9OPqDmdnyb7kmnkdD1QwHvgHybIJqmGsvq CJxayzcIjKtVTQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:15 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (glibc)[arguments]: When building for the Hurd, in phase "create-machine-symlink", do not assume CPU is i386, also cater for x86_64. * gnu/packages/cross-base.scm (cross-libc*)[arguments]: Likewise. Change-Id: Ib009b7bd301b543b8629382330cca9d963b7a812 --- gnu/packages/base.scm | 18 ++++++++++++------ gnu/packages/cross-base.scm | 17 +++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 4e8121ae2c..02ef71f20d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1079,7 +1079,7 @@ (define-public glibc (string-append locale "/C.UTF-8"))))) ,@(if (target-hurd?) - '((add-after 'install 'augment-libc.so + `((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") @@ -1088,11 +1088,17 @@ (define-public glibc " libmachuser.so libhurduser.so")))))) (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (cpu "i386")) - (symlink cpu - (string-append out - "/include/mach/machine")))))) + (let* ((out (assoc-ref outputs "out")) + (cpu ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) + (machine (string-append + out "/include/mach/machine"))) + (unless (file-exists? machine) + (symlink cpu machine)))))) '())))) (inputs `(("static-bash" ,static-bash))) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 7b32a6b64e..3827e87aec 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -738,7 +738,7 @@ (define* (cross-libc* target (delete 'install-utf8-c-locale) ,@(if (target-hurd? target) - '((add-after 'install 'augment-libc.so + `((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* (string-append out "/lib/libc.so") @@ -747,11 +747,16 @@ (define* (cross-libc* target " libmachuser.so libhurduser.so")))))) (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (cpu "i386")) - (symlink cpu - (string-append out - "/include/mach/machine")))))) + (let* ((out (assoc-ref outputs "out")) + (cpu ,(match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) + (machine (string-append + out "/include/mach/machine"))) + (unless (file-exists? machine) + (symlink cpu machine)))))) '()))))) ;; Shadow the native "kernel-headers" because glibc's recipe expects the From patchwork Tue Nov 12 16:25:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70322 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 92F6B27BBEA; Tue, 12 Nov 2024 16:32:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3ECE427BBE2 for ; Tue, 12 Nov 2024 16:32:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmO-0003jy-RX; Tue, 12 Nov 2024 11:30:12 -0500 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 1tAtmL-0003be-Oz for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmL-0005t3-F0 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ZxI/gq58eWCTS4TrSRJVe5AfDbAQNW+5TBQK2EriJ8w=; b=WLJvSnp0XQpKvqLXe6d0sFRTfQO4clKUFr8jQ01CK2YdmMdj9k5h3SQd6R+ajJsknEhy0byeutpcZJZhoyDJCuqmgNkySsUlxoqkKDI11lMkBmTDYtYomWcsapd44MiK5YThFX0iH6qqJ/crqMmZXnUgLUsktOC5XnzcNSkUcVLtIpbQALU8gS4xL721UcGDe6g/VMea13zfuYh1yDmTb/lSk4SOscOuvpPZtdjsxbCta7rK2EPsuZyoo33OSEbM9P0jyEStdzeZfDh1omkjZb6F3+4pBocGq+J4yheR8pKFkjyCxryQrLAvHRU1ctGi1MWPr2MiEq6zqYk7Rnd77w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmL-0000Rr-9H for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 07/40] gnu: bash-minimal: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289631153 (code B ref 74290); Tue, 12 Nov 2024 16:30:09 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:23 +0000 Received: from localhost ([127.0.0.1]:39083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlb-0000IQ-3a for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlR-0000GA-7C for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjF-0005L0-9i; Tue, 12 Nov 2024 11:26:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ZxI/gq58eWCTS4TrSRJVe5AfDbAQNW+5TBQK2EriJ8w=; b=XDA3IZwSiuj6PtApzIyt 7vb3nlMUk1a3eW3/JVVW5s+KdAAT/i5GzIY/6uFcZpm3fVKGyAUGZ+MJEOjCxeR9j+jjRLQn+axZF oc4ygHcpUY7FU0vjem8D9bhTmQhfTULy+znNidCHvM9mZQRPCRH0Ko/ky3SPS7jTl75x/J8tKagkd z10axtLPe/kiNoBK2GIF8NHY6CndMKIN7SNkXO5JULzJi1ApLC5bgDWlG5mqlnrDtFJN/sLlHgOud 2m1QBNtFnL6pVwwnfn2YdZokxy7XeQBwyoM2sFQ9+fjqwOj7ExPFTwovhDfrS/NTyfj4w3tvM0dah g3vtPG+3g714bA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:16 +0100 Message-ID: <1f92fed3939c2be15f88c5952cb79eaafd23e7dc.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bash-minimal.scm (bash)[arguments]: When building with gcc >= 14 use "CFLAGS=-Wno-implicit-function-declaration". Change-Id: I3fd2da7a1d9011b155084dceadbad649dbb2a1b9 --- gnu/packages/bash.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 93641a78d5..1a3b014ad7 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2024 Oleg Pykhalov +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ (define-module (gnu packages bash) #:use-module (gnu packages base) #:use-module (gnu packages bootstrap) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages elf) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) @@ -251,6 +253,13 @@ (define-public bash-minimal ;; modules and related code. "ac_cv_func_dlopen=no" + ,@(if (version>=? (package-version (current-gcc)) "14") + ;; gcc-14 implictly uses -Wimplicit-function-declaration + ;; which together with -Werror causes: + ;; ./enable.def:492:11: error: implicit declaration of function ‘dlclose’; + '("CFLAGS=-Wno-implicit-function-declaration") + '()) + ,@(if (%current-target-system) '("bash_cv_job_control_missing=no" "bash_cv_getcwd_malloc=yes") From patchwork Tue Nov 12 16:25:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70286 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 B6CB227BBEA; Tue, 12 Nov 2024 16:30:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7EDFA27BBE2 for ; Tue, 12 Nov 2024 16:30:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmM-0003cM-Gp; Tue, 12 Nov 2024 11:30:10 -0500 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 1tAtmK-0003ZM-6F for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmJ-0005sO-RK for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=cF6ikUut8co2WzQ8hrEHqPCHeXj3NYg53KJsM6rMXCM=; b=fZ2Rz5Wxd2RTuDnKjPtE2xKFKrWgVr5eScEQbMMz/kHxcLZU7yi/49ERyUNMAwNDQHnIi80r9MFFs/cZJrJ8l3d3SRnr+zrf6hZUE2bLulN0TS7nUdTHINcDx74QBKGIabXJ3MjgM68xi3qtUrX11rKGnZj3mYPDwaykiGerCv73BJwxM/xcydHSSZJP+zCThva5OOMbEXRoY/Fz0B2pNmGT4AQ0Yx2h5pwHB1WtrrcxEAt6nq9isVpX7Im5/58YVHEb+QP0iCLXa2f203XzBIne9NEtrMT+0IhtUOxXBtgKKTagLfQYXLjIiw4AoBzZu4Upc6iZUDvByWce35FOcw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmJ-0000RM-Ji for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 08/40] gnu: elfutils: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289621133 (code B ref 74290); Tue, 12 Nov 2024 16:30:07 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:22 +0000 Received: from localhost ([127.0.0.1]:39079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlZ-0000Hy-Sw for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlR-0000G9-7Q for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:14 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjG-0005LB-7x; Tue, 12 Nov 2024 11:26:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=cF6ikUut8co2WzQ8hrEHqPCHeXj3NYg53KJsM6rMXCM=; b=jqOL6pgSPWBlWXZitwzg kf1haxnjMiRU41YRRWeZHtv65glF3saTBKv56UxaJBEvYl4eUACYQvfaYtewqLSqbixfNTWXvvq5x mwerIIL1XT0jR4XKtggetlcZ9Czd5ZKq+Iexq9GQqbjr8QYtaa6HkkA4szdTxvq7MoRnU05fR3tls POOhc/hFO/S51WcXdk4pSUezcRkDlb6xzchRqGlLYbSFRa5XnpXpAfpqK8CSbjF1+YlK/saG+kc/6 Sxg0MFeVvIDYOi3/JXbEeBdmwKpq4tcgeSFgCfaUBwnWEolZ60DMpu2vxttVqB2Q16nBtuLekh0NK 2lYqgWA0NFDZ5g==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:17 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/elf.scm (elfutils)[arguments]: When building for a 64bit Hurd, set #:make-flags. Change-Id: I00abf360a7de5b1f78c1e912f0dcf27c62c1af68 --- gnu/packages/elf.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 119f8d13dd..81a753a483 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Leo Le Bouter ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,6 +86,10 @@ (define-public elfutils "--disable-libdebuginfod" "--disable-debuginfod") + ,@(if (target-hurd64?) + '(#:make-flags '("core-file_no_Werror=yes")) + '()) + ;; Disable tests on MIPS and PowerPC (without changing ;; the arguments list on other systems). ,@(if (any (cute string-prefix? <> (or (%current-target-system) From patchwork Tue Nov 12 16:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70301 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 97FAA27BBE9; Tue, 12 Nov 2024 16:31:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 5081927BBEA for ; Tue, 12 Nov 2024 16:31:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmN-0003gK-0H; Tue, 12 Nov 2024 11:30:11 -0500 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 1tAtmL-0003ak-3h for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmK-0005sp-QU; Tue, 12 Nov 2024 11:30:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=h55XCVacEinh6pSFBtQQDI+SpliB5ZpcZDJ89ZZyWL8=; b=D6axnRuuFWwJiWnyEN9HXjAghrljwXYHqOHidrG8z+0Gvz3jt8oGHnus/814ZP1wfzeht5Bo+psFlWeCKbYp6jba00G9dzPfRER8F9WpmPwGe7IBk8zlMzMIAG2IeEjaDmH4zKNL38UBoDLHdyDrR0cM8mbGK+dJa+gjpFyVEho4ayp4kIWOjB8aCrOVmS9gc4Y6wYISDSGtXjtDKucuwHPFl9ets04QPx/Y4i4IEVcj/YggXwF+IjBP8imD2Q1/fwYkWN791gej2zMaGOdSHVsN8BPcR/zBwZiEIF7UFWAUNo/cLZ7bCDZ2X7wNoSeJL3e4rhS2rk7v7G6CWN+9WA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmK-0000RZ-KB; Tue, 12 Nov 2024 11:30:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 09/40] gnu: grep: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289631145 (code B ref 74290); Tue, 12 Nov 2024 16:30:08 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:23 +0000 Received: from localhost ([127.0.0.1]:39081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtla-0000IE-L5 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlT-0000GF-96 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:15 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjH-0005LK-CP; Tue, 12 Nov 2024 11:26:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=h55XCVacEinh6pSFBtQQDI+SpliB5ZpcZDJ89ZZyWL8=; b=VXi1pBlQeWCSjQpvJiTG 7dJrfK3C/HF3EUdxC6Ic9HWqOTeeBhXVAO09H0hBljyd5/xAy5nx7N5G29/MW1T6MHQlxnVhF4xd8 Y3gUWRJ+NRc4S3UghfVt5VlTj4JuihI9Q25rlcP2LLzwzRVHSHLJiOenF8fUdlnUebBhWd5FVsvR+ DM7pDeT6M+r/YXZ4ohb6fOnIxVPeMoG6GoxuPAdgXJYxW75owkQ8rkyEQD2fve8P2OxISX0inNtqX Vwaa07gBmJwOryQ0GE/rlaxtQL4xTCj+pzqbmkzOUIpLrvMmYun141Tn86RwAXwEud3ag9u8Dqu7v BrfPW+n89odFOA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:18 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (grep)[arguments]: When building for the 64bit Hurd, add patch-sigsegv.h stage. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/base.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 02ef71f20d..010be631d7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -154,6 +154,13 @@ (define-public grep (string-append bin "/fgrep")) (("^exec grep") (string-append "exec " bin "/grep")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'patch-sigsegv + (lambda _ + ;; Stack overflow recovery does not compile + (substitute* "lib/sigsegv.in.h" + (("__GNU__") "__XGNU__"))))) + #~()) #$@(if (system-hurd?) #~((add-before 'check 'skip-test (lambda _ From patchwork Tue Nov 12 16:25:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70306 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 4A90C27BBE9; Tue, 12 Nov 2024 16:31:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 6E06027BBEA for ; Tue, 12 Nov 2024 16:31:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmN-0003gh-EF; Tue, 12 Nov 2024 11:30:11 -0500 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 1tAtmM-0003cR-F7 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:10 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmM-0005tH-5A; Tue, 12 Nov 2024 11:30:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=5ExfrZ/+CdYW3gc0CTweztCEeJigx1+cn3xK+mVuZAM=; b=seMpDLH+UCd4lCwhi+0aGYKwGtS/jBNjSVxlFmiSa8kt98Dk3vXo/hG8xrtwXpKOUKhK+313h90opaYzNuyN5JrFhtN5vezwpFSaCoCmqBlcEgvd8rHzEJ2TOfbBSbnbsQKyVVrZSJSJvZd3uh9YdkjAlHVsxcKthXYX8fIGHPfv5bGihjvcliVU2bu5rxHmMZ60+8HKOei3h2sJGqdRHhv1EWYHnsQzgVvl0TuVBqJ+Um8SMyx+0bW8NNduJLfaF4LsjnCxrTdUbyu1WINy/9m+5QK13981ZPFSAPuxr0hWoh5gCg8VSlN5wHunGPsLYY46FGuwa3/GVHcG4uoBfw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmL-0000Sb-W0; Tue, 12 Nov 2024 11:30:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 10/40] gnu: patch: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289641172 (code B ref 74290); Tue, 12 Nov 2024 16:30:09 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:24 +0000 Received: from localhost ([127.0.0.1]:39089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlb-0000IY-NK for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlT-0000GE-96 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:16 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjI-0005LW-Bg; Tue, 12 Nov 2024 11:27:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=5ExfrZ/+CdYW3gc0CTweztCEeJigx1+cn3xK+mVuZAM=; b=ozSaom/VMShKd3zMEawK MiwfGyYU2uVeojXvJxO731kawRF2eaNHoihCPvHwq1X+XMgobT5y1Aafvv4lJT6c/qvpYympvykPh ID9Bk4GKZMBZrD7yr6ci0Gz8hxb66icEwly7tFrmFY3XrWgkMkYgCKUdR4jwSUss8ONMQa7YQDU2w jP6NCqr9Hv1giqCj7qEoVZ0jE4Jz61UWMTUjMdsp9oWu0a1bxzsNbd+bg8iNB2KEqUc4+6CFupKmE F1Xr+q+EfH+RL9vfnP3rAvp/YNKIctB4zRcnAqTf1N79BBKOV7LwEquIvty5ZJYQw9NcPe/1x2+Ho qofsOcJogGF31Q==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:19 +0100 Message-ID: <1e21777bab62f575ccfa64425673fa51c6baac1f.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (patch)[arguments]: When building for the 64bit Hurd, set #:configure-flags. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/base.scm | 49 ++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 010be631d7..83f8c0d9e9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -339,27 +339,34 @@ (define-public patch "1bk38169c0xh01b0q0zmnrjqz8k9byz3arp4q7q66sn6xwf94nvz")) (patches (search-patches "patch-hurd-path-max.patch")))) (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - (add-after 'unpack 'copy-gnulib-sources - (lambda _ - ;; XXX: We copy the source instead of using 'gnulib' as a - ;; native input to avoid introducing a dependency cycle. - (copy-recursively #+gnulib "gnulib") - (setenv "GNULIB_SRCDIR" - (string-append (getcwd) "/gnulib/src/gnulib")))) - (add-after 'copy-gnulib-sources 'update-bootstrap-script - (lambda _ - (copy-file "gnulib/src/gnulib/build-aux/bootstrap" - "bootstrap"))) - (add-after 'unpack 'patch-configure.ac - (lambda _ - (substitute* "configure.ac" - ;; The gnulib-provided git-version-gen script has a plain - ;; shebang of #!/bin/sh; avoid using it. - (("build-aux/git-version-gen" all) - (string-append "sh " all))))))))) + (let ((arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-gnulib-sources + (lambda _ + ;; XXX: We copy the source instead of using 'gnulib' as a + ;; native input to avoid introducing a dependency cycle. + (copy-recursively #+gnulib "gnulib") + (setenv "GNULIB_SRCDIR" + (string-append (getcwd) "/gnulib/src/gnulib")))) + (add-after 'copy-gnulib-sources 'update-bootstrap-script + (lambda _ + (copy-file "gnulib/src/gnulib/build-aux/bootstrap" + "bootstrap"))) + (add-after 'unpack 'patch-configure.ac + (lambda _ + (substitute* "configure.ac" + ;; The gnulib-provided git-version-gen script has a plain + ;; shebang of #!/bin/sh; avoid using it. + (("build-aux/git-version-gen" all) + (string-append "sh " all)))))))))) + (if (target-hurd64?) + (substitute-keyword-arguments arguments + ((#:configure-flags flags '()) + #~(list "--disable-threads" + "gl_cv_func_working_mktime=yes"))) + arguments))) (native-inputs (list autoconf automake bison ed)) (properties '())))) From patchwork Tue Nov 12 16:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70298 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 0086127BBEA; Tue, 12 Nov 2024 16:31:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4C2D127BBE2 for ; Tue, 12 Nov 2024 16:31:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmT-0003wq-8I; Tue, 12 Nov 2024 11:30:17 -0500 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 1tAtmO-0003kU-Te for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:13 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmO-0005u7-Kf for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=w6XRMRevfZWtcfUxMNjzv0CqITQTLNlQh3QuvOYv7WU=; b=oR0ZGT1PtnO7Vz+LEpq6HRIRqCs4Q7fPz96+pLz6GmFipoYetAwGzZBoR4p4Nx5Jl1pHhjbRI/z+B25nExOrjIgRrsFUV7wA/xHARH8QJXE/IAqL67zjYeDS6b5ZlNvAXqXXsAH6XIbfILZi8XQ9wFS9jiujLYirOxa5/yckOOCzNpUBgrbCxuJKRIP/1NACy5jXQ7g/51D893E64LOJXORUnyS7HO2DulIK/pExAwixWiZBknlR4XlFD0oF0/0NhHgx6TGZjvYIuBZuPN38xaU+J/wECKsOZckzXeXC5NvVDiT6axsUBv2NVVSgIWsIHgnR0o7bQr4b5Few1hTrJQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmN-0000UQ-Vu for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 11/40] gnu: libxcrypt: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289721225 (code B ref 74290); Tue, 12 Nov 2024 16:30:11 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:32 +0000 Received: from localhost ([127.0.0.1]:39103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlj-0000Jd-4q for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlV-0000GI-Ac for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjJ-0005Lh-As; Tue, 12 Nov 2024 11:27:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=w6XRMRevfZWtcfUxMNjzv0CqITQTLNlQh3QuvOYv7WU=; b=Mo8BuSw61hRwf5jLElfd kRfxd5acT591s3HGsARB6Zy4c4u6c9bTPZVSnxQvcSB6lSC5jb3+LKRQjTz0KrNcYulgW9N0eH2n+ QY/wkPiUrU3MUPuE5SebSYExZMKeEIynHglUTZwne9cx1zX/YQKb9js8S2SlLvKs4lzy5OAre5pFb 9A5OWZgpuTyt73DZAyOEdhStSDSTlEDoNMd6r7AyxE1Ig1fpLONZ0J6BHM1J1+WgYnmlL6oknOylw fimNQRzywVuaLgiFIxElmz5l2wBxTZC5+t/09Kz2OHNKH4751cLFURctIguBAZIiShjjjpNmaF4vP XiZpR7MiL58aMg==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:20 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/libxcrypt-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/crypto.scm (libxcrypt)[arguments]: When building for the 64bit Hurd, use it in new phase `apply-patch'. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 15 ++++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 +++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2bd857e7ac..c952e090ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1727,6 +1727,7 @@ dist_patch_DATA = \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libvpx-CVE-2023-5217.patch \ %D%/packages/patches/libvpx-CVE-2023-44488.patch \ + %D%/packages/patches/libxcrypt-hurd64.patch \ %D%/packages/patches/libxml2-xpath0-Add-option-xpath0.patch \ %D%/packages/patches/libwpd-gcc-compat.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 2a298c4caf..94a98bb0ad 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Ivan Vilata-i-Balaguer ;;; Copyright © 2023 Foundation Devices, Inc. +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1661,6 +1662,20 @@ (define-public libxcrypt (build-system gnu-build-system) (native-inputs (list perl)) + (arguments + (if (target-hurd64?) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch + "libxcrypt-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" + patch-file)))))) + '())) (synopsis "Extended crypt library for descrypt, md5crypt, bcrypt, and others") (description diff --git a/gnu/packages/patches/libxcrypt-hurd64.patch b/gnu/packages/patches/libxcrypt-hurd64.patch new file mode 100644 index 0000000000..9fc3018539 --- /dev/null +++ b/gnu/packages/patches/libxcrypt-hurd64.patch @@ -0,0 +1,38 @@ +Upstream-status: Taken from upstream: + + +From b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Sun, 14 Jul 2024 13:13:07 +0200 +Subject: [PATCH] Add binary compatibility for x86_64 GNU/Hurd +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + + +diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in +index 88ea911..a56b7bf 100644 +--- a/lib/libcrypt.map.in ++++ b/lib/libcrypt.map.in +@@ -43,5 +43,5 @@ fcrypt - GLIBC_2.0 + %chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6 + %chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 + %chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.35 +-%chain GLIBC_2.36 ++%chain GLIBC_2.36 GLIBC_2.38 + %chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4 +diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver +index 8478077..c5a5bf2 100644 +--- a/lib/libcrypt.minver ++++ b/lib/libcrypt.minver +@@ -51,6 +51,7 @@ + #VERSION SYSTEM CPU_FAMILY PREPROCESSOR_CHECK + + # GNU Hurd ++GLIBC_2.38 gnu x86_64 + GLIBC_2.2.6 gnu i[3-9]86 + ERROR gnu . + +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Tue Nov 12 16:25:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70296 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 94A9D27BBEA; Tue, 12 Nov 2024 16:31:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 5D68727BBE2 for ; Tue, 12 Nov 2024 16:31:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmQ-0003ns-7X; Tue, 12 Nov 2024 11:30:14 -0500 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 1tAtmN-0003gP-4b for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:11 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmM-0005tQ-P6; Tue, 12 Nov 2024 11:30:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=; b=v7aDEx3/w5nfTBNEwoQMZ+Vmq4g7nJZF5hFEdB0DF6G5xgzWV4+bTNwbxrahHD1OymBUDvoke8FuS6Gd1xmxj5S0M6FdiIBMIjukocTIZIZ+yrv7llFQBtv07L9jWtvvTTJ4EWY6dLm+6uDj4I1ngHMHb4esb4QolSQA7fAKo9LBN3jocVZRGo03w28uelqjc3fEgu4SWUVpp5wB4/M/Ni1vWRcTiceY3OQFeiLfyINjP/Xnc8+GaAtkR7aGrNux5AaISBMGIWkxXulvSC790vzATjiAum/+kepylO74S7n+OAv2vklBM+wuiF4M8mEfmQyRqoOrD8csc2NAFjttsA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmM-0000Ti-IC; Tue, 12 Nov 2024 11:30:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 12/40] gnu: libstdc++: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289711215 (code B ref 74290); Tue, 12 Nov 2024 16:30:10 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:31 +0000 Received: from localhost ([127.0.0.1]:39101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtli-0000JV-MA for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlV-0000GJ-Ab for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:17 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjK-0005Lr-FJ; Tue, 12 Nov 2024 11:27:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=; b=DOZPS83njX+ZCzYDQIDD P54+28rzz4UZGmazBaolWdFq0eKTgnZWLcoKSFJLf1Vu67RhTX+kPisLFS4bOziZVS6uPV9M+bbf2 rO5Iu99X7+rHBGMk+CVVxnAuBBDoOfjquIsSJz0EkD8fh7KFAsgdXztTdPPYoyV2jADRXYQCiE9zE UtC1nSOPjiCE3UyYhYkRrx1LKjnBOH0PB/GXvcFSznrLs8U0vSs4v0O/ltLHwEJREzhKLZGgv//SH HZ1ABNBTtVcepfh/m5sUXCcv7iPB9H7tDE2Q03/J7pAqVDrI5ydMWVMU4skV7I5la6cMy3eQFB6Vc 7feOYYDjXtq8yw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:21 +0100 Message-ID: <7d1dafc36c5b23a342dced99c93cd8033a3bc852.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gcc.scm (make-libstdc++)[arguments]: When building for the 64bit Hurd, add stage patch-hurd64. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/gcc.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index fc3746fb05..850a14cb1c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1033,7 +1033,15 @@ (define-public (make-libstdc++ gcc) (("/lib64") "/lib"))))) (add-before 'configure 'chdir (lambda _ - (chdir "libstdc++-v3")))) + (chdir "libstdc++-v3"))) + #$@(let ((version (package-version gcc))) + (if (target-hurd64?) + #~((add-after 'unpack 'patch-hurd64 + (lambda _ + (substitute* "libstdc++-v3/src/c++20/tzdb.cc" + (("#if ! defined _GLIBCXX_ZONEINFO_DIR") + "#if __GNU__ || ! defined _GLIBCXX_ZONEINFO_DIR"))))) + '()))) #:configure-flags '`("--disable-libstdcxx-pch" ,(string-append "--with-gxx-include-dir=" From patchwork Tue Nov 12 16:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70290 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 7272C27BBE2; Tue, 12 Nov 2024 16:30:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C2FE327BBE9 for ; Tue, 12 Nov 2024 16:30:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmS-0003uX-5v; Tue, 12 Nov 2024 11:30:16 -0500 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 1tAtmQ-0003nr-48 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:14 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmP-0005uz-QM; Tue, 12 Nov 2024 11:30:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=dxsipSKXtyTMm+IKaV7Euha9ospjvvMuWJs2OXXEos0=; b=c3YCOLMvPLN2eGCDdD4zL/QyDlDP5MyG2e3eNrsMFlyUIsPnw+MClR3Tvk4cS1TmcTvC+1+N5ocoEdfoIGjti8F/SfzaOdbHuSypiqBGVnx82wRYFtDlohMfxzZ7QGwh7ma5P0hJoFc7zPcg/HjBYKjHbtJfcTc1f+qsRWDh4sONRpuy6CG04qrwAf94ycL43DfUGnA0PHfcjMEyzaRP/3eapmbkozcI9z6E+A9PcjRn0+mkqF/tVgCGhYMQLtbFXceUV0Xdd9dstvcPRdiFcvZJb3Qgri+LjAr2T47Fufa9H17qyd6X6Nite0SyycRA/BhoK+lXKR12kEgiGQSrlQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmP-0000VI-Fd; Tue, 12 Nov 2024 11:30:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 13/40] gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?utf-8?q?Co?= =?utf-8?q?urt=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289721238 (code B ref 74290); Tue, 12 Nov 2024 16:30:13 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:32 +0000 Received: from localhost ([127.0.0.1]:39107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlj-0000Ji-QK for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlX-0000Gm-CJ for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:19 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjL-0005Lz-I1; Tue, 12 Nov 2024 11:27:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=dxsipSKXtyTMm+IKaV7Euha9ospjvvMuWJs2OXXEos0=; b=PQtlzjkZTDE6ocX/lgBz oEE/kSMTOhPtd1vjsCfvXx0pr0X6ke9I76Il/sABG1Fru8k4qRoIo9CH7/4Zk9i3ZxnKKcNqiIQPV oSzc9irDCBUKqPTxggxIFO8GEDed7ndeTT/BIVmdP8LIAIGy87OWY8puXZeqayIhOQ7ex4Cc0QUK0 Rp9X5Wf/S7HMwJhylZs693U0HkDFzeL/uKQToc6/6Swmaxqp7UJByOudsy35pun1KSiUeEU9mL4Vr umcbbhDa9UyghZcfSxpflqzU/S8csZ+XQB/18CLGRA23LoVDKa3FY7OII1Q+miEKQur4B70nCT5qQ jOh10DeI3FJD7w==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:22 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gcc.scm (gcc-13)[arguments]: Use quasiquote instead of g-expressions. (gcc-14)[arguments]: Likewise. Change-Id: I22269b31d49868effe967d46247b189ed9a9d394 --- gnu/packages/gcc.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 850a14cb1c..befbbda027 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -811,10 +811,10 @@ (define-public gcc-13 (snippet gcc-canadian-cross-objdump-snippet))) (arguments (substitute-keyword-arguments (package-arguments gcc-11) - ((#:phases phases #~%standard-phases) + ((#:phases phases '%standard-phases) (if (target-hurd?) - #~(modify-phases #$phases - (delete 'patch-hurd-libpthread)) + `(modify-phases ,phases + (delete 'patch-hurd-libpthread)) phases)))) (properties `((compiler-cpu-architectures @@ -841,8 +841,8 @@ (define-public gcc-14 (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments (substitute-keyword-arguments (package-arguments gcc-13) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases + ((#:phases phases '%standard-phases) + `(modify-phases ,phases (add-before 'configure 'pre-x86-configure (lambda _ (substitute* "gcc/config/i386/t-linux64" From patchwork Tue Nov 12 16:25:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70294 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 EEF1827BBEB; Tue, 12 Nov 2024 16:31:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 646E227BBE2 for ; Tue, 12 Nov 2024 16:31:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmW-00040m-E8; Tue, 12 Nov 2024 11:30:20 -0500 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 1tAtmT-0003ye-VM for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmT-0005xR-M6; Tue, 12 Nov 2024 11:30:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=NdaerUO90SVlFiMBVTBno/h7lRanuYp5lI6bxbYsCGc=; b=s19UsZA7+CLaCraBa8EvNqfXraTmF46W8gDYXRB+vxCoVLSFsZHCe56LY33gvUYq5vttcnkhNSKNfR6HIJoetl+xF3ECBGrYtZRompCFcu71Dm9z+BIl5a9aedYHvesCcQK+j+ZU+yCUfBqKVBPJ0yUYzT78LD4jjhUTgtyhkKv5iMX+qMmnIFYPH9fqz5dgq54Dc3Nou5NkX0aghZkOMeKoJLlWP8Odi+uDYqsyndl9Ds2YyfEfds8ZfjUtyMe5Z3WWVAJ0vUJfMg3zH0YORF5/3Yy3DTT4KdiYZGoNxfJn+bykROhUVJ/NCjalPzg433XYhB53+acpGKye6pX+Sg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmQ-0000Wd-Bm; Tue, 12 Nov 2024 11:30:14 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 14/40] DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, maxim.cournoyer@gmail.com, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Maxim Cournoyer , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289731256 (code B ref 74290); Tue, 12 Nov 2024 16:30:14 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:33 +0000 Received: from localhost ([127.0.0.1]:39109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlk-0000Jv-BV for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlX-0000Gn-CI for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:21 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjM-0005MB-Nj; Tue, 12 Nov 2024 11:27:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=NdaerUO90SVlFiMBVTBno/h7lRanuYp5lI6bxbYsCGc=; b=Vhfy3g0Knj0/PnjFV61G NO9M9GJ1ydmeRKHf7LCDJBVet7CMN5rU8B5bQ2A4y0uIa72jFFcoRUTEOmCnByIFg8h0h0O3xrAMK +sABkY0v9DwPZI/er7OGSVneTwcMdiR0JwWna3X7fXg0ffXoSoN43DxkG8epPoJxAVzAKTq8VReWy jwcOhNAkdQ480ISilKvzxlpqCu0pLzs3wB4KZ9XMhFMUY+TUflUmkonEpw0GUtkObLfBPBo8cGHZa QEl5DNGi+AHwaeG7sB3n2TW1Rbm/pL9kG0dyGE/3KVPid/nZB/4tik8H+80oT9vB6iPlc1GkNaDJM 7PNm+Yd1+ISHrA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:23 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches XXX TODO: v Boot a 64bit hurd, and o Guix build hello, o Push the commit below, o Re-check the bootstrap-tarballs build/hash, o Update this commit message with new commit hash, o Push it with remainder of hurd-team branch, o Update blog post. On commit: b4c0b38776c048869626bed8aefd4efb042cea11 gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/46ndf3vaic6cfk7a486saaa8xxnqfpxk-bootstrap-tarballs-0/ With guix hash -r: 1w9sp8dhgpawf88qd89ykrgyrpfxr9qxxqwpbpd893rnn4cp16v2 * gnu/packages/bootstrap.scm (%bootstrap-executables): Add entries for x86_64-gnu. (%bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils, %bootstrap-glibc, %bootstrap-gcc): Add entry for x86_64-gnu. * guix/packages.scm (%supported-systems, %hurd-systems): Add x86_64-gnu. (%cuirass-supported-systems): Remove x86_64-gnu. * guix/utils.scm (target-64bit?): Add x86_64-gnu. * m4/guix.m4: Add x86_64-gnu as a supported system. * doc/guix.texi (GNU Distribution): Add x86_64-gnu. Change-Id: Id96715cee07572cd0635594d3b1aa6756fa8a822 --- doc/guix.texi | 9 ++++++++- gnu/packages/bootstrap.scm | 34 ++++++++++++++++++++++++++++++++++ guix/packages.scm | 8 +++++--- m4/guix.m4 | 12 +++++++++--- 4 files changed, 56 insertions(+), 7 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8f65387e92..0f5e11a305 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36,7 +36,7 @@ Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nikita Gillmann@* -Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan Nieuwenhuizen@* +Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Christopher Baines@* @@ -639,6 +639,13 @@ GNU Distribution (@pxref{transparent-emulation-qemu, @code{hurd-vm-service-type}}). @xref{Contributing}, on how to help! +@item x86_64-gnu +@uref{https://hurd.gnu.org, GNU/Hurd} on the @code{x86_64} Intel/AMD +64-bit architecture. + +This configuration is even more experimental and under heavy upstream +development. + @item mips64el-linux (unsupported) little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel. This configuration is no longer fully diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 234d001fc1..3efb21eab3 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -125,6 +125,15 @@ (define %bootstrap-executables ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m")) ("xz" ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5"))) + ("x86_64-gnu" + ("bash" + ,(base32 "1ib1kk1larki3dm46lhl756856zpjwhhlnzkgdyh9f1yf6wm431y")) + ("mkdir" + ,(base32 "15cnckq4qj1nlmgqy9vq3qa3kcbfm1pc2z38pscxix11j4aqswsm")) + ("tar" + ,(base32 "1m8v7ddmn42wym2kl9mf7csnwsw6c3jdglg7d7kp7yaa16h5fbck")) + ("xz" + ,(base32 "16cnr7vr0zawrwcnhshms3v5kyzb2vz1rp4kxmx507cs6rivd05b"))) ("mips64el-linux" ("bash" ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6")) @@ -165,6 +174,7 @@ (define (bootstrap-executable-file-name system program) (match system ("powerpc64le-linux" (string-append system "/20210106/" program)) ("i586-gnu" (string-append system "/20200326/" program)) + ("x86_64-gnu" (string-append system "/20241112/" program)) ("powerpc-linux" (string-append system "/20200923/bin/" program)) ("riscv64-linux" (string-append system "/20210725/bin/" program)) (_ (string-append system "/" program @@ -366,6 +376,8 @@ (define (bootstrap-guile-url-path system) "/20150101/guile-2.0.11.tar.xz") ("i586-gnu" "/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241112/guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz") ("powerpc64le-linux" "/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz") ("riscv64-linux" @@ -390,6 +402,8 @@ (define (bootstrap-guile-hash system) (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) ("i586-gnu" (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")) + ("x86_64-gnu" + (base32 "06a26dd1r6svcxi6wk9xcdc8ldnxm0p51cnq1klghbc4djarmg6v")) ("powerpc-linux" (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")) ("riscv64-linux" @@ -599,6 +613,8 @@ (define %bootstrap-coreutils&co "/20210106/static-binaries-0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241112/static-binaries-0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/static-binaries.tar.xz") ("riscv64-linux" @@ -626,6 +642,9 @@ (define %bootstrap-coreutils&co ("i586-gnu" (base32 "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) + ("x86_64-gnu" + (base32 + "118s161df8hgrdfph2w5spnrms02rh1dk7mzfvx1k1prvgngpm9p")) ("powerpc-linux" (base32 "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")) @@ -682,6 +701,8 @@ (define %bootstrap-binutils "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241112/binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/binutils-2.35.1.tar.xz") ("riscv64-linux" @@ -712,6 +733,9 @@ (define %bootstrap-binutils ("i586-gnu" (base32 "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) + ("x86_64-gnu" + (base32 + "1nibcgqqkqvpqs9636an2ikiybz0mn6vqhl57hvfs6cxfylm5c5x")) ("powerpc-linux" (base32 "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")) @@ -772,6 +796,8 @@ (define %bootstrap-glibc "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20240816/glibc-stripped-2.39-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241112/glibc-stripped-2.39-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/glibc-2.32.tar.xz") ("riscv64-linux" @@ -802,6 +828,9 @@ (define %bootstrap-glibc ("i586-gnu" (base32 "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2")) + ("x86_64-gnu" + (base32 + "1dcgrnlxbsdic0xmmrjbr8gl6ra5y2xbj8f8jr6y0zvpdyi12ldd")) ("powerpc-linux" (base32 "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) @@ -878,6 +907,8 @@ (define %bootstrap-gcc "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") + ("x86_64-gnu" + "/20241112/gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/gcc-5.5.0.tar.xz") ("riscv64-linux" @@ -908,6 +939,9 @@ (define %bootstrap-gcc ("i586-gnu" (base32 "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) + ("x86_64-gnu" + (base32 + "0vqvjvw6xi16lihiqz4mhisfwx3dgs15y60q07ksdkgvi1wdli2w")) ("powerpc-linux" (base32 "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rfmirq7w")) diff --git a/guix/packages.scm b/guix/packages.scm index f373136d22..403217d711 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Simon Tournier +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -419,7 +420,7 @@ (define %32bit-supported-systems (define %64bit-supported-systems ;; This is the list of 64-bit system types that are supported. '("x86_64-linux" "mips64el-linux" "aarch64-linux" "powerpc64le-linux" - "riscv64-linux")) + "riscv64-linux" "x86_64-gnu")) (define %supported-systems ;; This is the list of system types that are supported. By default, we @@ -428,14 +429,15 @@ (define %supported-systems (define %hurd-systems ;; The GNU/Hurd systems for which support is being developed. - '("i586-gnu")) + '("i586-gnu" "x86_64-gnu")) (define %cuirass-supported-systems ;; This is the list of system types for which build machines are available. ;; ;; XXX: MIPS is unavailable in CI: ;; . - (fold delete %supported-systems '("mips64el-linux" "powerpc-linux" "riscv64-linux"))) + (fold delete %supported-systems '("mips64el-linux" "powerpc-linux" + "riscv64-linux" "x86_64-gnu"))) (define (maybe-add-input-labels inputs) "Add labels to INPUTS unless it already has them." diff --git a/m4/guix.m4 b/m4/guix.m4 index b93daba5c3..8c2757a8b7 100644 --- a/m4/guix.m4 +++ b/m4/guix.m4 @@ -3,6 +3,7 @@ dnl Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020, 2021 Ludovic Co dnl Copyright © 2014 Mark H Weaver dnl Copyright © 2017, 2020, 2021, 2023 Efraim Flashner dnl Copyright © 2021 Chris Marusich +dnl Copyright © 2024 Janneke Nieuwenhuizen dnl dnl This file is part of GNU Guix. dnl @@ -61,8 +62,13 @@ AC_DEFUN([GUIX_SYSTEM_TYPE], [ linux-musl*) guix_system="$machine_name-linux";; gnu*) - # Always use i586 for GNU/Hurd. - guix_system="i586-gnu";; + case "$machine_name" in + i386|i486|i586|i686) + # Always use i586 for 32bit GNU/Hurd. + guix_system="i586-gnu";; + *) + guix_system="$machine_name-gnu";; + esac;; *) # Strip the version number from names such as `gnu0.3', # `darwin10.2.0', etc. @@ -91,7 +97,7 @@ courageous and port the GNU System distribution to it (see # Currently only Linux-based systems are supported, and only on some # platforms. case "$guix_system" in - x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux|riscv64-linux|i586-gnu) + x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux|riscv64-linux|i586-gnu|x86_64-gnu) ;; mips64el-linux|powerpc-linux) AC_MSG_WARN([building Guix on `$guix_system', which is not supported]) From patchwork Tue Nov 12 16:25:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70293 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 EC7F627BBEA; Tue, 12 Nov 2024 16:31:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4009127BBE2 for ; Tue, 12 Nov 2024 16:31:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmT-0003xX-H2; Tue, 12 Nov 2024 11:30:17 -0500 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 1tAtmR-0003tj-P0 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:15 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmR-0005vg-Em for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3zs4ja7TN2S6C1TsDLnjH9kNRAV37oJfStGk9ElpvY0=; b=YlNLwcadvwac6b2o6QUSUOihaYaXoYsN/He+8Xabg/UzlWKXiRn1JS6yEJow87FvViuIggHpPrZUSCmRl7+4FAsznQea+LCLuFJBpKyLn7OJjZA0fQp8r+YrdsZpJlJEF2KMLwlfrRWfC9yyF4yr4m1I0rN0uQ5g9e+kbfrHO9HNrapkClHGQAqKrZ+rEmJuafXQuZ2bp2mZ1cZPtQEAGDRkDJDC6hzoQkstRirraHobFeRPTin8/BnW/xaN2UvNF9/5ySFx968U0JLOogIKsDI3gEo26gYmlQkXR/D+7HdxODaFQT+CCFdjmMVv0RQjizwSh0ZX92N6Po/JkZDAqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmR-0000XC-88 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 15/40] system: image: Add hurd64 image types. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289741264 (code B ref 74290); Tue, 12 Nov 2024 16:30:15 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:34 +0000 Received: from localhost ([127.0.0.1]:39111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtll-0000K9-9a for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlZ-0000H5-Db for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:22 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjN-0005MI-QC; Tue, 12 Nov 2024 11:27:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=3zs4ja7TN2S6C1TsDLnjH9kNRAV37oJfStGk9ElpvY0=; b=KjOGf/0PvjOL2YOZbUHd 1XpERitmHVrvsSQET+ZzQsBYnmt7AQoZSb681KG+KnP5XGGYD5DzqrAnvzHYBGWNAX5iSHjGl+ERK IJHcFxqqxXoCEtsp/ENbgRoWXuAAFJBlsN9WCgzKB0EOVnr3wgErMEEmJMLQ3H+QnH64upnwgHPDO 9KujO5zyN59kUlT1TMI13bSzGtYbUAFIzrkRJ0JgNfZgQ5G7euFdHOHVcKmri1V8dKg9fwpGjOjA6 bj0bJJFXDw0Lt4qq8B7DgLSnKunj9bDkYUMtf6NEz3T2Bg3lqieVX3sCnkWxh8g8BIfyOYlHT6ors TAxogKZqAuGQpw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:24 +0100 Message-ID: <393e1a7d799e913bb4343cb03fa00f772404c607.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/system/hurd.scm (%hurd64-default-operating-system-kernel, %hurd64-default-operating-system): New variables. * gnu/system/images/hurd.scm (hurd64-disk-image, hurd64-image-type, hurd64-qcow2-image-type, hurd64-barebones-disk-image, hurd64-barebones-qcow2-image): New variables. * gnu/system/images/hurd.scm (hurd64-barebones-os): New variable. --- gnu/system/hurd.scm | 17 +++++++++ gnu/system/images/hurd.scm | 72 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 9a351529e8..6263d3de71 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -18,6 +18,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu system hurd) + #:use-module (ice-9 match) #:use-module (guix gexp) #:use-module (guix profiles) #:use-module (guix utils) @@ -51,6 +52,8 @@ (define-module (gnu system hurd) %desktop-services/hurd %hurd-default-operating-system %hurd-default-operating-system-kernel + %hurd64-default-operating-system + %hurd64-default-operating-system-kernel %setuid-programs/hurd)) ;;; Commentary: @@ -68,6 +71,14 @@ (define %hurd-default-operating-system-kernel (%current-target-system #f)) gnumach))) +(define %hurd64-default-operating-system-kernel + (if (system-hurd?) + gnumach + ;; A cross-built GNUmach does not work + (with-parameters ((%current-system "x86_64-linux") + (%current-target-system #f)) + gnumach))) + (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty is to ;; shepherd the herd, but also because we want its 'halt' and 'reboot' @@ -142,3 +153,9 @@ (define %hurd-default-operating-system (essential-services (hurd-default-essential-services this-operating-system)) (privileged-programs '()) (setuid-programs %setuid-programs/hurd))) + +(define %hurd64-default-operating-system + (operating-system + (inherit %hurd-default-operating-system) + (kernel %hurd64-default-operating-system-kernel))) + diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 01c422a54f..67815aeb9b 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Mathieu Othacehe -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,7 +36,14 @@ (define-module (gnu system images hurd) hurd-image-type hurd-qcow2-image-type hurd-barebones-disk-image - hurd-barebones-qcow2-image)) + hurd-barebones-qcow2-image + + hurd64-barebones-os + hurd64-disk-image + hurd6-image-type + hurd64-qcow2-image-type + hurd64-barebones-disk-image + hurd64-barebones-qcow2-image)) (define hurd-barebones-os (operating-system @@ -62,6 +69,30 @@ (define hurd-barebones-os (password-authentication? #t))) %base-services+qemu-networking/hurd)))) +(define hurd64-barebones-os + (operating-system + (inherit %hurd64-default-operating-system) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext2")) + %base-file-systems)) + (host-name "guixygnu") + (timezone "Europe/Amsterdam") + (packages (cons openssh-sans-x %base-packages/hurd)) + (services (cons (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (use-pam? #f) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + %base-services+qemu-networking/hurd)))) + (define hurd-initialize-root-partition #~(lambda* (#:rest args) (apply initialize-root-partition @@ -115,5 +146,42 @@ (define hurd-barebones-qcow2-image #:type hurd-qcow2-image-type)) (name 'hurd-barebones.qcow2))) + +;;; +;;; 64bit Hurd +;;; +(define hurd64-disk-image + (image + (inherit hurd-disk-image) + (platform x86_64-gnu))) + +(define hurd64-image-type + (image-type + (name 'hurd64-raw) + (constructor (cut image-with-os hurd64-disk-image <>)))) + +(define hurd64-qcow2-image-type + (image-type + (name 'hurd64-qcow2) + (constructor (lambda (os) + (image + (inherit hurd64-disk-image) + (format 'compressed-qcow2) + (operating-system os)))))) + +(define hurd64-barebones-disk-image + (image + (inherit + (os+platform->image hurd64-barebones-os x86_64-gnu + #:type hurd64-image-type)) + (name 'hurd64-barebones-disk-image))) + +(define hurd64-barebones-qcow2-image + (image + (inherit + (os+platform->image hurd64-barebones-os x86_64-gnu + #:type hurd64-qcow2-image-type)) + (name 'hurd64-barebones.qcow2))) + ;; Return the default image. hurd-barebones-qcow2-image From patchwork Tue Nov 12 16:25:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70300 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 33DFC27BBE2; Tue, 12 Nov 2024 16:31:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 496F227BBE9 for ; Tue, 12 Nov 2024 16:31:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmU-0003yo-5x; Tue, 12 Nov 2024 11:30:18 -0500 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 1tAtmS-0003wG-Mm for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:16 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmS-0005vo-5b for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=0Q8BSZH9F1mogIzJkXEZeKbFtAB7kmxUHmYS6qb8Iro=; b=YYJCyBVj7MCaUL9Hk7Yz0WkUUy0jMHoy30r6uApvD+fZvwSuOdMh3QBkl8paITtjdwpMzPez5B8NbzvLfxC7QOzS3mluxpDsVB2DWF90crLv9pF0tVTz2Dn2Gk1ErOd/nCVwlmwmEdKNYFgJvXB6WTLOTNSPs/L7MBuUpV1rJ1o76ROzQpBoQInqFzVI/3ZoFkK+WbhJPB8yOKf69iu+IFcrjWTvU6uArJze0CZRv5zKU79/A0YzghUJuSq+afYpCQKMcwykqgStBgUkyJ2hGILH93PGyF0owACaf/VPSlmBJmFtKC31SJ3a4nAcEBR+TU6yoMNq+HVkrvG3skmFMA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmS-0000XR-0C for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 16/40] gnu: Add libgpg-error-1.50. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289751286 (code B ref 74290); Tue, 12 Nov 2024 16:30:15 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:35 +0000 Received: from localhost ([127.0.0.1]:39117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlm-0000KL-3e for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlZ-0000H6-Dd for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:22 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjO-0005MU-P6; Tue, 12 Nov 2024 11:27:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=0Q8BSZH9F1mogIzJkXEZeKbFtAB7kmxUHmYS6qb8Iro=; b=dakN/NTFKT4CCgDwVvs5 QLVGwTOINLjaDJKXXJu42H8ia7/fe0w4kwZ4825v5vM2y32TGENdjsF1tOgbh5qt+2Dh4/7sUV8Dx Y8I29sXmbCh3V0vt7MvjUXMf6xigSBBTkRu8wFASLck/jv6Vg2/n3QA2+7Ii7zGz0wjG2NHT7rYvB rY47cJdgBxVwxb5xiBwtd0c+AUUTBAyXpkh7xmGf05MekZls8Ipfal7Scva8aaZLjTYeHIpkOFEb2 J3ZNdROg7bUcQXwEJU+WCHu1Beylsuz5VnkYX3PwD4FXDgiAZTKu6nsQPRBlYdgOrYLu9PRlveRw3 AfpcYO6Hn/a9uw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:25 +0100 Message-ID: <063156615284b14ea316a35cebb9636f0202742c.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnupg.scm (libgpg-error-1.50): New variable. Change-Id: Ia34c0f339f331420d76b2c840205f29e511d1dcc --- gnu/packages/gnupg.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2e97c2244a..a4863542f2 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2021 Nikita Domnitskii ;;; Copyright © 2021 Aleksandr Vityazev ;;; Copyright © 2022, 2023 Maxim Cournoyer -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -164,6 +164,19 @@ (define-public libgpg-error (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/libgpg-error"))))) +(define-public libgpg-error-1.50 + (package + (inherit libgpg-error) + (version "1.50") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/libgpg-error/libgpg-error-" + version ".tar.bz2")) + (sha256 + (base32 + "02p2jgz95688ib28sl4aa624cj0liz73anwcl92f8cx6w14m6h39")))))) + (define-public libgcrypt (package (name "libgcrypt") From patchwork Tue Nov 12 16:25:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70303 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 9637627BBEA; Tue, 12 Nov 2024 16:31:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 55DB827BBE9 for ; Tue, 12 Nov 2024 16:31:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmU-00040V-O7; Tue, 12 Nov 2024 11:30:18 -0500 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 1tAtmT-0003xS-FE for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:17 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmT-0005x4-4u for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=6UN3E66LwSQz+zuLe6syFhhjnZVqBglUvR+s+GDG5y4=; b=fJ+1tm+/2cUg7SPEDBWBSY6chIyarfyTfHW4UYkbW1uWsxXQw4VntEJUgGBjuoq4/DULt+HwVjVoG2Fl3teEGo1xdegVOCzEu9AodftQrA3YiUzfIeMxJzZdMMNTJe2UQAjJsk5JraWOCpksoKbFCeKunpXIhzV9aleR0Ril3oEPEbH6BLvm6a/JSHS99carvtTdzWTrUhfKdR3yhYro9DO8IhQI5TV2BYiHkwjYVNjxqtBLpdbeE7c+Qnsds95ETYsfoy9AUXNj4/QnGe8HQZ5LkLeNZ7/I7ByjpgpGXWfAPmhpuDeNk7TP+74vtdSr41XYRH8aQQ4WEBDZ08LKVQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmT-0000Xh-0W for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:17 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 17/40] gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289761307 (code B ref 74290); Tue, 12 Nov 2024 16:30:16 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:36 +0000 Received: from localhost ([127.0.0.1]:39125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtln-0000Kq-Ro for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlb-0000HV-Fc for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjP-0005Mg-TI; Tue, 12 Nov 2024 11:27:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=6UN3E66LwSQz+zuLe6syFhhjnZVqBglUvR+s+GDG5y4=; b=QZr5xzAq5gvnwaKs0Pco 5wrtyDDafwt3IX7w0ASg6WDsp6AGsU5PjDhufcuLMn/HZLjwEmtHFAJ+ME/WfrcE3qRXM0taLVq9O N7rfcuxugvJydATXJMBD9ToK/mhKU+lnOUieO/D137KxSUCocgptEHPpfBeTpry85X1acc3+B6AIF IaNTfTSwHfm9MAKhAwcIGL3q98oEcA8wMDV9y3Bvc/LRCqc/K2SBL5L0lBasMbo3XZlVJ+SJpuur/ z1T007KtH9CiLX+4a56gSbFQaACD1iIbEKo49oNYhVLmu+zT2ypT9aFcYduf/kmipQ5OlisZlidck 6Ma1+tJ74NHNUg==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:26 +0100 Message-ID: <8dc78d1028c40206a6fc87197c3de2a5cce95dd8.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnupg.scm (libgcrypt)[propagated-inputs]: When building for the 64bit Hurd, use libgcrypt-1.50. Change-Id: I608d283a4a307527d5b09a81fa1a53cec5d6bb76 --- gnu/packages/gnupg.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a4863542f2..6c6efff026 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -190,7 +190,9 @@ (define-public libgcrypt "1pp9zyx02bzgzjzldxf0mx9kp3530xgaaqcz4n2cv100ddaaw57g")))) (build-system gnu-build-system) (propagated-inputs - `(("libgpg-error-host" ,libgpg-error))) + `(("libgpg-error-host" ,(if (target-hurd64?) + libgpg-error-1.50 + libgpg-error)))) (native-inputs ;; Needed here for the 'gpg-error' program. `(("libgpg-error-native" ,libgpg-error))) From patchwork Tue Nov 12 16:25:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70287 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 0562C27BBEA; Tue, 12 Nov 2024 16:30:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 A5CC027BBE9 for ; Tue, 12 Nov 2024 16:30:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmW-00040l-Dz; Tue, 12 Nov 2024 11:30:20 -0500 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 1tAtmS-0003wz-W6 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:17 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmS-0005wM-N0 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=P/MMktGnhzYi8k7FGo8p1orL+OxYAsbOhgD6lzSd7YU=; b=LDEAQhUV0qtlnHPdUdZ6Lfu18IdEGYdc80SwD/j+7gXATM+8Rc1avTIQS0jewL5VDgcSUeF0BE9BApEQ1drO0tVnqAYdcFdv9IS974i8ie56qZzBn7+nyl2Mw9arh7TQ9gtglrdyrikbviSv/O68hJn6Cn/PnoTOroVMY13ejSHliOGb/RzKgrsM9NWNNWx7Q80XOfy82X+kRyXU3GrcMPejnrZyC/9+Kk9csqIyXH/7tNlKBp42CkXosFhNT9Gh/PE9AhEuhinUJOPA6AxkeP5tGcoeljJJJOb+VLIZo8x+rfwEhpBPOLnMTtl+9ZuvRMUl+l8DVrQOJ9qVgAPhEQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmS-0000XZ-HM for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 18/40] gnu: perl: Support cross-building for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289761293 (code B ref 74290); Tue, 12 Nov 2024 16:30:16 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:36 +0000 Received: from localhost ([127.0.0.1]:39119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtln-0000Kh-9r for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlb-0000HU-Fc for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:23 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjQ-0005Ms-RN; Tue, 12 Nov 2024 11:27:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=P/MMktGnhzYi8k7FGo8p1orL+OxYAsbOhgD6lzSd7YU=; b=CzRfaV3qynJjlgdbGQ2A 3xGJqfv33nKmWGc3lZIQBl0c768mQGxGvZKLmm7dhqUwJ1m2bcSVCuqDs0NVCv8dKeXQ5yQ6qU2J+ dWaecVOxiiAu1HjB0efn71RTWfQCwlM73Cph+Yqbz9x6Cq3dhD/VF5euT17v6vs+1Wqe7rSesZNPt kn2K90ZVYYkHGTp7ahZX6Db4TeMvMwy/bzhAHjPlwdsCK+V5PjHL65KKbxUsdiyXxshWZuMkJBkpB Jg1HrCl9WAvtj3y+8CbMCknJJiQisC++/r+pObkE4fYKD+cAe99pm0/W+gy2PYtWYZJbJEs7n20N9 OcPnqN43ML17gw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:27 +0100 Message-ID: <781fce468514304963ebfe976cf2ede2417a905b.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cross-base.scm (perl)[native-inputs]: When cross-building for the 64bit Hurd, use perl-cross-1.6. Change-Id: I4a77f51a6757ad4aed9bcca8f9bbbf2cbd162e15 --- gnu/packages/perl.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index faaac13bf1..2ea7c49419 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -248,14 +248,18 @@ (define-public perl (native-inputs (if (%current-target-system) `(("perl-cross" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/arsv/perl-cross") - (commit "1.4"))) - (file-name (git-file-name "perl-cross" "1.4")) - (sha256 - (base32 "1ydjvlhrk06ccyj4bm8by7xk90krsll2k380mc3x1mhfrc7r9gzy"))))) + ,(let ((version (if (target-hurd64?) "1.6" "1.4")) + (hash + (if (target-hurd64?) + "0s06lkx5b79r9cn6pm5p6d4jbdjq7wg7rjr75nw5xdhw1z3wnl2d" + "1ydjvlhrk06ccyj4bm8by7xk90krsll2k380mc3x1mhfrc7r9gzy"))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/arsv/perl-cross") + (commit version))) + (file-name (git-file-name "perl-cross" version)) + (sha256 (base32 hash)))))) '())) (native-search-paths (list (search-path-specification (variable "PERL5LIB") From patchwork Tue Nov 12 16:25:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70299 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 9810627BBEA; Tue, 12 Nov 2024 16:31:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D68DA27BBE2 for ; Tue, 12 Nov 2024 16:31:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmX-00042C-D7; Tue, 12 Nov 2024 11:30:21 -0500 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 1tAtmT-0003yd-VC for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmT-0005xQ-Lc for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=+z1kGw4qXnurR/Dh5fnR/Tee02LV1742vTHy3OmQhLI=; b=Wg0vblGZGXTbTSXiIZSpkC08rcJBLtkth+hU26T9t62KuaZBUbMwTjqRnYguLpajPE3SXSFXGK/Ldxs+Lg178vNGvgJm0UlVTfz/InRLrlNAaFoI+hut/lD5KIlkhw2q1eaj6GjyzcdxqcXdQh9AbrbmWJhUwAmJcUQtIoeM0a+0c/7VXufrbKDnIxjD1gjY5PEh/nKeHuwps5CT/qMa8i8UsWgoKInImxWRqMsftsxhHm7yRgvhr+D3o9GBeNsS7LRK/PiApgiPBhS921t1DUD7g7u7yau88Imd1S7yPOhJhR9PeqHlaLmGKUmGzLbz7txeca6UwzTzKrksSI5WBQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmT-0000Xq-G6 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:17 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 19/40] gnu: openssl-3.0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289771323 (code B ref 74290); Tue, 12 Nov 2024 16:30:17 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:37 +0000 Received: from localhost ([127.0.0.1]:39127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlo-0000Ky-HB for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtld-0000Hh-Gl for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:26 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjS-0005N4-T2; Tue, 12 Nov 2024 11:27:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=+z1kGw4qXnurR/Dh5fnR/Tee02LV1742vTHy3OmQhLI=; b=DvTQOjy4yjlA5aq+yoQc ivV4CYFeGg3OTwCQ/6X8aRr+p8NC1QFzaHyPlIPsPsr2yzHooynAtqMzfxNiE0wKKzkoqWoV1dzj3 l60OLJU1E37P6W95k3Jax7iQFgTvYPq64KYP6DksEN1sQJ5W13SVkkBG6xQpm0o2KntbyvuXe0mgW 0j0f/C9y0iYqQ9kzNOuSdSEIyHU49wSMmQC1Hd89N2XB5/Eoyggm28ELgRq747MITCTad+hEgHg6L x3FqGcRm43t7zs3sY3M9exYOt/dypxDaOpIPmgS35Hi4VjFzkhFUeJbDtPGMexk57RNggyLTEuGU/ B2TMf4GcFdZh+A==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:28 +0100 Message-ID: <9f00bfe5365aabf524069f8a5d435fecdf9016b5.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/openssl-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/tls.scm (openssl-3.0)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + gnu/packages/patches/openssl-hurd64.patch | 99 +++++++++++++++++++++++ gnu/packages/tls.scm | 9 +++ 3 files changed, 109 insertions(+) create mode 100644 gnu/packages/patches/openssl-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index c952e090ec..a7e5e903e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1893,6 +1893,7 @@ dist_patch_DATA = \ %D%/packages/patches/opensles-add-license-file.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ %D%/packages/patches/openssl-3.0-c-rehash-in.patch \ + %D%/packages/patches/openssl-hurd64.patch \ %D%/packages/patches/opentaxsolver-file-browser-fix.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \ diff --git a/gnu/packages/patches/openssl-hurd64.patch b/gnu/packages/patches/openssl-hurd64.patch new file mode 100644 index 0000000000..372fda834a --- /dev/null +++ b/gnu/packages/patches/openssl-hurd64.patch @@ -0,0 +1,99 @@ +Upstream-status: Taken from upstream: + +. + +From 795699363be8f717e36802c3ac503011b74ad752 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Thu, 7 Nov 2024 14:08:05 +0100 +Subject: [PATCH] Add support for the 64bit Hurd. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +Taken from . +--- + Configurations/10-main.conf | 45 ++++++++++++++++++++++++++++++++----- + util/perl/OpenSSL/config.pm | 3 ++- + 2 files changed, 41 insertions(+), 7 deletions(-) + +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index b578a3c2a8..740460ebd3 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -1685,20 +1685,53 @@ my %targets = ( + }, + + ##### GNU Hurd +- "hurd-x86" => { ++ "hurd-generic32" => { + inherit_from => [ "BASE_unix" ], + CC => "gcc", +- CFLAGS => "-O3 -fomit-frame-pointer -Wall", ++ CXX => "g++", ++ CFLAGS => picker(default => "-Wall", ++ debug => "-O0 -g", ++ release => "-O3"), ++ CXXFLAGS => picker(default => "-Wall", ++ debug => "-O0 -g", ++ release => "-O3"), + cflags => threads("-pthread"), +- lib_cppflags => "-DL_ENDIAN", ++ cxxflags => combine("-std=c++11", threads("-pthread")), + ex_libs => add("-ldl", threads("-pthread")), +- bn_ops => "BN_LLONG", +- asm_arch => 'x86', +- perlasm_scheme => 'elf', ++ bn_ops => "BN_LLONG RC4_CHAR", + thread_scheme => "pthreads", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", ++ shared_ldflag => sub { $disabled{pinshared} ? () : "-Wl,-znodelete" }, ++ }, ++ ++ "hurd-generic64" => { ++ inherit_from => [ "hurd-generic32" ], ++ bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", ++ }, ++ ++ #### X86 / X86_64 targets ++ "hurd-x86" => { ++ inherit_from => [ "hurd-generic32" ], ++ CFLAGS => add(picker(release => "-fomit-frame-pointer")), ++ cflags => add("-m32"), ++ cxxflags => add("-m32"), ++ lib_cppflags => add("-DL_ENDIAN"), ++ bn_ops => "BN_LLONG", ++ asm_arch => 'x86', ++ perlasm_scheme => 'elf', ++ }, ++ ++ "hurd-x86_64" => { ++ inherit_from => [ "hurd-generic64" ], ++ cflags => add("-m64"), ++ cxxflags => add("-m64"), ++ lib_cppflags => add("-DL_ENDIAN"), ++ bn_ops => "SIXTY_FOUR_BIT_LONG", ++ asm_arch => 'x86_64', ++ perlasm_scheme => 'elf', ++ multilib => "64", + }, + + ##### VxWorks for various targets +diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm +index 2f1edcafb6..707db71537 100755 +--- a/util/perl/OpenSSL/config.pm ++++ b/util/perl/OpenSSL/config.pm +@@ -92,7 +92,8 @@ my $guess_patterns = [ + [ 'IRIX64:.*', 'mips4-sgi-irix64' ], + [ 'Linux:[2-9]\..*', '${MACHINE}-whatever-linux2' ], + [ 'Linux:1\..*', '${MACHINE}-whatever-linux1' ], +- [ 'GNU.*', 'hurd-x86' ], ++ [ 'GNU:.*86-AT386', 'hurd-x86' ], ++ [ 'GNU:.*86_64-AT386', 'hurd-x86_64' ], + [ 'LynxOS:.*', '${MACHINE}-lynx-lynxos' ], + # BSD/OS always says 386 + [ 'BSD\/OS:4\..*', 'i486-whatever-bsdi4' ], +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 43806e24da..fab88518ce 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -589,6 +589,15 @@ (define-public openssl-3.0 "/bin/perl")))) #$@(if (target-hurd?) #~((delete 'patch-configure)) + #~()) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "openssl-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" + patch-file))))) #~()))) ((#:configure-flags flags #~'()) (if (system-hurd?) From patchwork Tue Nov 12 16:25:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70289 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 52C6E27BBEA; Tue, 12 Nov 2024 16:30:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 BF16527BBE2 for ; Tue, 12 Nov 2024 16:30:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmb-00045u-33; Tue, 12 Nov 2024 11:30:25 -0500 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 1tAtmU-00040T-Mg for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmU-0005xe-6O for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=0pGbNXQPzZAf36OWD8QsC597PmBRo8onmdJV6El6BYs=; b=kvC/f5UNYyWtivnzpfREIP+TtxWZsDK1YmryM5oc809fndFZ6kTQ5k9+DyfpWf0LB2kz8+7ew6gslVnginNoH6t2VZMfLRWGcuqKokSOqC6+mhHw25k2ednTpN/oT3wYWwlcLnErrVtEtqkFhXqvyrr+VZEZe6N+fGN1ADTNdywavU6jshycFiirYgCI1ZmXoqnz5lRhpOuMfHBwosQCS2nzkZUkYGA4Taao+Xb56XAbPhQCgPs+WzNXRPTlWZBy40t55hgx5/omL4O7l+exPxLhMJmVT7ZQS+mqYsyiAsSn/XOmQoAxlZzIyohB0ZAJqEU0vnsMSkm/pE1+yHnMtg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmT-0000Y0-Vz for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 20/40] gnu: pciutils: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289781331 (code B ref 74290); Tue, 12 Nov 2024 16:30:17 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:38 +0000 Received: from localhost ([127.0.0.1]:39129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlp-0000LI-Ja for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlf-0000IA-IX for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjT-0005ND-VD; Tue, 12 Nov 2024 11:27:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=0pGbNXQPzZAf36OWD8QsC597PmBRo8onmdJV6El6BYs=; b=ZyE5Wgi4eyd3RX48wo/E dWJBLmgPV+sxWV6ZlhUK3U9oePs8XG9VklgzA+WugUp79wleiRpqjqpy6JSLf/EUY112p6qS+q3nh pr/ATTpb5HGLjUtoQHE/n96KQl05h3uWoW2sXbUypuDvB6LdXjyoeVvSz0lIQLj6jank8CE5PSatd N3ZsRfGgZPzLtIGZIcbGX1ZmiLyBB93KccGoUCiEF9KofFf1G07wwfh4zB4vLT35+X0KZeYBvJkze 96OZvBAe+62cySqOMw2Kth30CX07I8FRfsfhmGyZuQ3+tbpUujh479D2jcmmknvmSMgtoB6VaRg4K apfnms6g3Up/Vw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:29 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/pciutils-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/pciutils.scm (pciutils)[arguments]: Use g-expressions. When building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + gnu/packages/patches/pciutils-hurd64.patch | 31 ++++++++++++++++++++++ gnu/packages/pciutils.scm | 25 +++++++++++------ 3 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/pciutils-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index a7e5e903e3..34023909a1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1908,6 +1908,7 @@ dist_patch_DATA = \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/password-store-tree-compat.patch \ + %D%/packages/patches/pciutils-hurd64.patch \ %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ diff --git a/gnu/packages/patches/pciutils-hurd64.patch b/gnu/packages/patches/pciutils-hurd64.patch new file mode 100644 index 0000000000..316f12e131 --- /dev/null +++ b/gnu/packages/patches/pciutils-hurd64.patch @@ -0,0 +1,31 @@ +Upstream-status: Not presented upstream. + +--- pciutils-3.8.0/lib/hurd.c.orig 2024-11-07 15:09:20.728973822 +0100 ++++ pciutils-3.8.0/lib/hurd.c 2024-11-07 15:05:08.524682813 +0100 +@@ -213,7 +213,7 @@ + hurd_read(struct pci_dev *d, int pos, byte * buf, int len) + { + int err; +- size_t nread; ++ mach_msg_type_number_t nread; + char *data; + mach_port_t device_port = device_port_lookup(d); + +@@ -266,7 +266,7 @@ + mach_port_t device_port = device_port_lookup(d); + struct pci_bar regions[6]; + char *buf = (char *) ®ions; +- size_t size = sizeof(regions); ++ mach_msg_type_number_t size = sizeof(regions); + + int err = pci_get_dev_regions(device_port, &buf, &size); + if (err) +@@ -305,7 +305,7 @@ + struct pci_xrom_bar rom; + mach_port_t device_port = device_port_lookup(d); + char *buf = (char *) &rom; +- size_t size = sizeof(rom); ++ mach_msg_type_number_t size = sizeof(rom); + + int err = pci_get_dev_rom(device_port, &buf, &size); + if (err) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index d2a352eb6b..08f1634113 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2022 Brendan Tildesley ;;; Copyright © 2022 Marius Bakke ;;; @@ -81,25 +81,34 @@ (define-public pciutils "01aglgw9ds9qiswcbi2lx90lswncikrlyv8mmp4haix8542bvvci")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + (list + #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'unbundle-pci.ids (lambda* (#:key native-inputs inputs #:allow-other-keys) (copy-file (search-input-file (or native-inputs inputs) "share/hwdata/pci.ids") "pci.ids"))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "pciutils-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" - ,@(if (%current-target-system) - `((("^CROSS_COMPILE=.*$") + #$@(if (%current-target-system) + #~((("^CROSS_COMPILE=.*$") (string-append "CROSS_COMPILE=" - ,(%current-target-system) "-" + #$(%current-target-system) "-" "\n")) (("^HOST=.*$") (string-append "HOST=" - ,(gnu-triplet->nix-system + #$(gnu-triplet->nix-system (%current-target-system)) "\n")) ;; Disable 'install' strip option, that would fail when ;; we are cross-compiling. @@ -139,7 +148,7 @@ (define-public pciutils (invoke "make" "install" "install-lib")))) ;; Make sure programs have an RPATH so they can find libpciutils.so. - #:make-flags (list ,(string-append "CC=" + #:make-flags #~(list #$(string-append "CC=" (if (%current-target-system) (cc-for-target) "gcc")) From patchwork Tue Nov 12 16:25:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70295 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 8C7DA27BBE2; Tue, 12 Nov 2024 16:31:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 ADCCE27BBE9 for ; Tue, 12 Nov 2024 16:31:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmZ-00044l-Jm; Tue, 12 Nov 2024 11:30:23 -0500 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 1tAtmV-00040g-5K for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:19 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmU-0005xk-Ss for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ePHU5oGULiK5Of28vD9j/MrGEdQXLa9lVkkv97eIsBI=; b=TLOtitb/Zk0KS+2gijkXqJ1WUNOq7RYXbEsqmhmFYn3rfD0Gx6ojT/J3EsLMWxXfF/XSYhc1zYTmV/sooF4g+TJg0b1Uw1vaWAH2AmN0n1jgU6ZkbtdWtPHNLEeHGzZrYuvsd1ULQBIpUKw3ov/AAksaSjVHrAYfqz1/IJ+82bEzmOmsTlGedm6cxWsshkYY72LIQe/ppDUx6PjIVGcCEM0bqJA7dObi42m6aGBoCKcQrAxlmR7yE3BrKD51tcsTtBjeaRK4Ijqny03Tx2nkTcCO2H7SUewYZomKkhjnpPu8WYo0KmC0plZl9/v4MFHdQcxEBSTJG0gXOphQA7uIMQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmU-0000Y8-Ea for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 21/40] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289791348 (code B ref 74290); Tue, 12 Nov 2024 16:30:18 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:39 +0000 Received: from localhost ([127.0.0.1]:39133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlq-0000LW-Hr for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlf-0000IB-IQ for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:28 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjU-0005NM-RD; Tue, 12 Nov 2024 11:27:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ePHU5oGULiK5Of28vD9j/MrGEdQXLa9lVkkv97eIsBI=; b=EJ0e0P6YHn7caF4h7Qi0 SuRgiBrAnRL2BGzB5xN7JYafUVwPzW9MKlrvZUvmrWEZx3z6sRfXDBRjBK+f44BxQF8XA1eeMu8rz HiKnXJPH/JusxgprGmRN32lnAI5ZqlfUaQhMXlYqtg/q8k22Gjm3GO9ouq+pLa6+dWzYDV+ShCzlX QcrENTamCHIYCCxmg7Rephcjhc3XouBJlqdJj70TETD7GFIjrC5Oy/6QGHsxYEHe7zID9moy5PP9z L+2CJjcuiMSwG6s7CtwbBjUwblOKhnI4lDEIZHc7I/JVFdhcNDvCZ0hxQGdDAPvBX4XqxQGrWJBXi BbJdxkPZFYwwbA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:30 +0100 Message-ID: <68c9662ea16fdb7498a7a10ad36eafc923db5570.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/libpciaccess-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/xorg.scm (libpciaccess) [arguments]: Use g-expressions. When building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/local.mk | 1 + .../patches/libpciaccess-hurd64.patch | 58 +++++++++++++++++++ gnu/packages/xorg.scm | 23 +++++--- 3 files changed, 75 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 34023909a1..8c4f052b75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1703,6 +1703,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ + %D%/packages/patches/libpciaccess-hurd64.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ diff --git a/gnu/packages/patches/libpciaccess-hurd64.patch b/gnu/packages/patches/libpciaccess-hurd64.patch new file mode 100644 index 0000000000..f7e11059b1 --- /dev/null +++ b/gnu/packages/patches/libpciaccess-hurd64.patch @@ -0,0 +1,58 @@ +Upstream-status: Taken from upstream: + +. + +From 6cd5a4afbb70868c7746de8d50dea59e02e9acf2 Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 28 Jun 2023 01:02:34 -0400 +Subject: [PATCH] Fix compilation warnings when building against hurd-amd64. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +Passes mach_msg_type_number_t instead of size_t which have different +sizes. Example warning: + +/hurd_pci.c:101:53: warning: passing argument 3 of 'pci_get_dev_regions' from incompatible pointer type [-Wincompatible-pointer-types] + 101 | err = pci_get_dev_regions(d->device_port, &buf, &size); + | ^~~~~ + | | + | size_t * {aka long unsigned int *} +--- + src/hurd_pci.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/hurd_pci.c b/src/hurd_pci.c +index 8653e1b..9ac3813 100644 +--- a/src/hurd_pci.c ++++ b/src/hurd_pci.c +@@ -82,7 +82,7 @@ pci_device_hurd_probe(struct pci_device *dev) + struct pci_bar regions[6]; + struct pci_xrom_bar rom; + struct pci_device_private *d; +- size_t size; ++ mach_msg_type_number_t size; + char *buf; + + /* Many of the fields were filled in during initial device enumeration. +@@ -323,7 +323,7 @@ pciclient_cfg_read(mach_port_t device_port, int reg, char *buf, + size_t * nbytes) + { + int err; +- size_t nread; ++ mach_msg_type_number_t nread; + char *data; + + data = buf; +@@ -473,7 +473,7 @@ simple_readdir(mach_port_t port, uint32_t *first_entry) + { + char *data; + int nentries = 0; +- vm_size_t size; ++ mach_msg_type_number_t size; + + dir_readdir (port, &data, &size, *first_entry, 1, 0, &nentries); + +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 0de08a4ad1..b106a604a7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2021 Lu Hui ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2023, 2024 John Kehayias ;;; Copyright © 2023, 2024 Kaelyn Takata ;;; @@ -1157,16 +1157,17 @@ (define-public libpciaccess "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" + (list + ;; Make sure libpciaccess can read compressed 'pci.ids' files as + ;; provided by pciutils. + #:configure-flags + #~(list "--with-zlib" (string-append "--with-pciids-path=" (assoc-ref %build-inputs "pciutils") "/share/hwdata")) #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'install 'add-L-zlib (lambda* (#:key inputs outputs #:allow-other-keys) ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. @@ -1175,7 +1176,15 @@ (define-public libpciaccess (substitute* (string-append out "/lib/libpciaccess.la") (("-lz") (string-append "-L" zlib "/lib -lz"))) - #t)))))) + #t))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch "libpciaccess-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file))))) + #~())))) (inputs (list zlib pciutils)) ;for 'pci.ids.gz' (native-inputs From patchwork Tue Nov 12 16:25:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70311 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 AB7A127BBE2; Tue, 12 Nov 2024 16:31:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3704427BBE9 for ; Tue, 12 Nov 2024 16:31:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtn0-0004K9-0w; Tue, 12 Nov 2024 11:30:50 -0500 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 1tAtmV-00040o-OJ for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:20 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmV-0005xr-Cz for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=9cVS8/xpqaTCAlyXtRUMZCH5gx2IXS+Ji2GCvK80Jdw=; b=nuk827qnakY3jf3+WERBVsGGxjuqGJEnOEdPiPbF60R/OS/lciSXyn1c4jqSJaQTtlJVqEUYTJ/zmVG9b6yiqWzvJT5C5BDjWmmK1K0z1Js6AnQqLeMqUjx7/j3e4XsQ1zZStLw7zHe4Bgndz0LvU6G78JkbG4R/Ama/Nvkb2uR+bmQNgGjB+TVoOkko+E5bFcWeLpAsTo/DJ7uPVXykBUnKiFVxMIwOMJdI+Fwbfc0264/YDKCb8fFonMZF6QAUEA50w6z+zUzTtfccHQdy+gGCLvSzWzzjP4l02ujPXhT1kSYkSv3KVp4c+1/E2JrdDpmynYvpAnb2DDy6chiZcw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmV-0000YG-6i for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 22/40] gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:19 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289801355 (code B ref 74290); Tue, 12 Nov 2024 16:30:19 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:40 +0000 Received: from localhost ([127.0.0.1]:39135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlr-0000Lf-9L for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlh-0000Iq-Jk for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjV-0005NX-N0; Tue, 12 Nov 2024 11:27:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=9cVS8/xpqaTCAlyXtRUMZCH5gx2IXS+Ji2GCvK80Jdw=; b=GD4Gf2AtCBLKw17CyrQ4 u/ItlVnMClUXs1gTBYhjiBVD8W3KxOLWqiR6XxDI/QnKZzKrUmVQXJ42ilsut36Xl8sMhCVyVSINR jABhcqS8YPCmnESXz75PntgsN+bJTcFUDVUvLMV67RCU68ztywmmuGXCJAZN1MA8VDbgnR80MiOom 73ndEVVu6/TBwJjc5tTV5pVXgXL9d2UXWeAXJDNo1ArjAy6yk+hJ04Nj3NBL7lz+ftHP0T/R2mVdR DA0HMDSDCsO1JvDt7RugcRVXLe+3bWw3JIIlVr86cpwN106tK2kHSyR5NRQJ3MKLd+o5c5sb2kI/r 5ToOj9q3yRQJgw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:31 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hurd.scm (netdde): Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. (dde-sources): Update to b6c8526c703f3ba76294d9002f195c63897ec661. Change-Id: Id03f5c5124f16e9ffd6a77cbb2507d274e0f325a --- gnu/packages/hurd.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 06fae1bd3b..f9d8b28b8c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -294,7 +294,7 @@ (define unifont (define dde-sources ;; This is the current tip of the dde branch - (let ((commit "066797b576ebf8364ad157f50bef2a655597deeb")) + (let ((commit "b6c8526c703f3ba76294d9002f195c63897ec661")) (origin (method git-fetch) (uri (git-reference @@ -302,7 +302,7 @@ (define dde-sources (commit commit))) (sha256 (base32 - "19f2awlfnar5gyhi0w5zawla5brzck2s88iv0f20022pd1l5v9hl")) + "0k1ilj8ghli8x43xaksbc4y419pqh0w16k374914c07svq419bbr")) (file-name (git-file-name "dde" (string-take commit 7)))))) (define %import-from-dde @@ -561,8 +561,8 @@ (define-public hurd (license gpl2+))) (define-public netdde - (let ((commit "e67c284ac113d939b10b4578334f27dab29d5b08") - (revision "2")) + (let ((commit "c0ef248dc7c5ccc1273e2a796f3ece30c5b645df") + (revision "3")) (package (name "netdde") ;; The version prefix corresponds to the version of Linux from which the @@ -576,7 +576,7 @@ (define-public netdde (patches (list (search-patch "netdde-build-fix.patch"))) (sha256 (base32 - "0vnkls7sr7srzib5mnw6gybzl5qa8c5a4zf3h08w6gdr7zqbndh0")) + "070fpmd4nvn3mp8dj9w4if63iwz7j2m0h6ywq888znw70wlrc6sh")) (file-name (git-file-name name commit)))) (build-system gnu-build-system) (arguments From patchwork Tue Nov 12 16:25:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70317 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 2043027BBE2; Tue, 12 Nov 2024 16:32:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 2CBF827BBEA for ; Tue, 12 Nov 2024 16:32:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtme-00049C-Q6; Tue, 12 Nov 2024 11:30:28 -0500 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 1tAtmW-000414-2W for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:20 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmV-0005xy-QO for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=B7QCUjHZqjEJ1EFcc+1eHFsIoka/hzIh6yUyjrN5A4I=; b=tZMJg8Oca4wNkb9Qjsl70XVRuDeTmTqnN8Qi4CWm+eHgrb1Hhr1ncm+OwLuCqFSpZO/Agzg5NyyUV49Z2DQjPv461KgMU7O9Zhg2qNhAvA0Ww27MzZsbf/AnBczb0pnifo2UExJOMpYXLV5e1EQJ2gh+BNQ95s6hVCRgVPqn9feUumog/QWEXgQH/jAS7Hn39ONN3V6T+93vuUhwN+X+sqsgC2SPMvd4YAPRM6R5AMeCnzJq8jjnkMhKaaYCPl/revEPBOdgFyEjZQoXfIsyg5pwhaaHgyGY87ThKWUIGMniRt1YfT5U00M/ph5tHVFRSpyE1flybeQEtInpjF05Dw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmV-0000YP-Lu for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:19 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 23/40] gnu: netdde: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:19 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289801369 (code B ref 74290); Tue, 12 Nov 2024 16:30:19 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:40 +0000 Received: from localhost ([127.0.0.1]:39137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlr-0000Lo-PD for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlh-0000Ip-Jo for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:30 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjW-0005Ng-JC; Tue, 12 Nov 2024 11:27:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=B7QCUjHZqjEJ1EFcc+1eHFsIoka/hzIh6yUyjrN5A4I=; b=QRc5++hbmpK/D88EXhZq 12RAcgQQXC1w5MOmhyqR3rr2G0B+ziAq6yaGYcLteowd3AgDZU8nfjLcBfW5dfgYJS4OQpIWRweTn Gj0+6usgHwSvISr4ivu4XdPkTMx3rnXnqUTNnF0ikt9woV6govV2fuuVrgGn8BxYdK5DgEknUu2By vJOgAQlUDRXExCyLP+pebAlpO30k7a+aHG47bSWlLAeNREh+fIgjDYgNVo8QdM98DFTvqXI7/CJ+K K7u0X6UqmCTTYsW1A0Kk+F/74gdaEskK1l4ql/Ap9ffaGCoUhuv/vvUn8q3NhEUtMoQkNbHOuq3lX 41I4mRDtqSKcSA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:32 +0100 Message-ID: <52cd8b7a905961b0ea70dcfcae561792a833e3ba.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/netdde-csum.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (netdde)[source]: Use it. [arguments]: Do not assume x86, rather use actual ARCH in #:make-flags, disable -Wstrict-prototypes and -Wint-conversion, and follow upstream's "amd64" symlinking voodoo. Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 22 ++++++++++++++++++++-- gnu/packages/patches/netdde-csum.patch | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/netdde-csum.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8c4f052b75..073a95a556 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1818,6 +1818,7 @@ dist_patch_DATA = \ %D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netdde-build-fix.patch \ + %D%/packages/patches/netdde-csum.patch \ %D%/packages/patches/netpbm-CVE-2017-2586.patch \ %D%/packages/patches/netpbm-CVE-2017-2587.patch \ %D%/packages/patches/netsurf-message-timestamp.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index f9d8b28b8c..973564ee33 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -573,7 +573,8 @@ (define-public netdde (uri (git-reference (url "https://git.savannah.gnu.org/git/hurd/incubator.git") (commit commit))) - (patches (list (search-patch "netdde-build-fix.patch"))) + (patches (search-patches "netdde-build-fix.patch" + "netdde-csum.patch")) (sha256 (base32 "070fpmd4nvn3mp8dj9w4if63iwz7j2m0h6ywq888znw70wlrc6sh")) @@ -586,7 +587,13 @@ (define-public netdde (search-input-file %build-inputs "/bin/bash")) "PKGDIR=libdde_linux26" (string-append "CC=" ,(cc-for-target)) - "ARCH=x86") + (let ((arch ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "x86") + ((? target-x86-64?) + "amd64")))) + (string-append "ARCH=" arch))) #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) #:phases @@ -604,8 +611,19 @@ (define-public netdde (("/bin/bash") (which "bash"))))) (add-after 'patch-generated-file-shebangs 'build-libdde-linux26 (lambda* (#:key make-flags #:allow-other-keys) + (when ,(target-hurd64?) + (let ((dir "libdde_linux26/build/include")) + (mkdir-p (string-append dir "/x86")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/x86/amd64") "x86") + (symlink "x86" (string-append dir "/amd64")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") "asm-x86") + (symlink "asm-x86" (string-append dir "/amd64/asm-x86_64")))) (with-directory-excursion "libdde_linux26" (apply invoke "make" + (string-append "WARNINGS=-Wno-strict-prototypes" + " -Wno-int-conversion") (delete "PKGDIR=libdde_linux26" make-flags))))) (add-after 'build-libdde-linux26 'convert (lambda* (#:key make-flags #:allow-other-keys) diff --git a/gnu/packages/patches/netdde-csum.patch b/gnu/packages/patches/netdde-csum.patch new file mode 100644 index 0000000000..4fdd004898 --- /dev/null +++ b/gnu/packages/patches/netdde-csum.patch @@ -0,0 +1,18 @@ +Upstream-status: Taken from debian. + +. + +--- + linux/drivers/net/vmxnet3/vmxnet3_drv.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/linux/drivers/net/vmxnet3/vmxnet3_drv.c ++++ b/linux/drivers/net/vmxnet3/vmxnet3_drv.c +@@ -25,6 +25,7 @@ + */ + + #include "vmxnet3_int.h" ++#include + + char vmxnet3_driver_name[] = "vmxnet3"; + #define VMXNET3_DRIVER_DESC "VMware vmxnet3 virtual NIC driver" From patchwork Tue Nov 12 16:25:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70316 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 9F20E27BBEB; Tue, 12 Nov 2024 16:32:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 51DEA27BBE2 for ; Tue, 12 Nov 2024 16:32:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtme-00049S-PE; Tue, 12 Nov 2024 11:30:28 -0500 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 1tAtmW-00041c-QM for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:20 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmW-0005y5-C7 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=y9+iCAg1WrVw46boFuQTULP/2NPeZB7ptfiR4ET/Miw=; b=MvSEH6Ptmq1nJKeyuQu9xewPhP48Dga/id+dLhmYwME2pCrNu8AstWIIEklsFFwCRosjnqfyfrzlXCROoMxyy46FrjGAUmuiS8f50IOTSvwhs3CqjkAcgsZhLzZWENfl8ZbheV2k+T1VQng3lfrfbt0ar5fIVwQv4CKtzS584cHO3LS4l9fFzSUnQx7+bfPQnXGjWfms8ErRPyr7M/zrP9F5kp7+tK3GTfO+I4guUxaKkyjeXISx8XcYJciXX/GihiYeOwndsI2lwLdjSrU6vyFPviC2f5Ez6g4euu38zBQLnfk55VJha4rZPdq7CSsFbfKh0cQbt76J2SsiD1UqCg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmW-0000YW-4r for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:20 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 24/40] gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314289811382 (code B ref 74290); Tue, 12 Nov 2024 16:30:20 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:29:41 +0000 Received: from localhost ([127.0.0.1]:39143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlt-0000M8-1O for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlj-0000J4-LP for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjY-0005OV-Eb; Tue, 12 Nov 2024 11:27:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=y9+iCAg1WrVw46boFuQTULP/2NPeZB7ptfiR4ET/Miw=; b=pGALXSvZxPgkE61vPx29 qGD4o9x7FrMMjX1dS7y6yMhS4O83Eko2PkoF8idg1q4SmhrvR0yVuAc8iZronxQpT9g9Ep8ftAKhe dTNCd96loG8eFdw3Zc+EWjUhy+WQKQjU5CT3vjt2hc7yA+POvF2nC6W2aeruF0Gpv1gOREDjab/MU 1sx6kZeKYWaoid38g3DwtDu4H8BoJ6b0UJFOLmo2IYvFp694LyWyEfk5NtGgsyyPuQBs+mIB0Y1rZ o4EMoPLwE27crUY7nHGEN3sE4aIJwJnuS+1uB/OfQupbW/2OaC0glnrJLDcoO9nyNwhBn7jkYpfc+ 1/fOi8tAp3kP2A==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:33 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hurd.scm (rumpkernel): Update to f1ffd6405f225336e595a0f99f01095ed7438337. [arguments]: In stage "build", add "-Wno-error=sign-compare" to CWARNFLAGS. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05 --- gnu/packages/hurd.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 973564ee33..b156fcea4c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -665,8 +665,8 @@ (define-public netdde (license gpl2)))) (define-public rumpkernel - (let ((commit "81043d42fabda9baed7ac9ca36e3f3f5ed11ba81") - (revision "3")) + (let ((commit "f1ffd6405f225336e595a0f99f01095ed7438337") + (revision "0")) (package (name "rumpkernel") (version (git-version "0-20211031" revision commit)) @@ -680,7 +680,7 @@ (define-public rumpkernel (commit commit))) (sha256 (base32 - "0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r")) + "1ygn3ysji06ik3k44sf906fjpdmabznkspw70llldbk2zkrcdw7i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -800,7 +800,8 @@ (define-public rumpkernel " -Wno-error=stack-protector" " -Wno-error=array-parameter" " -Wno-error=array-bounds" - " -Wno-error=stringop-overflow") + " -Wno-error=stringop-overflow" + " -Wno-error=sign-compare") "-V" "LIBCRTBEGIN=" "-V" "LIBCRTEND=" "-V" "LIBCRT0=" From patchwork Tue Nov 12 16:25:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70315 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 EEE8D27BBE2; Tue, 12 Nov 2024 16:32:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 48E0A27BBEC for ; Tue, 12 Nov 2024 16:32:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtme-00049X-Pi; Tue, 12 Nov 2024 11:30:28 -0500 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 1tAtmX-00041x-3r for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:21 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmW-0005yC-S1 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Q2NtX7IDfA6q43nIMk6rOLLxA65uZVBfl0HnpJ80yvY=; b=j5UrCwsCYE23dnq39ofyjgb9hVwTnPWP5PldTzFCzwHYnyXmxej4yAydeHLJnhtHcJuoPFPtKzS/2zmdmiENe72r1/UKN9xXkh6cM56azw1PFTOaXyIA6ogjyocfdxsoVUyJC4cuUEgcMId7Uik5fKuE/J/KS4sP+HkWJXiVC9DuAUqIQjJYOyrnqdegQV+xop/IQW+FWbbOymMW/YkhD6ENKKC+dzTqHOLbaTkZS5YBm53MdTMdPk/VC1zp7KZ3mwEVEWmOTT65nie1KozRkcUi/kTeDtGSswWpgwe5yWKNi84Q5jPxh/n6xCUfT8CVu5+dwmpSMhqnw68n4/atEw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmW-0000Ye-MO for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:20 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 25/40] gnu: rumpkernel: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:20 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290001466 (code B ref 74290); Tue, 12 Nov 2024 16:30:20 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:00 +0000 Received: from localhost ([127.0.0.1]:39163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmB-0000NX-HF for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtll-0000JI-N6 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:34 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtja-0005Oh-2K; Tue, 12 Nov 2024 11:27:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Q2NtX7IDfA6q43nIMk6rOLLxA65uZVBfl0HnpJ80yvY=; b=Qosg5E/NAsuQpPRxKGvn /jv94s7qvjjrCvg0BBMtA7HVyTxRfn3KxThUUImjDbr/KF7NtvrSKbeJheDfY0ZvOvkOPx44fuWcK wFrKeY+uFtaGoYB+FDmo79hW9Jz5ifXnD57R1S90y+8JE2HSg0oeF5jG/D7N1pJK6Kb+1jpjLFvs5 GdqpkPaJtTqJqIlHw2Uy45XjKC2r1fnQZTU1m+dK5LX3PBobt/gjK1DnsKTpmrt9PaRoUTVgnZDrq f/4i1RipiQbPLH6yVfffsGCuBRlLuA0OUIGlySaN5mTWEYoA9tM4mqY2bBp2ldMQ/T6vFyqc828MR LGtXgbKTwPeeOA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:34 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hurd.scm (rumpkernel)[argument]: In stage "build", follow Debian upstream to use -DPAE disable the DTRACE and ZFS builds. Change-Id: I534da31eefb378c72b4896d64a51a73109e38aa6 --- 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 b156fcea4c..d29ec22cd7 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -781,6 +781,9 @@ (define-public rumpkernel "-V" "MKBINUTILS=no" "-V" "MKGDB=no" "-V" "MKGROFF=no" + "-V" "MKDTRACE=no" + "-V" "MKZFS=no" + "-V" (string-append "TOPRUMP=" toprump) "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" @@ -791,7 +794,8 @@ (define-public rumpkernel " -DRUMP_REGISTER_T=int" " -DRUMPUSER_CONFIG=yes" " -DNO_PCI_MSI_MSIX=yes" - " -DNUSB_DMA=1") + " -DNUSB_DMA=1" + " -DPAE") "-V" (string-append "CWARNFLAGS=" " -Wno-error=maybe-uninitialized" From patchwork Tue Nov 12 16:25:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70313 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 844CE27BBE2; Tue, 12 Nov 2024 16:31:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2B11127BBEA for ; Tue, 12 Nov 2024 16:31:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtn0-0004NU-Uc; Tue, 12 Nov 2024 11:30:50 -0500 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 1tAtmY-00043J-5I for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:22 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmX-0005yK-BA for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=KgKotDAnKp/1HS3t4Y2OQ5K4twdqXxEionqxAKTOaU0=; b=oVy8IXp5qnYFY+97nzYaif1Uyf26AFcT9zk8+LHKY5xThgHMlW6uAHMC19etwu4E/c+59pgYHGRvWfF67Z2jXXMRs+uNaEyrQYWDB5zyEbF7Tk7EXcvVwY41+QXTi8FRYDNvfVn59Cj+YbgWcZSP+nPEM0/jaYz7hA923g6+u5DMET2T/6foPEvw76LeTwstbdB+3I0IovLbtuo2aaceg4UzkHN0EhfKyMzmnMsfYcOuQGZwBtohEvqpUhzHyjepDI0TkniNNcR4lg5vOXquNQxW92ngXouzRqNex0YfDZgQe1GkZBFDy3WrKXbVdx99B4X5JazTcX/lAVcp5lnhjg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmX-0000Ym-64 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 26/40] gnu: hurd: Build fixes for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290011474 (code B ref 74290); Tue, 12 Nov 2024 16:30:21 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:01 +0000 Received: from localhost ([127.0.0.1]:39165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmC-0000Nb-7I for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtll-0000JH-Mk for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:34 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjb-0005Ot-2t; Tue, 12 Nov 2024 11:27:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=KgKotDAnKp/1HS3t4Y2OQ5K4twdqXxEionqxAKTOaU0=; b=pRa3V0LIj79Im8CmfZCq KlhcHYN1hgyuAUWTSuRDkkOeUS2zMjujZIHyUKKOIFv35Ij2KDv8R4s8rXOI+Sjh0cNp5SzcL78V3 +MTxNxjSSMihtVdX/fRkVusDV2agffgSDtuujtKLyaBohoQLBI6gThCoyujR1xEpMJju0QPlMdeg7 oKlsvziXbJrX4FwDKlCgQci1nKVGDLC4fABYCk9BjjxUNJfG6Zg36pSIPlnPilBjO9mcJjv/hkvZC RHB1qhVVtJvWZ28ADxVgelfZPF8UHpWdS3vBGNXEbnt7KyajPjweDmhKNfMoE99JjtXVynv3bQCGg JX+F7IICwxUDWw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:35 +0100 Message-ID: <433661697f325485bd9b04aaec878af8145df0ab.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/hurd-64bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (hurd)[source]: Use it. [arguments]: When building for the 64bit Hurd, add "create-machine-symlink" phase. In phases "build-libdde-linux" and "install-goodies", do not assume x86, rather use actual ARCH, disable -Wstrict-prototypes and -Wint-conversion, and follow upstream's "amd64" symlinking voodoo. Change-Id: If264a91b2433add13f9121c482f0abe67ae5f1e9 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 115 +++++++++++++++++--------- gnu/packages/patches/hurd-64bit.patch | 56 +++++++++++++ 3 files changed, 131 insertions(+), 41 deletions(-) create mode 100644 gnu/packages/patches/hurd-64bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 073a95a556..948fc4ba73 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1546,6 +1546,7 @@ dist_patch_DATA = \ %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ + %D%/packages/patches/hurd-64bit.patch \ %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ %D%/packages/patches/hurd-startup.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index d29ec22cd7..7aed0ebe1d 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -317,7 +317,8 @@ (define-public hurd (source (origin (inherit (package-source hurd-headers)) (patches (search-patches "hurd-rumpdisk-no-hd.patch" - "hurd-startup.patch")))) + "hurd-startup.patch" + "hurd-64bit.patch")))) (version (package-version hurd-headers)) (arguments `(#:tests? #f ;no "check" target @@ -467,48 +468,80 @@ (define-public hurd (find-files (string-append out "/libexec"))) #t))) (add-after 'build 'build-libdde-linux - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (invoke (string-append (assoc-ref (or native-inputs inputs) "make") - "/bin/make") - ;; XXX There can be a race condition because subdirs - ;; aren't interdependent targets in the Makefile. - "-j1" "-C" "libdde_linux26" - (string-append "SHELL=" - (assoc-ref (or native-inputs inputs) "bash") - "/bin/bash") - (string-append "CC=" - ,(cc-for-target)) - "ARCH=x86"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((arch ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "x86") + ((? target-x86-64?) + "amd64")))) + (when ,(target-hurd64?) + (let ((dir "libdde_linux26/build/include")) + (mkdir-p (string-append dir "/x86")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/x86/amd64") "x86") + (symlink "x86" (string-append dir "/amd64")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") "asm-x86") + (symlink "asm-x86" (string-append dir "/amd64/asm-x86_64")))) + (invoke (string-append (assoc-ref (or native-inputs inputs) "make") + "/bin/make") + ;; XXX There can be a race condition because subdirs + ;; aren't interdependent targets in the Makefile. + "-j1" "-C" "libdde_linux26" + (string-append "SHELL=" + (assoc-ref (or native-inputs inputs) "bash") + "/bin/bash") + (string-append "CC=" + ,(cc-for-target)) + (string-append "WARNINGS=-Wno-int-conversion" + " -Wno-strict-prototypes") + (string-append "ARCH=" arch))))) (add-after 'install 'install-goodies - (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) - ;; Install additional goodies. - ;; TODO: Build & install *.msgids for rpctrace. - (let* ((out (assoc-ref outputs "out")) - (datadir (string-append out "/share/hurd"))) - ;; Install libdde_linux26. - (invoke (string-append (assoc-ref (or native-inputs inputs) "make") - "/bin/make") - "-C" "libdde_linux26" "install" - (string-append "SHELL=" - (assoc-ref (or native-inputs inputs) "bash") - "/bin/bash") - (string-append "INSTALLDIR=" - out - "/share/libdde_linux26/build/include") - "ARCH=x86") - ;; Install the fancy UTF-8 motd. - (mkdir-p (string-append out "/etc")) - (copy-file "console/motd.UTF8" - (string-append out "/etc/motd")) + (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) + ;; Install additional goodies. + ;; TODO: Build & install *.msgids for rpctrace. + (let* ((out (assoc-ref outputs "out")) + (datadir (string-append out "/share/hurd")) + (arch ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "x86") + ((? target-x86-64?) + "amd64"))) + (dir (string-append out "/share/libdde_linux26/build/include"))) + (mkdir-p dir) + (when ,(target-hurd64?) + (mkdir-p (string-append dir "/amd64")) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") + "x86") + (symlink "x86" (string-append dir "/amd46"))) + (invoke (string-append (assoc-ref (or native-inputs inputs) "make") + "/bin/make") + "-C" "libdde_linux26" "install" + (string-append "SHELL=" + (assoc-ref (or native-inputs inputs) "bash") + "/bin/bash") + (string-append "INSTALLDIR=" dir) + (string-append "ARCH=" arch)) + (when ,(target-hurd64?) + (format #t "symlink ~a -> ~a\n" + (string-append dir "/amd64/asm-x86_64") + "asm-x86") + (symlink "asm-x86" (string-append dir "/amd64/asm-x86_64"))) + ;; Install the fancy UTF-8 motd. + (mkdir-p (string-append out "/etc")) + (copy-file "console/motd.UTF8" + (string-append out "/etc/motd")) - ;; Install the BDF font for use by the console client. - (copy-file (assoc-ref inputs "unifont") - "unifont.gz") - (invoke "gunzip" "unifont.gz") - (mkdir-p datadir) - (copy-file "unifont" - (string-append datadir "/vga-system.bdf")) - #t)))) + ;; Install the BDF font for use by the console client. + (copy-file (assoc-ref inputs "unifont") + "unifont.gz") + (invoke "gunzip" "unifont.gz") + (mkdir-p datadir) + (copy-file "unifont" + (string-append datadir "/vga-system.bdf")))))) #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") diff --git a/gnu/packages/patches/hurd-64bit.patch b/gnu/packages/patches/hurd-64bit.patch new file mode 100644 index 0000000000..643550ad68 --- /dev/null +++ b/gnu/packages/patches/hurd-64bit.patch @@ -0,0 +1,56 @@ +Upstream-status: Taken from upstream: + . + +From d494333e7607ea03819adcfb69d89f8248ec2044 Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Sun, 21 Jul 2024 17:20:55 -0400 +Subject: [PATCH] nfsd: fix -Werror=incompatible-pointer-types issues for + x86_64 +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +Message-ID: <3pmgbk2myx4phdb6wcso54solmybulrvbytols5md3nri2p2qp@xjmfmpvwjp6t> +--- + nfsd/cache.c | 2 +- + nfsd/ops.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/nfsd/cache.c b/nfsd/cache.c +index cd5524af..864739c0 100644 +--- a/nfsd/cache.c ++++ b/nfsd/cache.c +@@ -387,7 +387,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) + struct cache_handle *c; + int hash; + char *bp = fhandle.array + sizeof (int); +- size_t handlelen = NFS2_FHSIZE - sizeof (int); ++ mach_msg_type_number_t handlelen = NFS2_FHSIZE - sizeof (int); + mach_port_t newport, ref; + + /* Authenticate USERPORT so that we can call file_getfh on it. */ +diff --git a/nfsd/ops.c b/nfsd/ops.c +index 463a9c87..64e94b93 100644 +--- a/nfsd/ops.c ++++ b/nfsd/ops.c +@@ -292,7 +292,7 @@ op_write (struct cache_handle *c, + off_t offset; + size_t count; + error_t err; +- mach_msg_type_number_t amt; ++ vm_size_t amt; + char *bp; + struct stat st; + +@@ -583,7 +583,7 @@ op_readdir (struct cache_handle *c, + error_t err; + char *buf; + struct dirent *dp; +- size_t bufsize; ++ mach_msg_type_number_t bufsize; + int nentries; + int i; + int *replystart; +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Tue Nov 12 16:25:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70305 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 C7E4327BBEA; Tue, 12 Nov 2024 16:31:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7A8A427BBE2 for ; Tue, 12 Nov 2024 16:31:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtma-00045U-Co; Tue, 12 Nov 2024 11:30:24 -0500 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 1tAtmY-00043M-8J for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:22 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmX-0005yM-U2 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=jASOoYdyIeHbzrzcZNjDPWmRBAYZvQS+11ApmDDXphQ=; b=A5JAHscTasC7WP1TEAsgwqIh0hZyugRsC17/LJTkSqxBc5moGDZTghx72qfq9es1WwbDyqsn3tFKosq9bwLnfi+ENXqhErq2XopT1qFWgqvpDqOZvZEyQ90VoxvgjEH50u/6mruqBEUdgzdy3kNaZ1VwzsgK+mYQnmcTVdnvNhltd1VhY63hVHwc/JC1wFySMc4rRzhrsrTX1oRkWOK7c+4eh3gXA3iuC4w2Gdk79qvyH6HATfL3GcFaoh25KDdL4Rwl4VYEs3B9bgQxrvw67ugHYmYq5t9saMtKMA9nbrCckYpVlK9i1teJ+LsExYi+b76h4QXeq4lA5yDllBYjXw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmX-0000Yt-KU for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:21 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 27/40] gnu: git-minimal: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290021508 (code B ref 74290); Tue, 12 Nov 2024 16:30:21 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:02 +0000 Received: from localhost ([127.0.0.1]:39167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmD-0000Nj-19 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtln-0000JX-Ob for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:36 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjc-0005P3-58; Tue, 12 Nov 2024 11:27:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=jASOoYdyIeHbzrzcZNjDPWmRBAYZvQS+11ApmDDXphQ=; b=rhakRvsiyi9SNY/Z1+8g 4uGu5x74IJ54Kai11Lf8Yr7dN3if6THG8OYPC7rkOZOZltU7n+MmczYFGjBgbs02uDO9cLu8k/oZo aSe+WG7dHTg6EEaFPKONI0WvLN3Ux2J1ZQYgxoFRJPCEBe07c9EP0rDKUBRWYYmBdt7mREQPUSU6S DyKgocmCH3eeLL2e+bO/zXxyrW7GrLSm9z2jDhT5PmudcbG6Lq5aXdtZ/TkdTBrX6zTjnXZODPq/i l8fVy+68cE7tEZEKJOR8loylimaPZRIhjOtrCFUlKlhQmpVRsi3FshVoULj4XxZJZvyYS7mqGD+Nt Gce+8GdaO/VO2w==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:36 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git-minimal)[arguments]: When using gcc >= 14, use "-Wno-implicit-function-declaration" in #:make-flags. Use target-hurd? instead of comparing with "i586-pc-gnu" in "use-host-uname_S" phase. Change-Id: Ib9836be8a1e389a82c8a89adf22aaeac0d85bd14 --- gnu/packages/version-control.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c892a83a98..325b7ca8d8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -113,6 +113,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -296,7 +297,10 @@ (define-public git-minimal ;; By default 'make install' creates hard links for ;; things in 'libexec/git-core', which leads to huge ;; nars; see . - "NO_INSTALL_HARDLINKS=indeed") + "NO_INSTALL_HARDLINKS=indeed" + #$@(if (version>=? (package-version (current-gcc)) "14") + #~("-Wno-implicit-function-declaration") + #~())) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -305,7 +309,7 @@ (define-public git-minimal (lambda _ (substitute* "config.mak.uname" (("uname_S := .*" all) - (if (equal? #$(%current-target-system) "i586-pc-gnu") + (if #$(target-hurd?) "uname_S := GNU\n" all)))))) ;; We do not have a full bash when cross-compiling. From patchwork Tue Nov 12 16:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70292 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 A052527BBEB; Tue, 12 Nov 2024 16:30:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 220C227BBE2 for ; Tue, 12 Nov 2024 16:30:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmb-00046C-6R; Tue, 12 Nov 2024 11:30:25 -0500 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 1tAtmY-00043X-N4 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:22 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmY-0005yg-B3 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=a9ZwL+e9Y+9YzZi/ZahcTsVYU+gtk/QJq5X5N2Z3Iow=; b=QKuJNR3VXZo5Os1jdNM0MrpFWPczN8JuJNfyM7trgawAzCiwAH81KlaOW7jO9EOr+mpKWgEAQQCNuvFGqTFB8y38iuplXH9XezHU0cMW83MP8d27C4ut4CvjK42wdMW6o2j3ObGiyFx64N7tuBxNpwl5KIJ6Azti4+TaSa9vUEXeF32K1WsFY8UbL/3E4ODomlyrQoIlb4Ykb82Ve0WzkgVJAvVayKJ/giARy1CkX+oJckBNtADhCkFRtqC4/i+Fs613qmEFu66mLR+jMN2u6bks4bPN2wn/TgHPEGGEwRMJRE9v63Xyql+rZ0Pyq/ZWAtFeazfLaN0yo8KO+Wy+kA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmY-0000Z2-5u; Tue, 12 Nov 2024 11:30:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 28/40] gnu: inetutils: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Ricardo Wurmus X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290111867 (code B ref 74290); Tue, 12 Nov 2024 16:30:22 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:11 +0000 Received: from localhost ([127.0.0.1]:39194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmL-0000Sc-VX for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtln-0000JW-OV for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:37 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjd-0005PC-6e; Tue, 12 Nov 2024 11:27:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=a9ZwL+e9Y+9YzZi/ZahcTsVYU+gtk/QJq5X5N2Z3Iow=; b=mFw7tPj+DtRBldH4tWse 4huudwerrPr8luXxDZJaHrRt2DUe6N4O3tHz7KvzljgVhdWGmgItQrjj5HyiCRNTxlwovyrkjy/Zf w+37ppiuTlLNwI70zaFKmXu5Bbud9xw3j7UxCLEdsnHhEVcg135WeUqk+xp5EqWI6pIO7kdpuqykg njscyguq2Xom1c4uDwepL8LfGPr5862whuBp/JDFrJ9Na+W3DW9P7khalW+31mquPXZnWfAaC7EK1 rJ4EPiT9K1lWEyNlfAktBuj2iRV4IZNYq5yCTZS0zZdipw/kQY9A6BEY5nBcccDRxONM7rrsdE5It FoD7QrLjb5CWKQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:37 +0100 Message-ID: <1f456c4d97b5d0e1e017b2048daa8af5680fea13.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/inetutils-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/admin.scm (inetutils)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd64-patch" stage. Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428 --- gnu/local.mk | 1 + gnu/packages/admin.scm | 14 ++++- gnu/packages/patches/inetutils-hurd64.patch | 65 +++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/inetutils-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 948fc4ba73..0759555494 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1570,6 +1570,7 @@ dist_patch_DATA = \ %D%/packages/patches/indent-CVE-2024-0911.patch \ %D%/packages/patches/instead-use-games-path.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ + %D%/packages/patches/inetutils-hurd64.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9c765b51a9..311d613b68 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith @@ -1044,7 +1044,17 @@ (define-public inetutils "\\\"")) ;; On some systems, 'libls.sh' may fail with an error such as: ;; "Failed to tell switch -a apart from -A". - #:parallel-tests? #f)) + #:parallel-tests? #f + #:phases (if (target-hurd64?) + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "inetutils-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~%standard-phases))) (inputs (list coreutils shadow ;for login (used in telnetd and rlogind) diff --git a/gnu/packages/patches/inetutils-hurd64.patch b/gnu/packages/patches/inetutils-hurd64.patch new file mode 100644 index 0000000000..3fb238bcdc --- /dev/null +++ b/gnu/packages/patches/inetutils-hurd64.patch @@ -0,0 +1,65 @@ +Upstream-status: Not presented upstream. + +From 0804e655a7abfd22dc3a053f03fab8f811405f84 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 8 Nov 2024 11:07:56 +0100 +Subject: [PATCH] ifconfig hurd: Build fix for the 64bit HUrd. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +* ifconfig/system/hurd.c (check_driving): Use mach_msg_type_number_t +instead of size_t for file_get_fs_options. +--- + ifconfig/system/hurd.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c +index 70b2ed27..86fe6375 100644 +--- a/ifconfig/system/hurd.c ++++ b/ifconfig/system/hurd.c +@@ -47,7 +47,7 @@ check_driving (const char *name) + error_t err; + + char *argz = 0, *new_argz = 0; +- size_t argz_len = 0; ++ mach_msg_type_number_t argz_len = 0; + char *entry = 0; + const char *socket = _SERVERS_SOCKET "/2"; + +@@ -106,7 +106,9 @@ check_driving (const char *name) + new_argz = malloc (argz_len); + memcpy (new_argz, argz, argz_len); + +- err = argz_insert (&new_argz, &argz_len, new_argz, name); ++ size_t new_argz_len = 0; ++ ++ err = argz_insert (&new_argz, &new_argz_len, new_argz, name); + if (err) + { + error (0, err, "Could not prepend name %s to '%s' for %s", name, +@@ -114,7 +116,7 @@ check_driving (const char *name) + goto out; + } + +- err = argz_insert (&new_argz, &argz_len, new_argz, "-i"); ++ err = argz_insert (&new_argz, &new_argz_len, new_argz, "-i"); + if (err) + { + argz_stringify (new_argz, argz_len, ' '); +@@ -122,10 +124,10 @@ check_driving (const char *name) + goto out; + } + +- err = fsys_set_options (fsys, new_argz, argz_len, 1); ++ err = fsys_set_options (fsys, new_argz, new_argz_len, 1); + if (err) + { +- argz_stringify (new_argz, argz_len, ' '); ++ argz_stringify (new_argz, new_argz_len, ' '); + error (0, err, "Could not make pfinet %s drive %s with '%s'", socket, + name, new_argz); + goto out; +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Tue Nov 12 16:25:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70308 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 4263C27BBE9; Tue, 12 Nov 2024 16:31:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 89EE227BBEA for ; Tue, 12 Nov 2024 16:31:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmc-00047a-FH; Tue, 12 Nov 2024 11:30:26 -0500 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 1tAtmZ-00044I-Gi for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmZ-0005z3-79 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=slpZ+ySn88xKLht2WSlqgbY5THy8oU9A+TRmKZeHC+U=; b=MUNY2dcacFgv+StZ/wNK7UU8ZiisSwdLhIwQQBK7qSpSt7+81kr3bsfH1kXV4sUoXvXFV6zMeYfTpid8Ohj3aad3Bjtr8JGW2X1HtnxurpbrBejYFvJ9bIBtnMPrcBdPIpjGrnMfc8bFKgt9dPIkURAgpgZj/8Eolvc6hQyWY+pLgG51NAwq1e7Sd6V5R4eAZ7OTI6yVQKBUDSxpOh9iQAlF96KS9R0W428Wh4nIeh7Ax6hb/fzUblrU7DVxwicT3ENc/vYq6EEtVMHIn/jnXm5BDhqzhBjv1xBLokmMovKghO6YOpmANrezIBILGz+01y/VrvkeJBKLQ7cauQAWWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmY-0000ZA-Jg; Tue, 12 Nov 2024 11:30:22 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 29/40] gnu: grub: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290121911 (code B ref 74290); Tue, 12 Nov 2024 16:30:22 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:12 +0000 Received: from localhost ([127.0.0.1]:39200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmN-0000U4-4Z for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlp-0000K3-Pw for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:38 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtje-0005PS-EZ; Tue, 12 Nov 2024 11:27:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=slpZ+ySn88xKLht2WSlqgbY5THy8oU9A+TRmKZeHC+U=; b=IPu5lXXI4zX1XAhZwP5B Bb2bkmFQ1dyGBuqQvHpZi0iAq0Z2Zz8fMjX1hO8rRVUtTL1x/uzMGRkwBejVngHdRTKkUTT3qbsZ9 RC1iWKc0a3T+ffRcZ0HbULZWBRYTYg/ODAdfIolcu+yDWNJJ9iLcEMLm8Sq9UPKA/MJnz09L0T3k9 ZZmwfUGnbIMdjd3fYoKiIlMWO/q2RzaQYPPO1WeU/exWckIVbgwJxztD+F3z7N/tjwleG7JZERc2A z0fKk4L5HrdrxN8QScBqzc8UeUGyLjruoMJXe4qilL/fijhD3rKEDPrwh0i6e50Eke0j9MzdvaAMU cFd9sapKTSZUUQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:38 +0100 Message-ID: <5ccd41575a2915402ce6eb1175cd6c149f762ae8.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/grub-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (grub)[arguments]: When building for the 64bit Hurd, use it in new "apply-hurd64-patch" stage. Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428 --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 8 +++++++ gnu/packages/patches/grub-hurd64.patch | 32 ++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 gnu/packages/patches/grub-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0759555494..2b8a8d7065 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1488,6 +1488,7 @@ dist_patch_DATA = \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ + %D%/packages/patches/grub-hurd64.patch \ %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e188553910..caec26edc7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -192,6 +192,14 @@ (define-public grub (setenv "BUILD_FREETYPE_CFLAGS" (string-append "-I" freetype "/include/freetype2")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "grub-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~()) (add-before 'check 'disable-flaky-test (lambda _ ;; This test is unreliable. For more information, see: diff --git a/gnu/packages/patches/grub-hurd64.patch b/gnu/packages/patches/grub-hurd64.patch new file mode 100644 index 0000000000..d5acd99eb8 --- /dev/null +++ b/gnu/packages/patches/grub-hurd64.patch @@ -0,0 +1,32 @@ +Upstream-status: Not presented upstream. + +From a4eb7d1f2cbd02132a9f5512f1294182576d4653 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 8 Nov 2024 11:47:49 +0100 +Subject: [PATCH] osdep/hurd: Support the 64bit Hurd. +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=UTF-8 + +* grub-core/osdep/hurd/getroot.c (grub_util_find_hurd_root_device): +Use mach_msg_type_number_t instead of size_t. +--- + grub-core/osdep/hurd/getroot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c +index 0efefdab4..b849700e6 100644 +--- a/grub-core/osdep/hurd/getroot.c ++++ b/grub-core/osdep/hurd/getroot.c +@@ -58,7 +58,7 @@ grub_util_find_hurd_root_device (const char *path) + file_t file; + error_t err; + char *argz = NULL, *name = NULL, *ret; +- size_t argz_len = 0; ++ mach_msg_type_number_t argz_len = 0; + int i; + + file = file_name_lookup (path, 0, 0); +-- +Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + From patchwork Tue Nov 12 16:25:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70297 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 BBA3927BBEA; Tue, 12 Nov 2024 16:31:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7370827BBE2 for ; Tue, 12 Nov 2024 16:31:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmx-0004E6-Rn; Tue, 12 Nov 2024 11:30:49 -0500 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 1tAtmZ-00044E-Eh for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmZ-0005z2-66 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=zt1jdjXqyEh2UXoxu4/4anI4OnXrBda4an/zBxZV0CQ=; b=viDkeJJYEAlqkYfk7+Zpgx0D2z1mEAx+XaobKc2Craj2q4rShpAKy5kDRHL1pO4TIS41+2xRH6k99wMaHcxd7kFFrbnxaAc+Zo9MAyjpXi8zVtPnmQ25Iu6VrcU2AoUJ/wX9RyoLCfMihhKwK+P1UfUBvdwExs3hA+n35DsrzUEr6K+zNhD9cmK15A/WBl6O9r+U9rNCeLm5215KFvLcYxNZudrT9C8Wau7leu4+AhurY5XPKSohvohMwyeynJ7N5GdH/c8m/QNqJWWrwtSGAm1cU6dVZ1/duQeJEx/qd0UOFo3sG0OzNLX3nhDT6Hn1cUlDSbyZwMWst2t9CnR5Hw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmZ-0000ZH-1T for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 30/40] gnu: guile-fibers: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290131959 (code B ref 74290); Tue, 12 Nov 2024 16:30:23 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:13 +0000 Received: from localhost ([127.0.0.1]:39204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmO-0000Ui-FY for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlr-0000KV-RP for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:40 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjf-0005Pi-FW; Tue, 12 Nov 2024 11:27:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=zt1jdjXqyEh2UXoxu4/4anI4OnXrBda4an/zBxZV0CQ=; b=BbdSDhBzV0M99A7y7uon 8pVk0By8OK+H9R/qUfNjq/v1S11HGvoKabr+1xSzEaHk1gAr23oOYtgZDGifpPnaZqjny+vhXGqoS 5mCxxjg265rkwK1Ofo9cEPdBYaUp+E2+6rbRFxVQ76LQVI6gmsrXg1UhaIBDZFlbD/RA66r115by0 wPES2quDnOJkxI/nnGDXc2CNTmt+uvQ7ZJC95fO8I2g7yE1l5VS64ojmUA2hPbNl81YrnCvOU7FaO 6bGVNGJoWNpTYAAHoUE+noXMYFLu9RjuPwu3iB4rSvo2DM0MSklXLDk5WYfph5lgVlgdaMCPybKWJ PJZGZdz+gl4Y2Q==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:39 +0100 Message-ID: <99063d4c0e6038e2a42739f0b8eb6d01f6eb1cd2.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (guile-fibers)[arguments]: Also modify phases for the 64bit Hurd. Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428 --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ea192c2c03..a874ab908d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -855,7 +855,7 @@ (define-public guile-fibers (list #:make-flags #~(list "GUILE_AUTO_COMPILE=0") #:phases - (if (target-x86-64?) + (if (and (target-x86-64?) (not (target-hurd?))) #~%standard-phases #~(modify-phases %standard-phases (add-before 'check 'disable-some-tests From patchwork Tue Nov 12 16:25:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70291 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 D755227BBEA; Tue, 12 Nov 2024 16:30:55 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 9079027BBE2 for ; Tue, 12 Nov 2024 16:30:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmb-00046Q-L2; Tue, 12 Nov 2024 11:30:25 -0500 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 1tAtma-00045T-0p for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:24 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmZ-0005zI-Nk for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gRWIZ5gzTGHfsFnovkLIfnDEaxWGHk1MMLD2hH2vn3w=; b=g3BKBCkqJmLUlJTSBrbLSaTmi36AzNRtEjlFIVHcGDtEv3rqlwB8wRHTDiSwwh3tXJE46SVeEf26HPD5glOTKanrKUKrqxi5Gy+rZRoRU0eJ6ZoTiuX3yFRUHEEYdOXyCDQQU5Owj8oLp5TfCM/B3h4ses+7/3ADb+j7jR3Ph+hFIjC5/2YsS6/eqvJyUNworpwonEwgwqRRtiIvEiVgsmA0evcGzw7Hv7l3KMVzHXNgPtlt0cex0L1YKYxlPzuMkvW7aV2CO0uMtr+XfEWABRzz4gH6Ngu3uvkObtHlYwM5XXloERoa12FlWr2lkq2oVLcqN6xcHKuezApuOfY/rw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmZ-0000ZR-Gw for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 31/40] gnu: m4: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290142026 (code B ref 74290); Tue, 12 Nov 2024 16:30:23 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:14 +0000 Received: from localhost ([127.0.0.1]:39208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmP-0000VP-Fx for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlr-0000KU-RZ for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:40 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjg-0005Pz-IE; Tue, 12 Nov 2024 11:27:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=gRWIZ5gzTGHfsFnovkLIfnDEaxWGHk1MMLD2hH2vn3w=; b=J8A7MLbGye2KrHPthhMB rDe5VqroynmIRQdXt35IZrW+CIc94c7FnqHPoi3XhOlt/yjH4vMmQkRnISDAGriqr5UPvbOHEvVvW ftbUIp2pdVJUTaupACuHcG1YIZg/+xrR3bbRg9cmnwtCAMidZS9CYk3zTtt6GfBSi7bWN1J+6ijPS lNw1gDJ4fSlXRLZGd1KYIIUBJmpUiKjgvOSOLWyCs3mP/Pz5dYqJIz8qjZonlbTT2ScGA1wwVh/zv QFdQPXfNnO/z0WUk8a374+TFdp+3t3N22KOiEJEJGzey1LTHnsPWIv6X65yhydgHwfpGTHulWs3Al JPasAeEvsrayRg==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:40 +0100 Message-ID: <3cfbaa61642a2298009a4ef94d66a02a31a96331.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/base.scm (grep)[arguments]: When building for the 64bit Hurd, add patch-sigsegv.h stage. Change-Id: I82993ebde268867348893556a9476faa5c4e9453 --- gnu/packages/m4.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm index 39b50b6800..081304db34 100644 --- a/gnu/packages/m4.scm +++ b/gnu/packages/m4.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2022 Marius Bakke -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +64,13 @@ (define-public m4 (("(^| )main *\\(.*" all) (string-append all "{\n exit (77);//")))))) '()) + ,@(if (target-hurd64?) + '((add-after 'unpack 'patch-sigsegv + (lambda _ + ;; Stack overflow recovery does not compile + (substitute* "lib/sigsegv.in.h" + (("__GNU__") "__XGNU__"))))) + '()) (add-after 'unpack 'configure-shell (lambda* (#:key native-inputs inputs #:allow-other-keys) (let ((/bin/sh (search-input-file (or native-inputs inputs) From patchwork Tue Nov 12 16:25:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70309 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 1CFF127BBEA; Tue, 12 Nov 2024 16:31:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 E369427BBE2 for ; Tue, 12 Nov 2024 16:31:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtn1-0004PP-Do; Tue, 12 Nov 2024 11:30:51 -0500 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 1tAtmc-00047q-Fs for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmc-0005zX-3l; Tue, 12 Nov 2024 11:30:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=uozjrTizIIoD+tZIHKEMI9d3yhvwqgaJ1RflkmyegF0=; b=r6/Q02ZH3L1852VSCvVpW/AeX2wRY7l43tGDqx5WXaHvioAVBHIXV/nFw+VtDyM+Y+6apJXyqHiJAYosTkcnQFsm9iEmE3e8EZTkQuvkDqz5PDIbr+S6x8klWAgB5ATYFqXdfX4pViaMsE99iDyONH/LU/7A6T1dmz8DxXmzqrwib4Yv8z3oYkfXZdB5h25hcNv6LYUzQ7BZLr/ecNVbF0hed9SjHcHsT1xamH5YP8r1FPhHqSR7iQeav7dGifZfyACLKpcQSoVnIL00BPQXzZSCa8hhdcH3P8XufxM6l4iXhXZq9Pn8bMNwDdEb/wV5NrEKqlnoz6BmWF6OwUAeig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtma-0000Zh-Ef; Tue, 12 Nov 2024 11:30:24 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 32/40] gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:24 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290152068 (code B ref 74290); Tue, 12 Nov 2024 16:30:24 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:15 +0000 Received: from localhost ([127.0.0.1]:39216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmR-0000X6-0h for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlt-0000L8-TG for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:42 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjh-0005QQ-H2; Tue, 12 Nov 2024 11:27:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=uozjrTizIIoD+tZIHKEMI9d3yhvwqgaJ1RflkmyegF0=; b=nr0mx5AuViGOy49e6XFO C9fPLD1egRJ8CQopsikouQhbVAhO8ry3+KMeTLdA5BEnykb3KjP3hnfYrLeMRcil/U7ORF35aoFIW O6Re53V0x57q31aQQDhFpm7b0pd37TbK55ykgCNtRvdOKb0v/vMTTFHCo5ECHDO8hWZV67tGB080S sLSvEh39u0wrbUf1Kd36XQhE9fq2TNjT/fdnAVX+39VUD9fyzCuyMrQ9MrbJIigpMybTUqRbpbPt6 bx5o9E7/jWilt6g2+eYviPqKz2O012Ud535lbpWRR5eTcsf/9QHQFaEMX+ztfHtUTEX7FZs9TOIDp 4XEH3sJs7B4LLg==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:41 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (gnumach-headers-boot0): Update to 1.8+git20240714. Change-Id: If30d7b4a688070d70741173c97a60284ca8299ef --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a000cbfdc5..a8d48fbb93 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2636,7 +2636,7 @@ (define gnumach-headers-boot0 (package (inherit gnumach-headers) (name "gnumach-headers-boot0") - (version "1.8+git20230410") + (version "1.8+git20240714") (source (origin (inherit (package-source gnumach-headers)) @@ -2650,7 +2650,7 @@ (define gnumach-headers-boot0 "gnumach-" version ".tar.gz")) (sha256 (base32 - "1s09256g2ny46idrn8frzs7r51la9ni45bmglmswlsmz9ii7dpi4"))))))) + "1bnw5vdbq91zjxklx23qvim40fb0yw1qdxhn9n37jdfypm6q3xir"))))))) (native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0)) (arguments (substitute-keyword-arguments (package-arguments gnumach-headers) From patchwork Tue Nov 12 16:25:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70302 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 B6E1627BBE9; Tue, 12 Nov 2024 16:31:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 8BBF627BBE2 for ; Tue, 12 Nov 2024 16:31:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtn0-0004NX-Uf; Tue, 12 Nov 2024 11:30:50 -0500 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 1tAtmb-00046m-Pk for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtmb-0005zP-3S; Tue, 12 Nov 2024 11:30:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=hRyxMTGPhpCXSOtFgdOHXaE9QB7YjimhkFbRdVBgFts=; b=g2w8HXsJxdqHTeXSkP5Joy8dIThUZUou3MDntPR4kHppq2MNgps40ElXOMvf4a107gTiBXqSxrpPf0Nl8EytlhEoO1T31BpFzHmIN01g4ziouBvrKahfbe7bMMAlBqysXuzg6Ggt+5XzMgCzFRGmkbA0ORlQbqzbM2dXFYT5KkMUhJCQH3Nf+t22kC7Us6opCb+jXxx9dRU97F6QAuwCjWtTuozorarCT02qPEz67zkEFESeY0f6PMhec00eF0HEvPU8AKH6+aV/RFGtYBT55zQc6snoFVR2DGWZfd2GOmdQx2Y9uBS07p42JDDVWUiX/9JDDdvGKvF+ETcuokzhIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtma-0000ZY-0Z; Tue, 12 Nov 2024 11:30:24 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 33/40] gnu: commencement: mig-boot0: Update to 1.8+git20231217.. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:30:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290152055 (code B ref 74290); Tue, 12 Nov 2024 16:30:23 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:15 +0000 Received: from localhost ([127.0.0.1]:39212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmQ-0000Wa-9W for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlt-0000L9-TF for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:42 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtji-0005Qo-EA; Tue, 12 Nov 2024 11:27:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=hRyxMTGPhpCXSOtFgdOHXaE9QB7YjimhkFbRdVBgFts=; b=V6sznT/dooEvDjQbmaL5 F8SCnCX4rngRY4v+/ElUVxxPytp5xGG1cU231Ey6cFhQFze7upyW6wDil+YopOHDU75a5DMlLkfsJ A8umW4r9l9zWEBgPV5Mr9mvZHIju06+aeoqA3EWROgR+U0Ra7kpsbUPp3jRLxyREQn0M0Wgk+f2f+ EFmUBCuq3sj7uX+QbghKvQa7oGuWtDuuSJ4X42c93/9Xk8fx5xjg/EnrVpnLT81j3I/p/rUQfhps9 8A2vwua5hUkl3dWpgpI4nyAJctkkGotQuQIqZgNEuKSl74vmqW8b3w+536+1xrVT7LaWekmUcv+Ax y+vaMkTTz+8wZg==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:42 +0100 Message-ID: <90a2eb69481e3fed9e9018c58a068e0d81573eea.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (mig-boot0): Update to 1.8+git20231217. Change-Id: I591ff7cb84ac1e567d49f51eb40be19fa6b15f5b --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a8d48fbb93..faa4c903e4 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2671,7 +2671,7 @@ (define mig-boot0 (package (inherit mig) (name "mig-boot0") - (version "1.8+git20230520") + (version "1.8+git20231217") (source (origin (inherit (package-source mig)) @@ -2684,7 +2684,7 @@ (define mig-boot0 "mig-" version ".tar.gz")) (sha256 (base32 - "1l1vfm4wap5yxylv91wssgpy7fnq22wp3akgd5nv995kychfa9jy"))))))) + "18vz3ifrhhlvrdmlv70h63wl0kh5w8jcpsjx9yscsw9yazm1lzs7"))))))) (native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0 gnumach-headers-boot0)) (inputs (list flex-boot0 gnumach-headers-boot0)) From patchwork Tue Nov 12 16:25:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70318 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 22AF227BBEA; Tue, 12 Nov 2024 16:32:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 08E0B27BBE2 for ; Tue, 12 Nov 2024 16:32:05 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnX-0004z4-JM; Tue, 12 Nov 2024 11:31:23 -0500 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 1tAtnE-0004iS-1U for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnD-00064n-OO; Tue, 12 Nov 2024 11:31:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=C/iGtmRcNfKa6sTItlo1S0n66290nZdA7O+Ce5bplpA=; b=C+QDOwK+V6U4N4cBsKiFxLSE0Y/qwG5mzDAMLDtdpFkbG6QaF0I58DsqIeSMA17Vi67ZaH1wn3IWUv/vnJ4nt8JS4UmuJ0/wjg3Q71c5ywwZVks6xrQWX2UPhN+7NMadiA4GDy+ukLKnsn6g+z90LyDwTfDt60mtrKMvswpfhYpbKDe5S5u5XTQutWA9RlEPz78m2YRNT8SJ0gp5bpHyoY5tLPK6nPUT0tv10mjJ5D+WFOKOYetWVJLHvX+6kxhCKDr4qIxqxHEdXuinUmYr91HlGkQJmYgv7ZFiPziP/q/TLh9MlBn9y6QQBZcQka68Y2NHtr8hrULhqmq6VONyrw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnC-0000d8-B5; Tue, 12 Nov 2024 11:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 34/40] gnu: commencement: hurd-headers-boot0: Update to 0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290262250 (code B ref 74290); Tue, 12 Nov 2024 16:31:02 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:26 +0000 Received: from localhost ([127.0.0.1]:39253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmb-0000a4-G3 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlv-0000Lc-Ut for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:44 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjj-0005RW-NX; Tue, 12 Nov 2024 11:27:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=C/iGtmRcNfKa6sTItlo1S0n66290nZdA7O+Ce5bplpA=; b=p8YETHy9rruh6Pgi1N7J FvahKgjEhA8odbsQD1a0a+43jYNo/xpo9ttJ2K1xHuIq/q5JtTXBeBOgoYBbnIfpKCe1zEzQtpxlY 1PkFO44oos/bbP01W8gDLq9eVb2W5OXzFoc7wABbhCiwrqj/N0DElTsXets3YfZixSSqZ6sVqFsXh 2EGcmivbNN73tcwBPBG7U25Cw/cFC65c0rOVeMw2S9B2bspu2F4aZwXFSMHOnRNg0hDxYZ+URDdgn rIOb1lZz4ea18jVn6XktuH4a0QcInI+43q+haaglriZeugOioVh6j2DubRgmPUYm1DAgtP3wM3m8a 6YetHfisCok9fQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:43 +0100 Message-ID: <058b38812125dd2c1557a9fc8113899d4671cb7c.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (hurd-headers-boot0): Update to 0.9.git20240714. Change-Id: Ib3edaa3adb9cfe4cb8c5a3af83cb2701ee9dda1b --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index faa4c903e4..aad3f523b5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2700,7 +2700,7 @@ (define hurd-headers-boot0 (package (inherit hurd-headers) (name "hurd-headers-boot0") - (version "0.9.git20230520") + (version "0.9.git20240714") (source (origin (inherit (package-source hurd-headers)) @@ -2713,7 +2713,7 @@ (define hurd-headers-boot0 "hurd-v" version ".tar.gz")) (sha256 (base32 - "0ybmx7bhy21zv1if2hfdspn13zn68vki1na72sw2jj87gj8przna"))))))) + "0wcihffclwijjamx4cjbr8i92yg780538ipg2z208ahg96jjrmgq"))))))) (native-inputs (list autoconf-boot0 automake-boot0 mig-boot0)) (inputs '())))) From patchwork Tue Nov 12 16:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70323 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 8BA8927BBE9; Tue, 12 Nov 2024 16:32:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 1661E27BBE2 for ; Tue, 12 Nov 2024 16:32:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnH-0004ki-1Q; Tue, 12 Nov 2024 11:31:07 -0500 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 1tAtnD-0004hV-Gw for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnD-00064a-8Y; Tue, 12 Nov 2024 11:31:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Oc2P0jK5/RRcqMUVYZ2cbyxGKxdzP3XZZrldqFy4ZN4=; b=eXJPOMn4hjbXcdxHS3PQBoZrQFnLU2VKveAF32F+T7pys0RyI7aD2A8M32gQ7IlRpj6X4JIgcdnLXgAYj5buERwGAZo9VMJneXty9ingYvy9CtyWXfAskEB9AgEkRd7zKejCr5iTKLN+9A92qegdm/wBmaEeLgvUpS64lQwwbVlpnnur9UiWr1ShtnU7M4zEtrP273jfm9hZNBPgaeIzm+73Yv56JcJYMhjPcVx0xOoUptJ5P19Ugni/JZZdDgkmPm56+Lfra2pi03QIy4IpRXro0dBRf+8GOMJKlOUvu6vcvShByciFqlkZ3wpn9yw2EWtk/QTi6yS4FXnrzTe7+g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnB-0000cz-QE; Tue, 12 Nov 2024 11:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 35/40] gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290252241 (code B ref 74290); Tue, 12 Nov 2024 16:31:01 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:25 +0000 Received: from localhost ([127.0.0.1]:39247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtma-0000Zj-PU for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlv-0000Lb-UY for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:44 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjk-0005Rg-Kh; Tue, 12 Nov 2024 11:27:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Oc2P0jK5/RRcqMUVYZ2cbyxGKxdzP3XZZrldqFy4ZN4=; b=eXMKpNQjGfYVd+FIIMca nXWCDllCCcE44EqJNIF2j522xFGsxqGR6vjyxp/EYGDBUDn5pr3tr4ARnMI7e9DaBpD9JdTwWuHZn NIVi4nshpykEQvG/WvAd5CmApz/eoVBDL90zfrc23eCgBJZT6bQr31fao9yfG80AQ/grcU/euWpAm Jg/OUfxFhN4qVv+eOAHX3Ry/Z2pw/tnuB5LpldQbOWiD/UAamXxHogx4NUxasNrE0jMInrX5TEvgX G9J/N94GKpbrYECFbhImh+8Tid6qcC6qqOASw6rR1unRIuSUTeLKDvUAtSRclc6S321+tXiUeErv2 yN8IX0hbnCg3xQ==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:44 +0100 Message-ID: <185134dc100369ffbf6362e9b8b1fb58ae9f8707.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/commencement.scm (libstdc++-boot0-gcc7): Change variable to... (make-libstdc++-boot0): ...this new procedure and update accordingly. (gcc-boot0): Update accordingly, and cater for x86_64-gnu. Change-Id: Ib0bc84e4dab90b080e5a01e6ab932f8be456c656 --- gnu/packages/commencement.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index aad3f523b5..b2558c0d54 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2274,9 +2274,9 @@ (define libstdc++-boot0 (inputs (%boot0-inputs)) (native-inputs '())))) -(define libstdc++-boot0-gcc7 +(define (make-libstdc++-boot0 gcc) ;; GCC >= 7 is needed by architectures which use C++-14 features. - (let ((lib (make-libstdc++ gcc-7))) + (let ((lib (make-libstdc++ gcc))) (package (inherit lib) (source (bootstrap-origin (package-source lib))) @@ -2447,7 +2447,8 @@ (define gcc-boot0 ;; The libstdc++ that libcc1 links against. ("libstdc++" ,(match (%current-system) - ("riscv64-linux" libstdc++-boot0-gcc7) + ("riscv64-linux" (make-libstdc++-boot0 gcc-7)) + ("x86_64-gnu" (make-libstdc++-boot0 gcc-14)) (_ libstdc++-boot0))) ;; Call it differently so that the builder can check whether From patchwork Tue Nov 12 16:25:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70321 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 3E61627BBE2; Tue, 12 Nov 2024 16:32:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 CC9E927BBE9 for ; Tue, 12 Nov 2024 16:32:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnX-0004yH-HO; Tue, 12 Nov 2024 11:31:23 -0500 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 1tAtnE-0004iT-BR for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnE-00064z-1Q for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=fTjSU5bAfo5OPDt+EeNRYzuUAxdklaURCd5yJwCmWMM=; b=bmg8txmQAlebcx1x/BWdaOqEfOzFkqtdLby1IWsFWmgIDxGwzBRu7kvX+LFzEof3lQjAAFdYj7KHqcBPrKMkKPSn6oWBQTLOkxmlzIYKsc7c8OrhZwSeob3lntiZt0qJcH6fVPIKuBGhtwr54iuHy8l0VChqeYMhZ5PL0k8bCcz0jcD/MSZTum/pA+KlPlJeuJoW2YbfNzTJAVsjI1sqk63JOx6v7uxn59hJDRaQA8T5KJlq8YB7IHwUw/2RM4gtaISWdWMhV8M7SdUpFkSZ3Ddwt/Wo44nTA0Rn/KcLDMu48MHPkhHgBhjTgJcuLAnEZ7rKLOWQqOrlsilwe/XiIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnD-0000dZ-S7 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 36/40] gnu: gettext: Fix cross-build shebangs. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290272274 (code B ref 74290); Tue, 12 Nov 2024 16:31:03 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:27 +0000 Received: from localhost ([127.0.0.1]:39261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmd-0000aV-06 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlv-0000Ld-UY for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:44 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjl-0005S3-FL; Tue, 12 Nov 2024 11:27:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=fTjSU5bAfo5OPDt+EeNRYzuUAxdklaURCd5yJwCmWMM=; b=AwlIfhUha9bdmkYYbrWN JZwDXCiMD1aso8us9uhqoJ4OFf1jHgywDCWxIQSHWbnmRGm4eOz/abauhFJUpeicLa0rbTE7edLXK hjZ5lCBdx0HrP/J9wS/GDn7K1dV/tNYu4ab7fFUJolnb8iJ40QB5VnQEJnS4QO1aAbc/mZwtYUw0s wztWnYa2m68iNxq8c6w5hJR9FGOldl5H6f4gbe9apr7E1pG5hjfnCNTsQq4ajet11ukoJJC/E19KO nV3TU4VzWnPzMn9yXmtdezIcnZMJ2g2Ef8/qv2qUU/ikrrD9uFXe13ctnEp5AzeZVJboLcdeW2N9r aq+5VDeDpZ9Y6g==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:45 +0100 Message-ID: <73bba6d236af4d1501d9a28f94dba8aa77f4148c.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This fixes running autopoint from a cross-built gettext[-minimal]. * gnu/packages/gettext.scm (gettext-minimal): When cross-building, add stage "patch-cross-shebangs". Change-Id: I5029a3be0b5cee3c173de66d8f0b027b02c3bc47 --- gnu/packages/gettext.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index cabe4f3be9..7862c296bd 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Miguel -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2022, 2024 gemmaro ;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com> @@ -130,7 +130,19 @@ (define-public gettext-minimal ((" test-tls\\$\\(EXEEXT\\) ") " "))) '()) - #t))))) + #t)))) + #$@(if (%current-target-system) + #~((add-after 'install 'patch-cross-shebangs + (lambda _ + (let ((path (list (string-append #$bash-minimal "/bin")))) + (define (patch-cross-shebang file) + (patch-shebang file path)) + (with-directory-excursion + (string-append #$output "/bin") + (for-each + patch-cross-shebang + '("autopoint" "gettext.sh" "gettextize"))))))) + '())) ;; When tests fail, we want to know the details. #:make-flags #~'("VERBOSE=yes"))) From patchwork Tue Nov 12 16:25:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70304 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 909E327BBE2; Tue, 12 Nov 2024 16:31:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 C0AC827BBE9 for ; Tue, 12 Nov 2024 16:31:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnV-0004rw-7l; Tue, 12 Nov 2024 11:31:21 -0500 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 1tAtnD-0004hw-PX for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnD-00064i-Gg for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=5kbzB21ou56Kj2BT+NNRRVW2UKTUSjGtnepg1Ty+AfQ=; b=q8PCuxcP7iK5hmCeRMeFFwjQfPaDVyV1lb06cMFtYvNRdTJp4CA+UN99i2pB93bPBxBS2JXamwRum9+uimymOk+I13OTswi+weMGIz3UcNwo1/dbtG3UYx/uo7fHEPI6RWyVulzqfPNLOL7yfuhjCivvSvLDp5MfWxQRiSLNngz9k0M6Zdom2+Uu4+m8VK9s+fIkNVwq44s5ma4IDNqUjxRUAwMV3ktsQ3IODzChgomaFOqMYTYd2xsNgGgxBl8an5zN9KqEFKqRUOnpvQUXMxFI63VMR0GBwgKqWqY6mSfyYwT9iQCI8B2XGuQ5eSXeyhMPzoJ70dQ+v3DI9Q7uKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnD-0000dQ-B3 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 37/40] gnu: texinfo-4: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290272266 (code B ref 74290); Tue, 12 Nov 2024 16:31:03 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:27 +0000 Received: from localhost ([127.0.0.1]:39259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmc-0000aO-E4 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtm0-0000MZ-1X for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:48 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjo-0005Sk-6k; Tue, 12 Nov 2024 11:27:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=5kbzB21ou56Kj2BT+NNRRVW2UKTUSjGtnepg1Ty+AfQ=; b=Vf5UsrhOtnD/dTH4P/9s QnfVQ21TPTKTulu2RQvB7JAhNu0dcIcf6vbXjwlrfTlx57MhWRod75MyNo7G/9oP5lbLkekwtxWnM kMVsV5A93ZomEFU5bnebsWl3tBpjPP/BZ9WhRaiqRXvEP91Pl/0SChDUI2CEDXluKrXg1LCOp9mYW Y2dqpWwTCkXLOHclEV9uLtxO4I939v9qpjaAKEW5WCvUuwdIDw1qdQAfUTHpt70+rDxa0LDWpRCcb 5Sgpqsf7NgDan85B8j/pxPKgDyAJEpZBZchiTtwEWR+hzxOJJDLS2l7S3ixi34RcPK+8mhoB/L4Ss Vx1bHM1NEjVOvA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:46 +0100 Message-ID: <645534e6b891ad98d6d2971cb8dc14acb508aed1.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/texinfo.scm (texinfo-4): When building for the 64bit Hurd, add "-Wno-incompatible-pointer-types" to #:configure-flags. Change-Id: Ia0503e3f5c7aa5354a949b69035a1be6f93ec85f --- gnu/packages/texinfo.scm | 50 ++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 81afdaf7a7..c0a35b6ffa 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 ( ;;; @@ -165,31 +165,35 @@ (define-public texinfo-4 (modify-inputs (package-native-inputs texinfo) (prepend automake))) (arguments - (substitute-keyword-arguments (package-arguments texinfo) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'fix-configure - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Replace outdated config.sub and config.guess. - (with-directory-excursion "build-aux" - (for-each - (lambda (file) - (install-file (string-append - (assoc-ref - (or native-inputs inputs) "automake") - "/share/automake-" - ,(version-major+minor - (package-version automake)) - "/" file) ".")) - '("config.sub" "config.guess"))) - #t)) - ;; Build native version of tools before running 'build phase. - ,@(if (%current-target-system) - `((add-before 'build 'make-native-gnu-lib + (append + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess. + (with-directory-excursion "build-aux" + (for-each + (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ;; Build native version of tools before running 'build phase. + ,@(if (%current-target-system) + `((add-before 'build 'make-native-gnu-lib (lambda* (#:key inputs #:allow-other-keys) (invoke "make" "-C" "tools/gnulib/lib") #t))) - '()))))))) + '())))) + (if (target-hurd64?) + (list #:configure-flags ''("CFLAGS=-Wno-incompatible-pointer-types")) + '()))))) (define-public info-reader ;; The idea of this package is to have the standalone Info reader without From patchwork Tue Nov 12 16:25:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70320 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 7401D27BBEA; Tue, 12 Nov 2024 16:32:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 4190A27BBE2 for ; Tue, 12 Nov 2024 16:32:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnH-0004k4-0e; Tue, 12 Nov 2024 11:31:07 -0500 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 1tAtnD-0004gz-9O for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnD-00064U-0j for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=+/wthXtnifImPs2Hk4cJ3xdXIeo7+KWlULakWyvu3ts=; b=Zz+HpmHV2oKhJ2q97+BVApE8ydTbq0dsDXXCBC1QCh5zAdu3/e9y59iU0fsPSqBPhWf4U9M1kaBRxkl3TP8xMhNk+NrUj08FrYFV8XBWPo+x0PKCHeSvdjSDDs6YcvvXBEI8k39o0YaEApHulaGKvUohJQF4xPNGuMlwW3h2edqFuomrkoGjZVMHml+yUm4SH71gKxSf3jJ1B8GEH/LM5PnHyeYuCYnzja19hhaFwopQb0vUQnR0KCSWMCB3kdLdy8+kjvtIzwsJvoU8XRVJyFOxZlaqLLJ0ls5daspauixbVx0Jmq4NWxl0nGn6WrLjj6aXZLSVHCVfQFR6+mz8pw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnC-0000dG-RX for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 38/40] gnu: flex: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290262259 (code B ref 74290); Tue, 12 Nov 2024 16:31:02 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:26 +0000 Received: from localhost ([127.0.0.1]:39256 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmb-0000aG-Vb for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtm0-0000MY-1Y for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:48 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjp-0005Su-5T; Tue, 12 Nov 2024 11:27:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=+/wthXtnifImPs2Hk4cJ3xdXIeo7+KWlULakWyvu3ts=; b=YyAsaS5BytysovKDCP7t PgDquLXi6bW/bajLhAj/tIxunim9nNbK/Mq86UfOE3QZe52qaCzgTsluD+GPWUa6NMCu6vlERupar CZfD7lfDIVwTM1j0p0yaAEtWCmnTc1AIvqVd5MmpgukCJvNsdOY0Q7Mn77dnRyPCi46fqrGk4xebd 3KaNBvN3whhYDlGwfiO9K6WE+G1ZscKMLOcccbKab2KF8RyMtLvCv/aEipMX0ZPcGzBKveYUUVN+9 nIt7PmyOfVQE+8FRFD8IAVeH7uSIF96hh0rOpF6HrMn+KILcBc/rhIft2AXP89QSKBugveFd52bpU jLkPd5R/tVJZ/w==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:47 +0100 Message-ID: <4c0589e8f0a3a305ac75921c57f6d89301a43adb.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/flex.scm (flex): When building for the 64bit Hurd, add "-Wno-int-conversion "-Wno-implicit-function-declaration" to #:configure-flags. Change-Id: Ia0503e3f5c7aa5354a949b69035a1be6f93ec85f --- gnu/packages/flex.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 7972675971..cf2dfe9ec9 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2019 Ludovic Courtès ;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ (define-module (gnu packages flex) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages m4) @@ -53,6 +55,12 @@ (define-public flex ((#:tests? _ #f) #f))) (inputs (alist-delete "flex" (package-inputs bison)))))) `(("bison" ,bison-for-tests)))) + (arguments + (if (target-hurd64?) + (list #:configure-flags + #~'(#$(string-append "CFLAGS=-Wno-int-conversion" + " -Wno-implicit-function-declaration"))) + '())) ;; m4 is not present in PATH when cross-building (native-inputs (list help2man m4)) From patchwork Tue Nov 12 16:25:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70312 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 BD54F27BBEC; Tue, 12 Nov 2024 16:31:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2088927BBE2 for ; Tue, 12 Nov 2024 16:31:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtne-0005Em-3K; Tue, 12 Nov 2024 11:31:30 -0500 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 1tAtnE-0004ie-Ra for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnE-00065R-JT for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=/B1lM1S9PfXsm1I9I57yzgTSPIomWxKb7EzLgefUcMo=; b=Jx6GEnYNCwlBNwllpvopV+9lUVFqcbV+rLiGNLnILyykEbGkaqMkWrV1BYmwMx2sWWdaHQ8CccmzRIw28ApLS08Od7GAEfgGyRDxxmJmPgUuVOpQKPSgAV3Fq4vrvfld06yp5j2oWo2eIj31vYIXYWJvjhxhRK4NpYY/MvKgyccezG80yrYtR21sGHQ0kzxP/ZdPnVOsye0ZReqiHWdZ+Auqm9hnpVWoJriSEr7c6RnvSPNewXUtWZvgeyVDYMfvAh/RcX8ZnenQ/YZ+NBww1sjT51fbpIbdei8YUlS+O0S56rAVTXAD2e8vSGa9h0krsS9iBo0HQ84S9UzztVadYw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnE-0000dh-Cq for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 39/40] system: examples: Add bare-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290282281 (code B ref 74290); Tue, 12 Nov 2024 16:31:04 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:28 +0000 Received: from localhost ([127.0.0.1]:39263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmd-0000ad-Di for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtm2-0000Mu-37 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjq-0005TO-BH; Tue, 12 Nov 2024 11:27:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=/B1lM1S9PfXsm1I9I57yzgTSPIomWxKb7EzLgefUcMo=; b=LyZvcHoY3iQMwzs6GjO1 cJIj5rc7w8c0oimfFUz27sKk1KNZGOozruMHxIs8B1MTuV+4nF3Cgu/HxfdG7lfltaLpua2euPgIe gwdv8qAnKhmxB1xNX3Nd5+QhyMIO00okMX+DYlwlY4N7RvWdjWvex4bfLINrHWsHP4bX1PIBaeQT1 PEyly1Nh7pNE+xzlWXhX1G+LH5nR/kuq4s6Q4fc2Im4r47dL/RC7uSp131nygvQUpkihmX55ac4ga eq5tp7+HMhVXpW+AJCL9YgaxTmFqHiYqI1lEqBYHwsSPrYcIvHcITwZ5Cd2HiYmYqDxnf5J0uGwZt 0snWeMTljiBk6Q==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:48 +0100 Message-ID: <3621f843cd8df63d2d5c66774f1a953153c7e035.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/system/examples/bare-hurd.tmpl: Update comments. * gnu/system/examples/bare-hurd64.tmpl: New file. Change-Id: I8d26afd19afaa8fb3558948b50b0efdc0f83f29c --- gnu/system/examples/bare-hurd.tmpl | 21 +++++---- gnu/system/examples/bare-hurd64.tmpl | 70 ++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 gnu/system/examples/bare-hurd64.tmpl diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index 68c6d3c166..9bfa776769 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -3,23 +3,26 @@ ;; This is an operating system configuration template ;; for a "bare bones" QEMU setup, with no X11 display server. -;; To build a disk image for a virtual machine, do +;; To build a disk image for a virtual machine, do: ;; -;; ./pre-inst-env guix system image --image-type=hurd-raw \ +;; ./pre-inst-env guix system image --image-type=hurd-qcow2 \ ;; gnu/system/examples/bare-hurd.tmpl ;; -;; You may run it like so +;; You may run it like so: ;; -;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \ -;; -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ -;; -snapshot -hda +;; guix shell qemu -- qemu-system-i386 -m 2048 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --snapshot +;; --hda /gnu/store/...-disk-image ;; -;; and use it like +;; and use it like: ;; ;; ssh -p 10022 root@localhost ;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' ;; -;; or even (if you use --image-size=3G) +;; or even, if you build the image with at least --image-size=3G: ;; ;; guix build hello @@ -34,7 +37,7 @@ (bootloader grub-minimal-bootloader) (targets '("/dev/sdX")))) (file-systems (cons (file-system - (device (file-system-label "my-root")) + (device (file-system-label "hurd")) (mount-point "/") (type "ext2")) %base-file-systems)) diff --git a/gnu/system/examples/bare-hurd64.tmpl b/gnu/system/examples/bare-hurd64.tmpl new file mode 100644 index 0000000000..89811e458a --- /dev/null +++ b/gnu/system/examples/bare-hurd64.tmpl @@ -0,0 +1,70 @@ +;; -*-scheme-*- + +;; This is an operating system configuration template +;; for a "bare bones" QEMU setup, with no X11 display server. + +;; To build a disk image for a virtual machine, do: +;; +;; ./pre-inst-env guix system image --image-type=hurd64-qcow2 \ +;; gnu/system/examples/bare-hurd64.tmpl +;; +;; You may run it like so: +;; +;; guix shell qemu@7 -- qemu-system-x86_64 -m 2048 \ +;; --machine q35 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --snapshot +;; --hda /gnu/store/...-disk-image +;; +;; and use it like: +;; +;; ssh -p 10022 root@localhost +;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' +;; +;; or even, if you build the image with at least --image-size=3G: +;; +;; guix build hello + +(use-modules (gnu) (gnu system hurd) (guix utils)) +(use-service-modules ssh) +(use-package-modules ssh) + +(define %hurd64-os + (operating-system + (inherit %hurd64-default-operating-system) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")))) + (kernel-arguments '("noide")) ;use rumpdisk + (file-systems (cons (file-system + (device (file-system-label "hurd")) + (mount-point "/") + (type "ext2")) + %base-file-systems)) + (host-name "guixygnu64") + (timezone "Europe/Amsterdam") + (users (cons (user-account + (name "guix") + (comment "Anonymous Hurd Hacker") + (group "users") + (supplementary-groups '("wheel"))) + %base-user-accounts)) + (packages (cons openssh-sans-x %base-packages/hurd)) + (services (cons (service openssh-service-type + (openssh-configuration + (openssh openssh-sans-x) + (port-number 2222) + (permit-root-login #t) + (allow-empty-passwords? #t) + (password-authentication? #t))) + ;; For installing on a real (non-QEMU) machine, use: + ;; (static-networking-service-type + ;; (list %loopback-static-networking + ;; (static-networking + ;; ...))) + ;; %base-services/hurd + %base-services+qemu-networking/hurd)))) + +%hurd64-os From patchwork Tue Nov 12 16:25:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70314 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 4C34B27BBED; Tue, 12 Nov 2024 16:32:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 8A48527BBE2 for ; Tue, 12 Nov 2024 16:32:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtnW-0004wS-Kt; Tue, 12 Nov 2024 11:31:23 -0500 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 1tAtnI-0004nm-Cp for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:09 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAtnF-00065g-9L for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=7xUDs3wiPNGoCi89giSbF1cq0bnz9itlj/AwYlPXGEE=; b=MqSwj+oPoQgVHu3wMo2FQ1dLmXhF/zobzuZrvSBiMo7OIMevQwClm/+wyVMsOWlgPFn+HaT98oKwF2IP1H0czlJCMrTpkdhA+bx9k9h//2lCCzWU2GCx9EP5v/ngldWErKlHv3zUIONrByTTnA3c1NOGB27OWCvmfYZF6Ia2JlyIjYSNvBDvOaZ1QhddfKn3jsFWLPaJiRxFdetAXlGE3L7m37mIuv4FOqwk/h/Kuof2lrKyj5ZZRHe8XS4W7Vb3R4Vq8bHlZRkCoT4DhRdK2AScXqH0BSN47ixxXmmcDkQN5Xhf7slqnIH10qIoifjqikZTWE5QlakvDAYyNakIYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtnE-0000do-VK for guix-patches@gnu.org; Tue, 12 Nov 2024 11:31:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 40/40] system: examples: Add devel-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 16:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290282288 (code B ref 74290); Tue, 12 Nov 2024 16:31:04 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:28 +0000 Received: from localhost ([127.0.0.1]:39265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtme-0000ak-1m for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtm2-0000Mt-32 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:51 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tAtjr-0005Tn-De; Tue, 12 Nov 2024 11:27:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=7xUDs3wiPNGoCi89giSbF1cq0bnz9itlj/AwYlPXGEE=; b=P4qz7Xtf7CXsvrw/AhDu Owe8UvJDOnp25398d4UQcbCPWy83T+d3hNGz5W8ybhD/cdgclNE+Ar1mUFU74q5I8kKdkWt7Fv9hg phiisHssZWGtGXgifmfZx84o7k7hnwx4hQfscoSU4WH+kkQKg7hiEubfLZOtcpv09RY1lqs4romdq e25u6ov+ya//JO67Hfrtf0oHOWSb8QFHKBBgc1ya81aeJaQ005JDeNiae8fgHiQ7/SyxcryvYcxcm CVLiH7qQHtEx9GziJ5KA7TWrDcrWmV3lHd0JC9vUPONB0AqLrKEjCzL5Ig99qjXdW1niR1D6EQ1ns esJIT+LvIPOkXA==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:49 +0100 Message-ID: <6e21691025e2b9a3284e5be628779b6838bcde54.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This also updates comments and removes the comment about a very old `bootstrap-profile' hack. * gnu/system/examples/devel-hurd.tmpl (hurd-packages): New variable (%hurd-devel-os): Use it. * gnu/system/examples/devel-hurd64.tmpl: New file. Change-Id: I54b6b0843f0dd635d89cca483ae43d23b20d21e8 --- gnu/system/examples/devel-hurd.tmpl | 70 +++++++++++---------------- gnu/system/examples/devel-hurd64.tmpl | 65 +++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 42 deletions(-) create mode 100644 gnu/system/examples/devel-hurd64.tmpl diff --git a/gnu/system/examples/devel-hurd.tmpl b/gnu/system/examples/devel-hurd.tmpl index 3dca0706d1..066bdfe9d8 100644 --- a/gnu/system/examples/devel-hurd.tmpl +++ b/gnu/system/examples/devel-hurd.tmpl @@ -3,7 +3,7 @@ ;; This is an operating system configuration template for a "bare bones ;; development" setup, with no X11 display server. -;; To build a disk image for a virtual machine, do +;; To build a disk image for a virtual machine, do something like: ;; ;; ./pre-inst-env guix system image --image-type=hurd-qcow2 --image-size=6G \ ;; --no-offload gnu/system/examples/devel-hurd.tmpl @@ -11,41 +11,38 @@ ;; You may run it like so ;; ;; cp /gnu/store/.../disk-image devel-hurd.img -;; guix shell qemu -- qemu-system-i386 -enable-kvm -m 4096 \ -;; -device rtl8139,netdev=net0 \ -;; -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ -;; -hda devel-hurd.img -;; -;; and use it like +;; guix shell qemu -- qemu-system-i386 -m 4096 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --hda devel-hurd.img ;; ;; ssh -p 10022 root@localhost ;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' ;; -;; or even (if you use --image-size=3G) +;; or even: ;; ;; guix build hello ;; -;; Building Guix, do something like: +;; For Guix hacking, do something like: ;; -;; GUIX_PROFILE=/run/current-system/bootstrap-profile -;; source $GUIX_PROFILE/etc/profile +;; guix shell --boostrap -D guix ;; mkdir -p ~/src/guix ;; cd src/guix ;; git clone https://git.savannah.gnu.org/git/guix.git master ;; cd master ;; ./bootstrap -;; ./configure --with-courage +;; ./configure ;; make +(include "bare-hurd.tmpl") + (use-modules (srfi srfi-1) (ice-9 match) - (gnu) (gnu system hurd) - (gnu system locale) (guix packages) - (guix store) - (guix utils)) -(use-service-modules ssh virtualization) + (guix store)) + (use-package-modules base compression file gawk gdb hurd less m4 package-management ssh version-control) @@ -64,23 +61,23 @@ ;; These are not essential and do not build yet. '("graphviz" "guile-avahi" "po4a")))) +(define hurd-packages + (filter-map input->package + (fold alist-delete (package-direct-inputs hurd) + ;; These are not essential, rumpkernel is very big. + '("dde-sources" "parted" "rumpkernel" "util-linux" + "texinfo")))) + (define %hurd-devel-os (operating-system - (inherit %hurd-vm-operating-system) - (host-name "guixydevel") + (inherit %hurd-os) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")) + (timeout 0))) (timezone "Europe/Berlin") - (file-systems (cons (file-system - (device (file-system-label "hurd")) - (mount-point "/") - (type "ext2")) - %base-file-systems)) (swap-devices (list (swap-space (target "/swapfile")))) - (users (cons (user-account - (name "guix") - (group "users") - (supplementary-groups '("wheel"))) - %base-user-accounts)) (packages (cons* gdb-minimal git-minimal @@ -89,18 +86,7 @@ openssh-sans-x (append guix-packages - %base-packages/hurd))) - (services (cons* - (modify-services (operating-system-user-services - %hurd-vm-operating-system) - (openssh-service-type - config => - ;; Set wide open - (openssh-configuration - (openssh openssh-sans-x) - (port-number 2222) - (permit-root-login #t) - (allow-empty-passwords? #t) - (password-authentication? #t)))))))) + hurd-packages + %base-packages/hurd))))) %hurd-devel-os diff --git a/gnu/system/examples/devel-hurd64.tmpl b/gnu/system/examples/devel-hurd64.tmpl new file mode 100644 index 0000000000..ebc9fe8138 --- /dev/null +++ b/gnu/system/examples/devel-hurd64.tmpl @@ -0,0 +1,65 @@ +;; -*-scheme-*- + +;; This is an operating system configuration template +;; for a "bare bones" QEMU setup, with no X11 display server. + +;; To build a disk image for a virtual machine, do: +;; +;; ./pre-inst-env guix system image --image-type=hurd-qcow2 --image-size=6G \ +;; --no-offload gnu/system/examples/devel-hurd64.tmpl +;; +;; You may run it like so: +;; +;; cp /gnu/store/.../disk-image devel-hurd.img +;; guix shell qemu@7 -- qemu-system-x86_64 -m 4096 \ +;; --machine q35 \ +;; --enable-kvm \ +;; --device e1000,netdev=net0 \ +;; --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \ +;; --hda devel-hurd.img +;; +;; and use it like: +;; +;; ssh -p 10022 root@localhost +;; guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' +;; +;; or even: +;; +;; guix build hello +;; +;; For Guix hacking, do something like: +;; +;; guix shell --boostrap -D guix +;; mkdir -p ~/src/guix +;; cd src/guix +;; git clone git clone git://git.savannah.gnu.org/guix +;; cd master +;; ./bootstrap +;; ./configure +;; make + +(include "devel-hurd.tmpl") +(include "bare-hurd64.tmpl") + +(define %hurd64-devel-os + (operating-system + (inherit %hurd64-os) + (bootloader (bootloader-configuration + (bootloader grub-minimal-bootloader) + (targets '("/dev/sdX")) + (timeout 0))) + (timezone "Europe/Berlin") + (swap-devices (list (swap-space + (target "/swapfile")))) + (packages (cons* + gdb-minimal + git-minimal + gnu-make + m4 + openssh-sans-x + (append + guix-packages + hurd-packages + %base-packages/hurd))))) + +%hurd64-devel-os