From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 00/31] Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: "Jan \(janneke\) Nieuwenhuizen" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17312348758931 (code B ref -1); Sun, 10 Nov 2024 10:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Nov 2024 10:34:35 +0000 Received: from localhost ([127.0.0.1]:55652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5H8-0002Jy-Rp for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:34:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:34794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5H6-0002Jq-FV for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:34:33 -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 1tA5Ez-0007Tb-1s for guix-patches@gnu.org; Sun, 10 Nov 2024 05:32: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 1tA5Ex-0007DR-Na; Sun, 10 Nov 2024 05:32: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:Date:Subject:To:From:in-reply-to: references; bh=n58E9ohwXzGeRU97edGTJjeJSF/WfgfRDeNanaCMTkc=; b=PVavsBKksb/me3 gQQLTgvqDT3MFqnb9dGTn5DbdpyjRVpf305vxmJ/Chi08ZIs6qk9oqbJIKpGDz4xEQAsCpxQuIloU 7BWELA4mzVJPWd7fCeKM/abXAT/CVJ7uPX/tyhvekwYHrZ9c/YZ4QfZmOJ7jbB6KkkYoP5IXIRJmd jqfoimyLrDN9XLsLwvhx/fMUH4ojqqNbMy7y+LPdhbSzHaM95fYo7E2fNeyu3E1ef8qTv+VKFZ2mz 5OIit7FAjsWaB2MxQlDgpSegQHacOlbvek10vWrty7ITx6IAYRrAh3dZFmwlWmLbU29qbTJj4AJtM O/Bao7Q39w0E5XW7csIg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:32:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: "Jan (janneke) Nieuwenhuizen" Hi, Lo and behold, the 64bit Hurd boots! Again, thanks to the help from the kind folks over at libera #hurd and their excellent work. Do something like: --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix system image --image-type=hurd64-qcow2 \ gnu/system/examples/bare-hurd.tmpl --8<---------------cut here---------------end--------------->8--- producing something like: /gnu/store/...-disk-image. Run the image in QEMU: --8<---------------cut here---------------start------------->8--- guix shell qemu@7 -- qemu-system-x86_64 \ --machine q35 \ -m 4096 \ --enable-kvm \ --device rtl8139,netdev=net0 \ --netdev user,id=net0,hostfwd=tcp:0.0.0.0:11022-:2222 \ --snapshot \ --hda /gnu/store/...-disk-image --8<---------------cut here---------------end--------------->8--- and login --8<---------------cut here---------------start------------->8--- 11:03:20 janneke@dundal:~/src/guix/hurd-team $ ssh -p 11022 root@localhost Last login: Sun Nov 10 10:09:00 2024 from 10.0.2.2    This is the GNU Hurd. Welcome. root@guixygnu ~# uname -a GNU guixygnu 0.9 GNU-Mach 1.8/Hurd-0.9 x86_64 GNU --8<---------------cut here---------------end--------------->8--- Most notably, besides the expected updates, this series adds an indirection for gcc and gcc-toolchain, (current-gcc) and (current-gcc-toolchain) respectively, as the 64bit Hurd needs gcc-14. We may also want to think about image names hurd64-qcow2 etc. and their defaults, vs hurd-qcow2/hurd32-qcow2. We'll probably also want a 64bit childhurd service, etc, etc... This series builds on/waits for #73927, which I intend to rebase and push later this weekend if there are no further comments. And I guess that the pending blog post will also need an update :) For your hacking convenience I have reset and updated the `hurd-team' branch. Greetings, Janneke Janneke Nieuwenhuizen (31): gnu: mig: Update to v1.8+git20231217. gnu: gnumach: Update to v1.8+git20240714. gnu: hurd: Update to v0.9.git20240714. gnu: gcc: Add indirections current-gcc, current-gcc-toolchain. gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. gnu: cross-libc: Support cross-building for the 64bit Hurd. gnu: bash-minimal: Fix build for 64bit Hurd. gnu: elfutils: Fix build for 64bit Hurd. gnu: grep: Fix build for the 64bit Hurd. gnu: patch: Fix build for the 64bit Hurd. gnu: libxcrypt: Support the 64bit Hurd. gnu: libstdc++: Support the 64bit Hurd. gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. system: image: Add hurd64 image types. gnu: Add libgpg-error-1.50. gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd. gnu: perl: Support cross-building for the 64bit Hurd. gnu: openssl-3.0: Support the 64bit Hurd. gnu: pciutils: Support the 64bit Hurd. gnu: libpciaccess: Support the 64bit Hurd. gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. gnu: netdde: Support the 64bit Hurd. gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. gnu: rumpkernel: Support the 64bit Hurd. gnu: hurd: Build fixes for the 64bit Hurd. gnu: git-minimal: Support the 64bit Hurd. gnu: inetutils: Fix build for the 64bit Hurd. gnu: grub: Fix build for the 64bit Hurd. gnu: guile-fibers: Fix build for the 64bit Hurd. system: hurd: Use 64bit gnumach for the 64bit Hurd. doc/guix.texi | 9 +- gnu/ci.scm | 4 +- gnu/local.mk | 9 + gnu/packages/admin.scm | 14 +- gnu/packages/avr.scm | 7 +- gnu/packages/base.scm | 74 ++++--- gnu/packages/bash.scm | 9 + gnu/packages/benchmark.scm | 6 +- gnu/packages/bootloaders.scm | 10 +- gnu/packages/bootstrap.scm | 46 ++++- gnu/packages/c.scm | 4 +- gnu/packages/chicken.scm | 7 +- gnu/packages/commencement.scm | 35 ++-- gnu/packages/containers.scm | 5 +- gnu/packages/cross-base.scm | 27 +-- gnu/packages/crypto.scm | 15 ++ gnu/packages/dlang.scm | 3 +- gnu/packages/elf.scm | 6 +- gnu/packages/engineering.scm | 4 +- gnu/packages/gawk.scm | 3 +- gnu/packages/gcc.scm | 69 ++++--- gnu/packages/gnupg.scm | 19 +- gnu/packages/golang.scm | 3 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/hurd.scm | 187 ++++++++++++------ gnu/packages/julia-xyz.scm | 3 +- gnu/packages/lisp.scm | 3 +- gnu/packages/llvm.scm | 7 +- gnu/packages/make-bootstrap.scm | 60 +++--- gnu/packages/mpi.scm | 3 +- gnu/packages/parallel.scm | 5 +- gnu/packages/patches/gnumach-version.patch | 23 +++ gnu/packages/patches/grub-hurd64.patch | 32 +++ gnu/packages/patches/hurd-64bit.patch | 56 ++++++ gnu/packages/patches/inetutils-hurd64.patch | 65 ++++++ .../patches/libpciaccess-hurd64.patch | 58 ++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 ++++ gnu/packages/patches/netdde-csum.patch | 18 ++ gnu/packages/patches/openssl-hurd64.patch | 99 ++++++++++ gnu/packages/patches/pciutils-hurd64.patch | 31 +++ gnu/packages/pciutils.scm | 25 ++- gnu/packages/perl.scm | 20 +- gnu/packages/rocm.scm | 3 +- gnu/packages/tls.scm | 9 + gnu/packages/version-control.scm | 8 +- gnu/packages/xorg.scm | 23 ++- gnu/system.scm | 1 - gnu/system/hurd.scm | 11 +- gnu/system/images/hurd.scm | 47 ++++- guix/packages.scm | 8 +- guix/platforms/x86.scm | 11 +- guix/utils.scm | 15 +- m4/guix.m4 | 12 +- 53 files changed, 1025 insertions(+), 246 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch create mode 100644 gnu/packages/patches/grub-hurd64.patch create mode 100644 gnu/packages/patches/hurd-64bit.patch create mode 100644 gnu/packages/patches/inetutils-hurd64.patch create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch create mode 100644 gnu/packages/patches/netdde-csum.patch create mode 100644 gnu/packages/patches/openssl-hurd64.patch create mode 100644 gnu/packages/patches/pciutils-hurd64.patch base-commit: 7105e7125882be35e334448eafd6d81b37b627f0 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 02/31] gnu: gnumach: Update to v1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.17312351319767 (code B ref 74290); Sun, 10 Nov 2024 10:39:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:51 +0000 Received: from localhost ([127.0.0.1]:55665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LG-0002XQ-Ss for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LE-0002Ws-9Q for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:49 -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 1tA5L8-0007lE-Hv; Sun, 10 Nov 2024 05:38:42 -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=OlP1p+Agy63T5Q3aWrUyFnLHQXBP7UhOmLkqMm41xBM=; b=HdW8euZ2vLICXU9UwSLy NdDfQJKbFNBBkMeHNwM+X9gVeRgsh0JMVghLC3uzCa8SsLohnbOZJkH/uMhVqiQhYlJYikYGyCW4R +gLCCWh2AemjV1zRzUrAQGriToq8ZN1vqSx6bg21Q9Y4vKr/A5OCbilMr2vFUUJnoIGgov4ZIH8OR 8m6QKN9AJmI444bh9pGkZGrF62uxX2h2VeK23PytUPzTmy0SeQyctfjwNx2cNq6Apv/daSQVSwb6P alNhdX0R2gp/pSzkmHe91fIynZpECcbgODouOIMMoexuJJ7PrtIHymV1E0EIAf8q3PntG0xRqAD7w 8DZIElrRQm87IQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:37:58 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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. Change-Id: I147c64021c2ee79dfc4cd4fd9a29529eef8890c5 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 9 ++++----- gnu/packages/patches/gnumach-version.patch | 23 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2c810117eb..4d3ee9ea35 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1459,6 +1459,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/hurd.scm b/gnu/packages/hurd.scm index 0a7db31e1c..28f39cc448 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@"; -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 01/31] gnu: mig: Update to v1.8+git20231217. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.17312351329776 (code B ref 74290); Sun, 10 Nov 2024 10:39:03 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:52 +0000 Received: from localhost ([127.0.0.1]:55669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LH-0002XU-IB for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LE-0002Wt-9U for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5L7-0007kq-0y; Sun, 10 Nov 2024 05:38:41 -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=auKcBDNSo1NhBm3IxC2qXvyrIyuZxusLWl6k1n9ZpFU=; b=g5NNSOo19Fxv/xivI5Zc 5JgEbJ8Qyf18X0b4rUQXhp+HmXAUs8OVGc2043Ckdu5Olg7THM8hsh+DNnvth1NZ7xpQU9r1+Xkfi CtbO2Xlk2SFsQHvpJ9mqBSRMnukFtX0dTH63SCcfDHwGfWlDquzOeFZjCaa5/MoIA3/J+ciKcb+N3 eVlKd+PsYfr2JP1DY9lwCc+S1DJIVbzTSCmZqqDZQR7f7jYVG0O0LPEzf064shU1rVOA80dTFM8+/ puTeuji9ysEX+kd9MpNSL9Ch+vlT1B1ck4BFpvmEcn+vKx8BJXkj+NOevcUaK1FFRAupTs3Yl8NH/ ZCcj5VUdc8Dmzw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:37:57 +0100 Message-ID: <2b7c13c96850e5a00c9986fcad82215d06405291.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (mig): Update to v1.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 9c1681f236..0a7db31e1c 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -93,7 +93,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 @@ -102,7 +102,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)) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 03/31] gnu: hurd: Update to v0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.17312351339785 (code B ref 74290); Sun, 10 Nov 2024 10:39:04 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:53 +0000 Received: from localhost ([127.0.0.1]:55673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LI-0002Xd-7Y for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LF-0002Wv-JY for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 1tA5LA-0007lx-7v; Sun, 10 Nov 2024 05:38:44 -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=rZoDEHEogHQvhH1RnKmgRuCcRE4vSSJxHYymrmWOqwc=; b=h2XFoeuRxdGBoX5wiNxm Dt/pWwb1FNmELnYKsBWrN8opadwCJqmGz5U41GYYfcDCARM9skzJ5FhTP1jLpuV2LlmAcRmLLPIMR RetIyzZPQAtpy/4aJe9Y4fsQfAuaVkFY20tR/DPeLLomA7AJQkbCkZpbjDJD0MiNkSdrZr9ociNLl pmHi2M5UtKx50rWY0oXa4ibNu80TVV2aEWzb5CmHQOIIzCyFUkMmffddYqhGzdACWsDxgUC33pIb8 8PzF/yPDmB1QtB4SaFyhIX6+4ka2RKrQ3Wpbj+VdRHGQNawBCt6EogLTTB3+spJ1MwFBi0M75pILl T863AvivCr50RQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:37:59 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd-headers): Update to v0.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 533a4154d6..6e1ebbcc9c 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1534,7 +1534,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)) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 06/31] 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: Sun, 10 Nov 2024 10:39: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351399844 (code B ref 74290); Sun, 10 Nov 2024 10:39:05 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:59 +0000 Received: from localhost ([127.0.0.1]:55687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LO-0002Ye-7I for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LI-0002X1-Mw for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:53 -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 1tA5LD-0007nQ-H3; Sun, 10 Nov 2024 05:38:47 -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=DcX1d/5FWO8fEIL7UFmB zfPLeTWEQJhAu72lqzrDT2yJ5obvWfrJtLRW9lTu5mMNAtsZxmQZ3X7bBuORPGQtx2DCKW9NgtTia zGnwnITNWD79IivB9Ev1a71h7qE9eqtv93yXAYf3rwbcAmf5INEEXbebJoSs0fBiOyvTRrxqoCSp6 j9XbGKPsnNlhp+T9y45knjVBedLgYtpxVxowrxcjBifPSRZVHkikqFP7U90OVs3PGglf2O8NMRfmM CEBatdgqK1SzKoB7Ph4X7fpk0rEd7ohz5fWGiyGPXgupqgn8hKse5biiO97jlUAipa+Tmx/Sp+/Xc ard8pXU3fCkXJg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:02 +0100 Message-ID: <5d540a65fb1897c844300061df1eb72ec630c4b8.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.6 (-) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 05/31] 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: Sun, 10 Nov 2024 10:39: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 , 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.17312351409872 (code B ref 74290); Sun, 10 Nov 2024 10:39:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:00 +0000 Received: from localhost ([127.0.0.1]:55689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LO-0002Yi-PR for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LH-0002Wz-Kr for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:54 -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 1tA5LC-0007mW-Es; Sun, 10 Nov 2024 05:38: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=JSdEcX3sZCU76Ep2Xqc0XkFMC0VxBU5XH+XwIzFMQV8=; b=Dd5zI04S4ScisUo6mISQ tfsr7Vdz8G/BP9eR2mSo1i2gJrLHVfywVB242Ah7Q+35oz8bInvDS/VnBYuw15HfrSGf6872ejLXx TocMkAwH8A/kA7rcDBOfZQdr+zRDUUIdvd9RJszMzz/moiF7hMBFu1N0JdXaxz09B05By9s2d5PZu kcfnJ7OlQ+KlXZPF4IrXnM9DlrrD0AJibsjyEgk5rse9Ybo2Cn9Z15t2Rzb0Am1Um51Oaq8b5V3nD 0VXI3tQeFmBhWVnrNI1SGZTmCC5ZY8V/qv7DHPnwu2qHC5J6ylD60pGnCDwKeEnw8KvLKSA22zll3 1ybxgQRVvZYL5A==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:01 +0100 Message-ID: <41db48275160489ce01568c14a301d2724e5f4f4.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.6 (-) * gnu/packages/bootstrap.scm (glibc-dynamic-linker): Update comment on where to find shared linker name. * 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. * 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/commencement.scm | 6 +++-- gnu/packages/cross-base.scm | 6 ++--- gnu/packages/gcc.scm | 32 +++++++++++++------------- gnu/packages/make-bootstrap.scm | 40 +++++++++++++++++++++------------ guix/platforms/x86.scm | 11 ++++++++- guix/utils.scm | 15 ++++++++++++- 7 files changed, 76 insertions(+), 38 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/commencement.scm b/gnu/packages/commencement.scm index 2b43759dac..682deb89cf 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3642,10 +3642,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..18281198ba 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)) @@ -446,7 +451,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 +469,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 +489,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 +564,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 +587,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 ".*")) @@ -813,9 +825,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 +868,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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 07/31] gnu: bash-minimal: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351419884 (code B ref 74290); Sun, 10 Nov 2024 10:39:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:01 +0000 Received: from localhost ([127.0.0.1]:55695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LQ-0002ZB-Eu for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LJ-0002X5-Qq for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:54 -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 1tA5LE-0007nd-Kr; Sun, 10 Nov 2024 05:38:48 -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=iBc/okg+o6wRCrngouyF BSqh5R12HAfyxmy4MmQS/sz/1k8/PAbfePpKcx2fYF1QMvwNRW7YEXee3ppCYUjJn/pKk2sX0XlO2 ccMFiBLAuLQulicXbGh/FQFf7yircNVREOmcd+2Na1xN2I/l5sc74mnEzMYoR1OIw4Sx2jHqskT12 4dzIwr1lHLvecJBFRgtL4gpx14O9EQUJxGbIPZS008stInpgHVHO/7vp1+lEpLkOrY3BrnwoHINid zUUkFvdxfKovzQUZ2VDBJ4IpPRnoecn84ge7eocKNyNl8YMFoA4O3ktp6fn6a52mgLaiyopKzmrhj UmXlXd8MdR6CSg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:03 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 04/31] 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: Sun, 10 Nov 2024 10:39: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 , Efraim Flashner , Ekaitz Zarraga , Guillaume Le Vaillant , Katherine Cox-Buday , Ludovic =?UTF-8?Q?Court=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?Court=C3=A8s?= , Munyoki Kilyungi , Sharlatan Hellseher , Simon Tournier , Vagrant Cascadian , jgart Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351459938 (code B ref 74290); Sun, 10 Nov 2024 10:39:08 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:05 +0000 Received: from localhost ([127.0.0.1]:55697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LR-0002ZP-71 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LG-0002Wy-Tu for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:55 -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 1tA5LB-0007mH-FI; Sun, 10 Nov 2024 05:38: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=MG+VinxqeEt9sHGJBjYsbzkB3oQWjKWdLFD2N5KB47k=; b=kjMeye03qRUy9z4A951x lRJp1zmj2a9YXaZvQs+MUHAwdRnldt6lUEXtFEehS7J/xnbXLRM15UQ27dkKljc5iZTBItqQNRxoq RbbUKDYYhtYomRSguEDnvq7n3e84h1cesnUE2Tt2iLKZIbkKrHLwAT/c7uGLBydltdVAi0xQ6dm4O hrXP3mMOoFsbH0rIDDSEU+wogLDs5Gt1bftHHA4dDTP4TPyQpH19CST77mc9S/vLCJsJrrr0IOZKb gN+yaw9Ms8JDJn1HgqGSDpUK3u+lZ0JDJ/34+FpbDfndI4dWqXsP9g4/wM4xMFkOWxUAPCYdR/Aaa DSAGgMpEzEoi0g==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:00 +0100 Message-ID: <3e5801ce2795b91ba96a60ad239de717d0337a97.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 fcc1088fd6..8ae9621e5b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1707,7 +1707,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 3743ae3e2a..64fd3cb86b 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 ce40f0cea6..2b43759dac 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))) @@ -2951,7 +2952,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) @@ -3218,7 +3219,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"))) @@ -3541,8 +3542,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 @@ -3639,13 +3640,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 d32bc2704a..78304cebbc 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 6f449f0c39..07f3edd4dd 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2336,8 +2336,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 00dde61f2c..27e0db9cb1 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 9f851a478e..cd2ad311a0 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 85f8a114c3..c0e3f44bcd 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. ;;; @@ -665,7 +666,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 @@ -737,7 +738,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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 08/31] gnu: elfutils: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351469958 (code B ref 74290); Sun, 10 Nov 2024 10:39:08 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:06 +0000 Received: from localhost ([127.0.0.1]:55708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LU-0002aE-Rw for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LL-0002XA-03 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:55 -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 1tA5LF-0007nl-Pv; Sun, 10 Nov 2024 05:38:49 -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=IPb8hafcbYQo0pmn1P4u SnlFFngfZRPruy3jy/SbIhUfX7bfJLo/c6A13dQ3dUG8epPVPvj1ouPO/1gzIAvumsGLD2MelQ+2P jF655nlf548ZrOlYb+RoooZ2HmuoZSppEBmjq/cKytvAIoywFGcRdZZVo4ISzHIeXmPVmEVl6AMZz xuzkCQzsglNBiMJMgX0eBrKRlljfHTg1BXESKj/9A5J+0aqUcuOt7iNTBvKEbLcLnStON1Q9LFbDz n4pNfh5CtdxFErDRfNxNJO/J5OALJHndjh/Csudjt5WoViOyMTuwE7OJK7+T/Z/i6bcWJL6Ty3MZK 0aNNisLTNaMGIA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:04 +0100 Message-ID: <3112163cbeb58f04bff54368364741ae8a16cdcc.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 09/31] 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: Sun, 10 Nov 2024 10:39: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351469977 (code B ref 74290); Sun, 10 Nov 2024 10:39:09 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:06 +0000 Received: from localhost ([127.0.0.1]:55714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LV-0002aY-Pd for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LL-0002XR-Ua for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:56 -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 1tA5LG-0007o9-OF; Sun, 10 Nov 2024 05:38:50 -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=VhuMbHSX0X3DYs1KOFJk TRkfOjtlcsoSMOQwlVHb7nr5pjW65vBBfonh1m+m8GfhXJ2B/vJeEmGBzp2H/pmmh6F1sj7M+Y/yR TB2ZV//fCn2OIZcG99lYQ4RJHODBAB/fRLj6iHJCnpmsJGtrzXbdmz8Re54qMZVWM2pm30/gO6Ic9 8sJC8J4G6Q+hxJTnEzxE37/GMB1LKIWxy5XuMo6Hc+qooc3CN+oBVPJcQ69bue31/Mxgs/W0EKs8k RdauEjoHdr9n0Xi58i6uZ48ToAxZ+iBdoynlpK/LiwqBGUHJE7Hl5awPTVl/PX+inSY4hre+XV/GO 0bOhRahHC+1PWA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:05 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 _ -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 10/31] 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: Sun, 10 Nov 2024 10:39: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123514710000 (code B ref 74290); Sun, 10 Nov 2024 10:39:10 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:07 +0000 Received: from localhost ([127.0.0.1]:55716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LW-0002as-Gi for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LN-0002Xb-4A for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:57 -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 1tA5LH-0007oQ-NH; Sun, 10 Nov 2024 05:38:51 -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=E2p28313YlPQRYVrpAxj 3XEG41ytd/HGhiq+p4u54xdLAJTee2dHLwPaKu9mGzXO6wW8qImQhmoiVHDohKt4kMECOZQ543w2Z 0exPerg8yKP99mRqrt4KVuEdwYlOHw5eGFy3O9B/bfQ2bUeygAtVK+F1nPEluCp9r6OLFvqyx/L0J mkwNu7Rjk7EhiwmSCr0GFs01s1JTrxTQNm2JcmwW/x3fv+rz1htswoEcy2cfXra5QdDdQJc1iFRGO GVnpwRsmJYwdGfO49UhNEh65jz3IkrPaNt9YyYoorReS1lsg/mk3qbIWeGaCxsJCrm/LfS7ZSSbUS CLepgciIsNoCvw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:06 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 '())))) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 11/31] gnu: libxcrypt: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39: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.173123514810016 (code B ref 74290); Sun, 10 Nov 2024 10:39:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:08 +0000 Received: from localhost ([127.0.0.1]:55723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LX-0002bC-Fj for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LO-0002Xl-0m for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:58 -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 1tA5LI-0007oZ-Qs; Sun, 10 Nov 2024 05:38:52 -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=1FDCkthV/PlW3VLUz/brPBgC4PiYjOo43MRl9Sk9oSs=; b=MW7j9MJzPcqFMAohiuCj a/T3fTCJg5hxMHATkFLIuEaBA5W7R+tUCVqnkQmp01oI6qaq6LTLGdnso1ZgxvN6DsWqmuPqJfmeV jvmj7svOYkwJXPZJgmCDnucZXe2OQvry9i9nvgQz8x4Sa+LVGhyWmbVDOv+xP9MJyU1PEBNdclKtH VDm4Pab1l+3GPQDizAvzhFPJMTf8NM8ahbTOoYrCtmxnJA2xbWgirqpnecBT9DxZeDworPiNyhcoF /0uHC3NLF1N++C661RXInetkqpE6qDm1Qo2fA6j6bufLDQxx0m3pni1Ha6lGY75kobc2wMLcqX5Kr FSb6UoHkPyIJKA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:07 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 4d3ee9ea35..4b9fa95658 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1725,6 +1725,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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 12/31] 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: Sun, 10 Nov 2024 10:39: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123514910039 (code B ref 74290); Sun, 10 Nov 2024 10:39:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:09 +0000 Received: from localhost ([127.0.0.1]:55729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LY-0002ba-Lv for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LP-0002Xy-5e for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:59 -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 1tA5LJ-0007oj-W2; Sun, 10 Nov 2024 05:38: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=pm8WZDRbhwfLn8ytzU4EtmSzH6LGbPoUL3FvdFoUW3E=; b=W1DffoPOX/WepIvXC+49 C183Ks44I6D28EVBOPDd+nrpI1RVNaRoeVzv1TWUeepAVYL/aDhEjXaKGuPIst1qDGz5+B6mAxeEC npTwIw9K/sy0HoUy1h6KFiqxHcOWUkTfEnkN0+TTmRGQyJFq4oHlPJECK8IDtwAEXrC0HoQL+0tpk 4+enqP/e6QbWAXlOO9IS2p+pw1M4XfeE0siUIXa/rtiUWwD+JXf/Z05yPSJ85bLMvd58eNA1TYeeA 9fU0oEzInYUhfc0ftZ6gIU8G6WkCMsW9oXGCDmejEAKDtWJ3/YbYX/OHwbTit9DM68Y8eAxBw990M rywLEmVOBoAR/w==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:08 +0100 Message-ID: <1351fabb950e28169511b86e1e85fc197eac1674.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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=" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 13/31] 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: Sun, 10 Nov 2024 10:40: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123515910151 (code B ref 74290); Sun, 10 Nov 2024 10:40:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:19 +0000 Received: from localhost ([127.0.0.1]:55761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Li-0002de-K8 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LQ-0002YA-8L for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:00 -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 1tA5LL-0007ou-2O; Sun, 10 Nov 2024 05:38: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=dxsipSKXtyTMm+IKaV7Euha9ospjvvMuWJs2OXXEos0=; b=rrWbjEpHoakMK4ZMrc/x /rps4G7/yjEU+UqV5UK1ur8UbwVeCNXW5L/Kx0NWUtKG0zQOt6MvFXk487YGNNbCUYwB5qU0OlxO2 axDpGbZwqn14J9GmQkhdzUxXdvif+VUIhpuMuiYEqBa13Ni3RkgOIa7WbsABVJZJFHzq8d8HRU4Od kdhROTJ+SjZltp9x4i8dzlBWL+a/fqtXC2Yyc5TUTT3c0POsv6VgFKj7dk5OuKsnlF7JwGLgCscTL DCQxQGpHKGKoKjPuvsJ+6/ly7CnYpgflXzg1KIM0CSm+eGgGytlNynDqQdeZS1Wtmw6oFhOc5AXaw pkghNkH6X3VvtQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:09 +0100 Message-ID: <7a8acd375aa807b7d4386ed8052aa743261c42ce.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 14/31] 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: Sun, 10 Nov 2024 10:40: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 , 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.173123516010161 (code B ref 74290); Sun, 10 Nov 2024 10:40:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:20 +0000 Received: from localhost ([127.0.0.1]:55763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Li-0002di-W8 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LR-0002YT-Hl for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LM-0007p9-9l; Sun, 10 Nov 2024 05:38: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=o32zx2obtPDkW7vhpV3sbeZpzRBMk0ENuE3/jKRCM2k=; b=nz5qpzDbjLpL/b8a2uHQ 4rYc0gr7sFNaMBTbwiFFeKIfuKJXj46dXW9OmgdNT+nWcdTmV3taN51HkzdClmnGyPD5YvY+gCKeM aXeWbHWeVY6j4/3dB/rNY6HEXUeRTDm3kzV+p+C5vW9SToaq64/TZsgco1QsKbQaCFT2oPBmJT3Me f9kA8qMRqqqAbtBV6T0I34fdo/slqmrCmTvsRtFhoVqh1ObBio6/cD6bKYuroHjI5jhgAkAupX4oH IdFaOIuaBRMZTlS39AIRC4T/44lvhpE1Jvs5QyR6ZjHVdEuT09hG97anfiPKAtgR34qwxyu8zbU0m Z/dIrVWka43Mcw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:10 +0100 Message-ID: <43e8a79925bda014c70618de24c2936772bb829b.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) XXX TODO: v Boot a 64bit hurd and 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: 7a8acd375aa807b7d4386ed8052aa743261c42ce 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/sm23f2g91k554w2clcm9l9airwn9gqmz-bootstrap-tarballs-0 With guix hash -r: 1v9ld86vw76drrxlqf0b930644mgj6mgxqak9ybx4h0xsiczxisw * 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: Ic0e09d5b3b035aec27c7274e57cccedee9c0611c --- doc/guix.texi | 9 +++++++- gnu/packages/bootstrap.scm | 42 ++++++++++++++++++++++++++++++++++---- guix/packages.scm | 8 +++++--- m4/guix.m4 | 12 ++++++++--- 4 files changed, 60 insertions(+), 11 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 187bae6898..73692d73d6 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@* @@ -637,6 +637,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 c4640b62e1..eb6a4f1917 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -118,13 +118,22 @@ (define %bootstrap-executables ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k"))) ("i586-gnu" ("bash" - ,(base32 "1as8649aqaibahhhrvkj10ci8shpi4hq5n7gnik8rhhy0dc1jarg")) + ,(base32 "0nb8ga2j7a4kf6j7pnavq8zf68mj8mhqh26nwkilz1ykj86vg9ml")) ("mkdir" - ,(base32 "1snqgpfrl00hfn82lm29jqylzjsfb9jd6ha74dp12phwb8fpbmb9")) + ,(base32 "0ldsx9pwan40fx2hf4s9d10sfkhvkljvl20hksvm4192p7jb4shp")) ("tar" - ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m")) + ,(base32 "1z6kfvpwhy14vc52i61v1vzzk3gzxka3db5rlg1jsq6kli35s2ab")) ("xz" - ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5"))) + ,(base32 "1f7g40sk5a6k6qf65k58vlybnnmhyyzczdxy60m3jgcsp674wfcr"))) + ("x86_64-gnu" + ("bash" + ,(base32 "0l0dnighcipvdfbk14q834n57q859i2b9ssiq4bnbh0jpxvvqp1l")) + ("mkdir" + ,(base32 "1nd17k8pwwi7zsqi685w4rn1p2cvfcalrzdhfgwpsk1ilxnmdvsq")) + ("tar" + ,(base32 "0lf94y22ngmxdwhsp0cvj33m23p33r999xnlrff0s1yvlf20w3ks")) + ("xz" + ,(base32 "145aq65rx7w0qk1sw9239888id5ri60ha0xp1kyp6ir3pvizh6by"))) ("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 "/20241110/" 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" + "/20241110/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 "0fgasmbidp584ibr5fbirmp3wr8qchv84a50i4bichysp00gg26p")) ("powerpc-linux" (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")) ("riscv64-linux" @@ -598,6 +612,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" + "/20241110/static-binaries-0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/static-binaries.tar.xz") ("riscv64-linux" @@ -625,6 +641,9 @@ (define %bootstrap-coreutils&co ("i586-gnu" (base32 "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) + ("x86_64-gnu" + (base32 + "118s161df8hgrdfph2w5spnrms02rh1dk7mzfvx1k1prvgngpm9p")) ("powerpc-linux" (base32 "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x9d1fxxa5y8m")) @@ -681,6 +700,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" + "/20241110/binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/binutils-2.35.1.tar.xz") ("riscv64-linux" @@ -711,6 +732,9 @@ (define %bootstrap-binutils ("i586-gnu" (base32 "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) + ("x86_64-gnu" + (base32 + "07r74sa7341frhf5a7h1p3pklsrmfpfrf5s8dxm3yz2kqzhish48")) ("powerpc-linux" (base32 "0asbg1c4avkrvh057mx0942xwddd136jni382zqsxzn79ls42yq8")) @@ -771,6 +795,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" + "/20241110/glibc-stripped-2.39-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/glibc-2.32.tar.xz") ("riscv64-linux" @@ -801,6 +827,9 @@ (define %bootstrap-glibc ("i586-gnu" (base32 "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wjq4ig2")) + ("x86_64-gnu" + (base32 + "1dcgrnlxbsdic0xmmrjbr8gl6ra5y2xbj8f8jr6y0zvpdyi12ldd")) ("powerpc-linux" (base32 "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6ba25sb")) @@ -877,6 +906,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" + "/20241110/gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/gcc-5.5.0.tar.xz") ("riscv64-linux" @@ -907,6 +938,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]) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 15/31] system: image: Add hurd64 image types. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516010171 (code B ref 74290); Sun, 10 Nov 2024 10:40:03 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:20 +0000 Received: from localhost ([127.0.0.1]:55769 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lj-0002dv-Vx for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LS-0002YX-Jp for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:04 -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 1tA5LN-0007pZ-Da; Sun, 10 Nov 2024 05:38: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=/pIhBQFbHM3Hte7KNbqHtKa6WkH0OGOXfOnHnNHczww=; b=i5TbD8+FsI+swv5s9TkB TwXTQNQxSAeoBVtwc/P2ptXfBVQaV/RqPAFxPGuAV6+UXHTngi+UhdiECCyVSb0Z7wJK+oJUBu6c/ OsQAfVLghMF+VB5ZsbtcT8uqP5KsXhDpG+EJpttJgzLlc/v/uJfwSDJm7iVMGc/7CIpex8upzQosi T1Yu6vjvwwwTwhyQBWysnEg/f3SDSwnJdwS2LpMRJPvPlWHhAqn0xSBkeD6rj/jg4HGbpuR7pV5IR xY9uBMaNi4YE3AfXu8cyZEq5LkG0dh/ELg59yEAB4x84TcX/nWo5xB1unhcontzdImZNhVMTEmPQZ yl/7vuxnlzYxJg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:11 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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. Change-Id: I68834a4c5c18b0e154d06082824008d13ca52214 --- gnu/system/images/hurd.scm | 47 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 01c422a54f..75f255ed94 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,13 @@ (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-disk-image + hurd6-image-type + hurd64-qcow2-image-type + hurd64-barebones-disk-image + hurd64-barebones-qcow2-image)) (define hurd-barebones-os (operating-system @@ -115,5 +121,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 hurd-barebones-os x86_64-gnu + #:type hurd64-image-type)) + (name 'hurd64-barebones-disk-image))) + +(define hurd64-barebones-qcow2-image + (image + (inherit + (os+platform->image hurd-barebones-os x86_64-gnu + #:type hurd64-qcow2-image-type)) + (name 'hurd64-barebones.qcow2))) + ;; Return the default image. hurd-barebones-qcow2-image -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 16/31] gnu: Add libgpg-error-1.50. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516110185 (code B ref 74290); Sun, 10 Nov 2024 10:40:03 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:21 +0000 Received: from localhost ([127.0.0.1]:55771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lk-0002e0-Df for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LU-0002Yu-2h for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:05 -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 1tA5LO-0007qL-SW; Sun, 10 Nov 2024 05:38: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=0Q8BSZH9F1mogIzJkXEZeKbFtAB7kmxUHmYS6qb8Iro=; b=gBJz9duuScG8JiFAOjID fqEX1NLBuHI3mVZwCFmxP1dDmMsRUtzkJ7vie+ivulzFrJfQ5gTWj/03+eBlgmFsPse6b+PhlWK8G HiYoyiqid+il6Haba/2PKcoi+4HyaIOLIEY+8x4oc1gYpkVP0zTALbCxvGzM9J7lfh3GbCCmrHy1L caZAWi7qJ/uf+2E2/qpNWZyUn4+nhGBsuer0jAEfvD9ISLKr0YGpFx4Eb6ISFZIrnQCXtWeEobLAz kvzewH/h3LBkEiSVKT/cPG1e2w2gLeQAnHjVNIznEB2+wgk7rdnWYngdKS/80wlKxKadVimRTUwXD l+/Js+iPFwIuxw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:12 +0100 Message-ID: <035b5874f436601f436bcfe480890da38c8ca0c5.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 17/31] 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: Sun, 10 Nov 2024 10:40: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.173123516110193 (code B ref 74290); Sun, 10 Nov 2024 10:40:04 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:21 +0000 Received: from localhost ([127.0.0.1]:55773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ll-0002eD-7f for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LV-0002Z8-8S for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:06 -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 1tA5LQ-0007qv-1j; Sun, 10 Nov 2024 05:39: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=6UN3E66LwSQz+zuLe6syFhhjnZVqBglUvR+s+GDG5y4=; b=DSIb4e7yXDMNFKflov2C Kq3Yy8RaC7dtZtGfkE5pNbsHjJjwYG0M54cgZ3NwD2TE9gPyhCgG0FRbmp6Vm6QdHf9pAKR5nt01a rEo4tfyrHbSn/l4pWRXX4ls0WvO0djuVOGfxxsdLyUqaBYSoEUiMyy++ukO+iI+lQbiwJ33tBr5ko i2vP/kxgUVr/l57r8tXE/NaLxoUxiqrLCHl5yGvH6jJ+GWi2UyMum0VKnmme/9FRLaXRKzv+CUj0B edC2R/x7ThdtKXpwEYUT6gpw0iZwGayDyo4ZVRDIWVLCvts0s6Hn7O2yILL9J0McJu8ZRW7DX0uAk r5snbAPxO05qHA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:13 +0100 Message-ID: <668ec237bdfe5be3c277094abd035fbbf7d07c2c.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 18/31] 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: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516210200 (code B ref 74290); Sun, 10 Nov 2024 10:40:05 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:22 +0000 Received: from localhost ([127.0.0.1]:55776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ll-0002eL-Jr for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LW-0002ZY-NP for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:07 -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 1tA5LR-0007rJ-8s; Sun, 10 Nov 2024 05:39: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=P/MMktGnhzYi8k7FGo8p1orL+OxYAsbOhgD6lzSd7YU=; b=A3DpGqd3uHWEo4Ds+TDN GfCclGd3lJevcs6Tw8ty4dK/JbfWEsXzAXUDBVfSbAXWs1LkGhC2jOKQPdkwZRsObg+DQ49gn4DOg fpM77stP/bPjVnhRDWtrjpkb9Hev8joOepmwgEAOsgtjMajisEXJx4lzm/grlpzucyOimtYkjdg8Q wD/VDue/19o9mnezgM8sULpAN21J0MMI+s/RD8rwJM1CrRFHja389Xb2yu+bl4WScwZPkPOsnAcIN Rx/TVodMo+aTtrxMu8uORqfz8Aql+oCx2FXBNwJ3xrJbT8yuZXC6tqErVpUuXwESR6G28QBOCfUrl Ve82KbOrjMfNlQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:14 +0100 Message-ID: <05a9e4531639c0b21f2cb936d9fd605539360315.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 19/31] gnu: openssl-3.0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516310214 (code B ref 74290); Sun, 10 Nov 2024 10:40:05 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:23 +0000 Received: from localhost ([127.0.0.1]:55780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lm-0002eT-2O for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LX-0002Zk-TZ for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:09 -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 1tA5LS-0007rX-FX; Sun, 10 Nov 2024 05:39: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=jag5tGRDudH0E+YqI26kJk8f3oBdkf5utn/p9fD/kBc=; b=qAaNxZIEBlJ0kMWoTmL6 hPr3rBRTjegPXkCielWg8fi0H4a15vpuQzHndgXbGfBnoTClAg7oxq5/FoFtMXAeT1gSnZkWh1Ht/ ydGIudA2IROEY9/oRdDGrX7zd+Vs3isK6gCVqzDSLXdenp1i1ExDY4eXUh7H+wSwjyXMCswBTJrWQ I+v2XFxoChZ8zquDPoqexnqnyiGeK2lqdMiRq8Q/N9hnSjWh1b2ZNVtAUWczYcX6yk87JJXfrrrR6 Zt85UJ8mFRv9CGSMOWvFx55Q7AYcSjwzIU0S7tXwXD/Blcp90rjXl6Befw/z03HAJ83TnDNV9JNFg U16BVuzWInU8zg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:15 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 4b9fa95658..576f60579e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1891,6 +1891,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 1a1ce0d215..261a063090 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?) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 20/31] gnu: pciutils: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516310222 (code B ref 74290); Sun, 10 Nov 2024 10:40:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:23 +0000 Received: from localhost ([127.0.0.1]:55783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lm-0002eh-W1 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LY-0002Zy-PZ for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:10 -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 1tA5LT-0007s4-JB; Sun, 10 Nov 2024 05:39: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=m1a3mLpb/3ylbilza/nwuoQcqT33G4s02pDvsTGoLhI=; b=JagVNS3fpcfHh/Gg5bfV pn8RNIalQ+/4dcfp3qkVaBS1npJxmRWAWBElfr2ZSTjPVm9jWxOeE6EPRxCWFn8ZkqUbcPnHTrZqj wk45hHcOClUJ55pxXgP41MVSBkxL3l/hpM3ae62z+dWlphZaxMkGrL7xIM1gRL3EXv+3c43E8s8AV x0k5402AnNbl7jIaUvoCeSuC6VMkQzNSATtfF45+2Xjr4DZ1iPKEO75VHEn6mxJKwG/Xy6d6ZTVbN Ne55d1cou2qAWuYmQfLuK9jXIAQOVrjfUydwxHTzamq0XjbYQllLcJ5rcLFxPz7khIgJb2fhW1cyE DgrmU7sNmQDZGA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:16 +0100 Message-ID: <93bbee8b3e815afc25b5c833498b4f0e1d339827.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 576f60579e..ad18f62eb6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1906,6 +1906,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")) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 21/31] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516410231 (code B ref 74290); Sun, 10 Nov 2024 10:40:06 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:24 +0000 Received: from localhost ([127.0.0.1]:55785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ln-0002eo-KF for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5La-0002ae-Tv for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:11 -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 1tA5LV-0007sS-Mk; Sun, 10 Nov 2024 05:39: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=ch8tBl4fasBJAVNsmWjKzbKyQX4t7oVC9lkF79yxYtg=; b=D/oXMBXwA8rxzMeRfYSn OPSIOIC06DUky7/22MmeAiFMmGjagIlBBQHasm3ffWbFGP12a8SktcS2/hvlOXWshW41o1Wy99smV cbEbeVH/FWQKmzMcE7dbJKP6w+8ZR/vwyXKYKYkKbwzHy4bWfCgOqjzgXcjxzxZE/ueBuEaTFWGHM Rh7s9PFPIj8CWMuzHpplzDq9um9EEGQM1dmcjpmH4qt9121UgMmuXjdaX6vjVcYDCPoPGe0xSMFhX 943wbEyH8VPI49Ey/3qlxJQmI0P7p8egScfvSkJ34AKDTKumuqKvEgP4ZnZI80RmkeIHEdf4dyG8N u6gfU6brXaZegA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:17 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ad18f62eb6..1e81c16979 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1701,6 +1701,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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 22/31] gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516510248 (code B ref 74290); Sun, 10 Nov 2024 10:40:07 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:25 +0000 Received: from localhost ([127.0.0.1]:55791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lo-0002ey-Cb for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lb-0002b1-UZ for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LW-0007sm-Nq; Sun, 10 Nov 2024 05:39: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=9cVS8/xpqaTCAlyXtRUMZCH5gx2IXS+Ji2GCvK80Jdw=; b=hWWHRcO5JFsebQ2+fdrE U2gppgqMmQrkOwbU59ZdtS0hGqp18F+TNWzYUN9/h32THyDmIgBiBrBcBLIFPu2wp7Q1hCLeZw+nZ JLLw1hDnTC3vxoMx+km6P9fx3R9N2f5pZ29Oc0nSOvOI4H5ECsDAMYLxTs76vltx4RquEO4SYgehj 0ZRbsi/4GSsENplmAqVB7uJH6U+tPiJeLvduaIvmrIXN06jOytCi4TJ4vX7l/23x41MyHOMsTrA7t qVus9dmCrEmONHGDtd1FiZGXwbb0bUyrZ2024alq61DhQ5qfsLLnmeib4U98ZOWaE2qVe3yjOxQjg tDf5Pd9uyQBXZA==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:18 +0100 Message-ID: <971d5c18860f5dc1dba30ffa5f4dd817b5f977c1.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 23/31] gnu: netdde: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516610260 (code B ref 74290); Sun, 10 Nov 2024 10:40:07 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:26 +0000 Received: from localhost ([127.0.0.1]:55794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002fF-0f for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ld-0002bN-1g for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LX-0007t6-RR; Sun, 10 Nov 2024 05:39:07 -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=sV5SsB9sebbUu4v31xkcnewo2VsNGx4ihlTSUMGUz1I=; b=N25zDGH/R6nVxrOQHWtQ VBJgkoC1sw5pb24Oz4O48Li88lB9aa3L/fyD47uX7iOXoX8oFbWPPykJTYkkFEZv8pnoNG51gZ2Ha koW2uOEiLKwgRrZUvCNJ91UoSnwZbbrp+fhfZST9lc+alBaUQcikJx31qxqEIk52JEuTtWpYYKyKD NocqcEUdm8GE+9fEv3SAOTryLerAcpNTsIgDYDMwKWbx6kdTzZLsp9S+kpsFcY1A+OsgjObLozJwm 7x+w+TVANk+Cl+AjkjBGDx1mhV7S407X+4gwI8UWYS9pCA1fQNj20H16bdmXr6VEfMt5xAL6Tyh1E pFdCm2ZhdXFa9A==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:19 +0100 Message-ID: <22aeb4fc3065120e43b55b1a169e76b53e5da4e7.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 1e81c16979..9a4715df86 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1816,6 +1816,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" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 24/31] gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516610271 (code B ref 74290); Sun, 10 Nov 2024 10:40:08 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:26 +0000 Received: from localhost ([127.0.0.1]:55799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002fR-R9 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Le-0002bd-1k for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LY-0007tG-Pb; Sun, 10 Nov 2024 05:39: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=y9+iCAg1WrVw46boFuQTULP/2NPeZB7ptfiR4ET/Miw=; b=QGYXDN3Uj5bFtTw5/fQS 6qcK2/symSYsO9k20MLEikeJCUmPbI5iqLatn5CIhuk1DSv+E6CRrfcr+3757slFvxiPpyhm9zYqq jb1KbxnzUuQAHjtGGJkoGQssDQRNJkxqqWRTQfgoNYnZA9DcJ1cjPc5vJs0Mk1k/780D/7MphJUYr asSHcPbn/rLnQQkGJPB+T2f9MY+Xw2qM1tYWzagmW6bYgPX3e0qK66Rm8zv5YCDpNu0AZiGBwWSVb 8c62lDnUx64TYMwOJXCxhm49zI1VAqytZTiyJpIRO1hmSsjKsHdk6rM+PvhlI5+CjoAVeGTLr6cYV oTHfvFk9H06JHg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:20 +0100 Message-ID: <16521725d101731b06d55d21be690ee457fcd26d.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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=" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 25/31] gnu: rumpkernel: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516610278 (code B ref 74290); Sun, 10 Nov 2024 10:40:09 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:26 +0000 Received: from localhost ([127.0.0.1]:55802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lq-0002fc-Al for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lf-0002c1-4C for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5LZ-0007tV-NJ; Sun, 10 Nov 2024 05:39: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=Q2NtX7IDfA6q43nIMk6rOLLxA65uZVBfl0HnpJ80yvY=; b=kCib4YUbeGOKq9Y+DiiY ppGgmC4Qnv7cbiL5bvyF2DFZ6I7NpHf4x/tr1sNQIB+XAG1c8PWPGtkV4sHyi9nudYq3h0dbh5BMi PdjdmPN44Wbjco4eb8Xm6xl4yGC3bJXN3lF1nD72aGD80KXScYet249roC6h/pET1iFA6TzENoWRc Ot5MU4/QBSyet0mCYhZiXkQOAZWer6AnHWM3Oilm370b3rsYzqGkbZqqnPY4sJQ/FemIwf2f08TP3 VQwy3bvVBM7iYkDuDkKFOFKqnYy7rmZKha7GCgisnGbnLz7Og3KsNDU/hkshtNHWZniVmdk/xsllp V8rcwTPVOnhJGw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:21 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 26/31] gnu: hurd: Build fixes for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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.173123516710286 (code B ref 74290); Sun, 10 Nov 2024 10:40:09 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:27 +0000 Received: from localhost ([127.0.0.1]:55804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lq-0002fj-R1 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lg-0002cX-Of for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lb-0007uI-Hx; Sun, 10 Nov 2024 05:39: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=Ag4EZGIwGxt3LeRaxY2LpxM+Fiigr8DC4RzGYYe7q+U=; b=RBrQ4EW7gX9WTB/Ww+Zk lJbY9CRaL9cEW2PCMVTjd5RpHqyuY8D7nPt1fQA3GzTalZ3TIAQ0h8ZMd2c4hBw17gD1zG1ka0Vxu dlw6TUvUFO77f/Gtg7Lp4QRYl9dSRcuZzKJK+Y4LfjufiAbGFgHBRWR72oHmMkgx1ie1/vlfwvTQd pdKcFncIJOUQ7h1cRQl9/uA1RLsQQS0kCo62nP3zng4K+wdRCr3DcsPXQNQXxOA6cGXHWLYPkFkOm eRVfGvHU/SjLGiOnTbaH2TlL+mvdEq/KtlfEChdW3i49U72sLG/0XFLnTlZnWy9QtLX67b+qs3t0J kMKXTFEcKRv72w==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:22 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 9a4715df86..cf0de3d92e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1545,6 +1545,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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 27/31] gnu: git-minimal: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516810293 (code B ref 74290); Sun, 10 Nov 2024 10:40:10 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:28 +0000 Received: from localhost ([127.0.0.1]:55807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lr-0002fw-L9 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Li-0002d4-0k for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lc-0007ug-Qc; Sun, 10 Nov 2024 05:39: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=aYS46ckL+yAfnEZUwhskr1UP93kiR3VtE3K/uW3qCJw=; b=Rxc8vjzxgMJwnqpix6km 4pv4mTRYQPzAfrZojtCc3b1x4jq38c8pPl6UgF+5PuLt2PzU8WnX9sWV0kTDXZ4A2J6Fqsfz62jjG EaLqF2+5BCgGvZSuCruXtHT7YAonRIr5NZari5wIVBbnIfOr1CPO1ymu1+iKgmowzyJ0ymCSfd8IH C57upQA7HNgmj5MFgV3LdQfGmNSXoLwZ1FRbvYuoF1jVnx7L4calsnpBCfzUBWqsJdUnwpjnJGfwn DYehuulsN4xhRGSB2/qhsOPlJUYgN5iE5/8Ey3rOog5BVqBkG2uGwpmlOhu5gPQd2A+T9Zs8nThSg LBggBoYywM1EQg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:23 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 6bd37fee82..136d52af51 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -111,6 +111,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -292,7 +293,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) @@ -301,7 +305,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. -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 28/31] gnu: inetutils: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516910302 (code B ref 74290); Sun, 10 Nov 2024 10:40:10 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:29 +0000 Received: from localhost ([127.0.0.1]:55809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ls-0002g3-6J for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lj-0002dH-Tu for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:20 -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 1tA5Le-0007vT-Mp; Sun, 10 Nov 2024 05:39: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=80sCmpNqr6PvDwf+acu2S14tH5ZyUFodXiRCx7yuzM0=; b=Fe9o/xOG/aT4UVnj7AaS MMD66ejxsz7e0ax0GsL8p5JQ8tCHuo13OGdoChga2nYO7KKvgxoqnOuVuBdxV5fYAmIqYJ6+JnUrj 4WWCjKS0DHayOXNQP5JcvhVDnQu3w2S9hUljCgjStrVY12spF1NXMcwfugU3V2cWmhnWJqhVRPL96 WqKgV1u17kQBaPqxFyEG81cxaqo4q8ljILsLUT0K5nymutyYY/uEBinL5gXtScLZPTkG214DMar1Y zkaDrsCfCJETOLzVxNiiouSD3i0lQoUJ6ZNxHnPXoZGlAX/JfC650/TZZ8E3sCj0YXi/m14UIICuI U6DEH8cvhS4s0Q==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:24 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 cf0de3d92e..6a46241e5f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1568,6 +1568,7 @@ dist_patch_DATA = \ %D%/packages/patches/ilmbase-fix-tests.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 db9aea31a5..f0dde60d6a 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 @@ -1000,7 +1000,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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 29/31] 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: Sun, 10 Nov 2024 10:40: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 Cc: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516910308 (code B ref 74290); Sun, 10 Nov 2024 10:40:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:29 +0000 Received: from localhost ([127.0.0.1]:55811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ls-0002g7-Qp for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lm-0002dP-05 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Lg-0007vi-QF; Sun, 10 Nov 2024 05:39: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=nPYNfTa/3ucO7U+OuWF9dNFD6+EfXPsC1V6KnzNYCDA=; b=rEOdAx4kf0IwL4tpPPui Fc6UO7HOZqylnncAa8Y3gh2S/jG370AsS/W6Ss3OWCgf4ymbSarwimJmi3buXqcDJGZHrTSlgiJlh xAn8/0RnOj603mM/M5F3JDrRD1Nt9kKX3QvcWa+zkDMPuBa+VM2q3lxtu1zvxgsVRbB2AXj9yMEAm sVyfxU3+pN1R3KTF6Oe1njl8hTY3t8FSiTQG2hpgldbBUDeJ6Wlc6PF50zH9xlgUnvx9ZOnJkwmgU /C/Q0h4Jf8UnQag2iq/PG+KGw8VDaQlZfDVUzlVu13P+5zIgsHFArxVa+eSn69hfuFA0KtFNqds8C nipdEgJWYPkfFg==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:25 +0100 Message-ID: <83a995681b1b8cf9894b9fbc1e3c65cbbb855bbf.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 6a46241e5f..11955c7a49 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1487,6 +1487,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 8ae9621e5b..781000af1b 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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 30/31] 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: Sun, 10 Nov 2024 10:40: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.173123518710340 (code B ref 74290); Sun, 10 Nov 2024 10:40:11 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:47 +0000 Received: from localhost ([127.0.0.1]:55813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5MA-0002gh-CQ for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lo-0002dl-01 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39: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 1tA5Li-0007w2-PW; Sun, 10 Nov 2024 05:39: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=zt1jdjXqyEh2UXoxu4/4anI4OnXrBda4an/zBxZV0CQ=; b=VuUwxfTslPuRMxAB8G45 NUMltpB5QWMe4NIf7N6c3k9BK8EXMwvCpotTjXBptUsxSMBIyD2j3qfJN0myYcDd9b/qvDMYtxUE5 qoPMoBn30RhU/lIuPt7+QDPi160gggtwV7dGUjogAKwP3kvU6VKb5UmPp33QaXubDw3nxASOXCQQQ mOPwrToSVIL9B4B3FwCAMlpNj25mZwjjOl/GE+V7Aj0X25nvnkq8lDL7yD3GejR/ofo+V1p2Ft2Tj ZOyodDImfsTYs2EjCQJwakTG41mjFNHoJpVeeciTdPfkIt+dTXygHitdu0PZqXsU/S1RcYZrCisRe YlCBRO/LoW2W+w==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:26 +0100 Message-ID: <86686ad32c0d7b3213d9e7c3640b61b4e4672fc2.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 31/31] system: hurd: Use 64bit gnumach for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40:12 +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.173123518710347 (code B ref 74290); Sun, 10 Nov 2024 10:40:12 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:47 +0000 Received: from localhost ([127.0.0.1]:55815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5MB-0002gj-2O for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002dy-8E for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:25 -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 1tA5Lj-0007wB-Qm; Sun, 10 Nov 2024 05:39: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=Zz8anSv5Huxep52di4cOhJogr9uUQxbGgmXNpy/VFBI=; b=ghLVa98i8SSp9HqmKvnY a09RTheI9oML3pCm7+XTvG9UkP7P07iQREbiJmIBRWD22eJPG9IV05juV8UGTfagb5counsekGWfC +atlR0viyyGBOd8a2zccLRKzUe26IBNODp1e8diFd/NLwenf76tflsIsbgYQrSnO+e54fgvN2ZyP3 sMTXSd3Tx8nWuXPNAi+dojfK2HkYsxSV8EjamDpgmHjNACuTB4T53fdhn/TxJUqQSSz2KSn1vw7e2 pgZOiaTugDrCv37pWjf8xsEVKH4VUFmEKBgZ1Ne87L0XOEWzwyae9rjLZ0pdUDXfbxvSQQstYz3dl 8pkr9stpCgPllw==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:27 +0100 Message-ID: <52f615e031e134f37d20b5bda18e24391c6654c0.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/system/hurd.scm (%hurd-default-operating-system-kernel): Use actual (%current-target-system) to specify (%current-system) instead of using hardcoded "i686-linux". Change-Id: Ifc179bce221b1a54461860c24ba400cf6932ec86 --- gnu/system/hurd.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 9a351529e8..58e41959f4 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) @@ -64,9 +65,13 @@ (define %hurd-default-operating-system-kernel (if (system-hurd?) gnumach ;; A cross-built GNUmach does not work - (with-parameters ((%current-system "i686-linux") - (%current-target-system #f)) - gnumach))) + (let ((system (match (%current-system) + ((? target-x86-32?) "i686-linux") + ((? target-x86-64?) "x86_64-linux") + (_ "i686-linux")))) + (with-parameters ((%current-system system) + (%current-target-system #f)) + gnumach)))) (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty is to -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 02/31] gnu: gnumach: Update to v1.8+git20240714. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 11:47: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.173123916422248 (code B ref 74290); Sun, 10 Nov 2024 11:47:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 11:46:04 +0000 Received: from localhost ([127.0.0.1]:55980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA6OJ-0005mm-Tp for submit@debbugs.gnu.org; Sun, 10 Nov 2024 06:46:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA6OG-0005mH-D2 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 06:46:02 -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 1tA6OA-0000rc-5K; Sun, 10 Nov 2024 06:45: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:Date:References:In-Reply-To:Subject:To: From; bh=AUhcTKL9PBBJDJLodcQPFroDMP9hBdH2Qd3bNawQwq0=; b=SwfvxOjurBCpQKT9U+8P i4klkvUdY8RfHmILyxssROlDA8Q0JTKq2QSKfEzZgV82L/TCEWvjZQF4w8NmtNFG0GRHl6Hminnpl GWBDUZfpgEINK+aRq8pCWo25ZIjrI7tTrYuB4Xdun856nK0CgNw5AlFju3QxqWy/Yc0eA0cjNNfFb z2DDO1yR06Wv9xyKD58LWEXr31to/A9Bxi9b6I+zJZTUPuG83zr1fNJYA1qHs9pr7Muoy2DI4CuIQ xtkba9n9ktI3Oe+SXl1ESs6kpkL3l20HEqlYauPyQ7o9i42USPUMtszF3+xpA8VVSO95KAlbYSQtr MhalFq/DFoWAzQ==; From: In-Reply-To: (Janneke Nieuwenhuizen's message of "Sun, 10 Nov 2024 11:37:58 +0100") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Sun, 10 Nov 2024 12:45:49 +0100 Message-ID: <87serz1fde.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Janneke Nieuwenhuizen writes: > * 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. Err, this needs --8<---------------cut here---------------start------------->8--- diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 682deb89cf..a000cbfdc5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2640,6 +2640,7 @@ (define gnumach-headers-boot0 (source (origin (inherit (package-source gnumach-headers)) + (patches '()) (method (git-fetch-from-tarball (origin --8<---------------cut here---------------end--------------->8--- in order for `guix build --system=x86_64-gnu' (checking bootstrap hashes) not to hang. Oops, caused by a last minute adding of "nice cosmetic" version number patch from Debian. Janneke --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-squash-gnu-gnumach-Update-to-v1.8-git20240714.patch Content-Transfer-Encoding: quoted-printable >From efb58c8deb6693aaa9dcec6d616289d36c3967b3 Mon Sep 17 00:00:00 2001 Message-ID: From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 12:31:13 +0100 Subject: [PATCH] squash! gnu: gnumach: Update to v1.8+git20240714. Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=3DUTF-8 * gnu/packages/commencement.scm (gnumach-headers-boot0)[origin]: Reset patches. Change-Id: I5186c6c0e4f8df6ea55a74943b919bd13530d4d3 --- gnu/packages/commencement.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 682deb89cf..a000cbfdc5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2640,6 +2640,7 @@ (define gnumach-headers-boot0 (source (origin (inherit (package-source gnumach-headers)) + (patches '()) (method (git-fetch-from-tarball (origin base-commit: 52f615e031e134f37d20b5bda18e24391c6654c0 --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com --=-=-=-- From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 31/31] system: hurd: Use 64bit gnumach for the 64bit Hurd. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 14:42: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.173124968020135 (code B ref 74290); Sun, 10 Nov 2024 14:42:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 14:41:20 +0000 Received: from localhost ([127.0.0.1]:56267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA97v-0005Eg-Jy for submit@debbugs.gnu.org; Sun, 10 Nov 2024 09:41:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA97s-0005EO-VX for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 09:41: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 1tA97m-0006on-GF; Sun, 10 Nov 2024 09:41: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:Date:References:In-Reply-To:Subject:To: From; bh=IphJTzrkmpB/Pf4rkchv3tNYMHB2Bdgm5o1tksaBkO4=; b=SZPLPuomFiuehN59o6Td Njcn0DIDXQKSATUQixyN74cx5deanFSNU/IAJ0B0fGk8X+LAqA7IChHmZoZW7X97qM7R6fh/4EyJP Zh7hnOp0BGAJQQqUzbbK65jCjlZuaWwVmEOxJry4S6cHyz9tsj6I1HLT2kCBQauRxGUPfARYbzPqH b/qPU7R57voR9VGjzjmbMxVvxqpDFsNc7MEfJrWXyOPiyM7cRQxxqp8+Qur6AtsvH2Vj12RowQG2M vm4NOmRgyf1jek4iyttvQ5hJtLPsBjBV/jqrM/GqlacOeWx9JmCCuowhQL4s0FDDrA9wL3indWL7I FVQE1FzTJejayA==; From: In-Reply-To: <52f615e031e134f37d20b5bda18e24391c6654c0.1731232753.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Sun, 10 Nov 2024 11:38:27 +0100") Organization: AvatarAcademy.nl References: <52f615e031e134f37d20b5bda18e24391c6654c0.1731232753.git.janneke@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 10 Nov 2024 15:40:23 +0100 Message-ID: <874j4fywx4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen writes: > * gnu/system/hurd.scm (%hurd-default-operating-system-kernel): Use > actual (%current-target-system) to specify (%current-system) instead of u= sing > hardcoded "i686-linux". > > Change-Id: Ifc179bce221b1a54461860c24ba400cf6932ec86 > --- > gnu/system/hurd.scm | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm > index 9a351529e8..58e41959f4 100644 > --- a/gnu/system/hurd.scm > +++ b/gnu/system/hurd.scm > @@ -18,6 +18,7 @@ > ;;; along with GNU Guix. If not, see . >=20=20 > (define-module (gnu system hurd) > + #:use-module (ice-9 match) > #:use-module (guix gexp) > #:use-module (guix profiles) > #:use-module (guix utils) > @@ -64,9 +65,13 @@ (define %hurd-default-operating-system-kernel > (if (system-hurd?) > gnumach > ;; A cross-built GNUmach does not work > - (with-parameters ((%current-system "i686-linux") > - (%current-target-system #f)) > - gnumach))) > + (let ((system (match (%current-system) > + ((? target-x86-32?) "i686-linux") > + ((? target-x86-64?) "x86_64-linux") > + (_ "i686-linux")))) > + (with-parameters ((%current-system system) > + (%current-target-system #f)) > + gnumach)))) This is obviously wrong; the idea was to do something like --8<---------------cut here---------------start------------->8--- (let ((system (match (or (%current-target-system) (%current-system)) ((? target-x86-32?) "i686-linux") ((? target-x86-64?) "x86_64-linux") (_ "i686-linux")))) (with-parameters ((%current-system system) (%current-target-system #f)) gnumach)))) --8<---------------cut here---------------end--------------->8--- ...but as %hurd-default-operating-system-kernel is a variable that is evaluated at toplevel/too early, this also doesn't work. Ideas? Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 00/31] Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 17:42: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: Vagrant Cascadian , Josselin Poiret , Tobias Geerinckx-Rice , Sharlatan Hellseher , Maxim Cournoyer , Ekaitz Zarraga , Simon Tournier , Guillaume Le Vaillant , Mathieu Othacehe , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Katherine Cox-Buday , Efraim Flashner , Munyoki Kilyungi , Andreas Enge , jgart , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173126047418668 (code B ref 74290); Sun, 10 Nov 2024 17:42:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 17:41:14 +0000 Received: from localhost ([127.0.0.1]:56490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tABw0-0004qv-PX for submit@debbugs.gnu.org; Sun, 10 Nov 2024 12:41:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA8jb-0003v9-0S for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 09:16: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 1tA8jP-0003DB-J9; Sun, 10 Nov 2024 09:15: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:Date:References:In-Reply-To:Subject:To: From; bh=X/vuPjsAzYkxrcWqCWFJDH2aAkZOmsZxg3wuHaL/2Zg=; b=OUKl6DqwUuQ4zU91yaKA fK6V3BL5TMSywkBMfaApYAHlV6uRkxrsaFbkIVO26HjIbDD/wAYzXH66OJf292A4DIkirj+aZGN7D pF5Dm5/XIPxIiZrSMRDHBZyxOeRoy40/zWFsUXEYdLUMMZuEkrHLhHPcCCVydNGYu50COoVmOOhxE yTVvQEGDuo9W1XekFRVJ1Vr37g8R9AZYFhNveXnZ81VbKUZp/x0KiN5ZxnxzPo4MEj6mFFuZ41XBZ ff3G+5GLWiJyNBxeRobg6xFLMn2MXV+PVW8hqvP0z4s6WQW5nR8AAxHzfPv2J+5pASuSTITdjEb7a gpR7x91o7Hkvhw==; From: In-Reply-To: (Janneke Nieuwenhuizen's message of "Sun, 10 Nov 2024 11:32:14 +0100") Organization: AvatarAcademy.nl References: X-Url: http://AvatarAcademy.nl Date: Sun, 10 Nov 2024 15:15:54 +0100 Message-ID: <87iksvyy1x.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.7 (/) X-Mailman-Approved-At: Sun, 10 Nov 2024 12:41:09 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) Janneke Nieuwenhuizen writes: >From running etc/teams.scm by hand I found that you should have been CC'd on this patch series, sorry. Working from a backup laptop that missed the ../etc/git/gitconfig teams include. > Hi, > > Lo and behold, the 64bit Hurd boots! Again, thanks to the help from the > kind folks over at libera #hurd and their excellent work. Do something l= ike: > > ./pre-inst-env guix system image --image-type=3Dhurd64-qcow2 \ > gnu/system/examples/bare-hurd.tmpl > > > producing something like: /gnu/store/...-disk-image. > > Run the image in QEMU: > > guix shell qemu@7 -- qemu-system-x86_64 \ > --machine q35 \ > -m 4096 \ > --enable-kvm \ > --device rtl8139,netdev=3Dnet0 \ > --netdev user,id=3Dnet0,hostfwd=3Dtcp:0.0.0.0:11022-:2222 \ > --snapshot \ > --hda /gnu/store/...-disk-image > > > and login > > 11:03:20 janneke@dundal:~/src/guix/hurd-team=20 > $ ssh -p 11022 root@localhost > Last login: Sun Nov 10 10:09:00 2024 from 10.0.2.2 > =EE=BC=80=EE=BC=81=EE=BC=82=EE=BC=83=EE=BC=84=EE=BC=85 > =EE=BC=86=EE=BC=87=EE=BC=88=EE=BC=89=EE=BC=8A=EE=BC=8B > =EE=BC=8C=EE=BC=8D=EE=BC=8E=EE=BC=8F=EE=BC=90=EE=BC=91 This is the GNU H= urd. Welcome. > > root@guixygnu ~# uname -a > GNU guixygnu 0.9 GNU-Mach 1.8/Hurd-0.9 x86_64 GNU > > Most notably, besides the expected updates, this series adds an indirecti= on > for gcc and gcc-toolchain, (current-gcc) and (current-gcc-toolchain) > respectively, as the 64bit Hurd needs gcc-14. We may also want to think = about > image names hurd64-qcow2 etc. and their defaults, vs hurd-qcow2/hurd32-qc= ow2. > We'll probably also want a 64bit childhurd service, etc, etc... > > This series builds on/waits for #73927, which I intend to rebase and push > later this weekend if there are no further comments. And I guess that the > pending blog post will also need an update :) > > For your hacking convenience I have reset and updated the `hurd-team' bra= nch. > > Greetings, > Janneke > > Janneke Nieuwenhuizen (31): > gnu: mig: Update to v1.8+git20231217. > gnu: gnumach: Update to v1.8+git20240714. > gnu: hurd: Update to v0.9.git20240714. > gnu: gcc: Add indirections current-gcc, current-gcc-toolchain. > gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. > gnu: cross-libc: Support cross-building for the 64bit Hurd. > gnu: bash-minimal: Fix build for 64bit Hurd. > gnu: elfutils: Fix build for 64bit Hurd. > gnu: grep: Fix build for the 64bit Hurd. > gnu: patch: Fix build for the 64bit Hurd. > gnu: libxcrypt: Support the 64bit Hurd. > gnu: libstdc++: Support the 64bit Hurd. > gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. > DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. > system: image: Add hurd64 image types. > gnu: Add libgpg-error-1.50. > gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd. > gnu: perl: Support cross-building for the 64bit Hurd. > gnu: openssl-3.0: Support the 64bit Hurd. > gnu: pciutils: Support the 64bit Hurd. > gnu: libpciaccess: Support the 64bit Hurd. > gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. > gnu: netdde: Support the 64bit Hurd. > gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. > gnu: rumpkernel: Support the 64bit Hurd. > gnu: hurd: Build fixes for the 64bit Hurd. > gnu: git-minimal: Support the 64bit Hurd. > gnu: inetutils: Fix build for the 64bit Hurd. > gnu: grub: Fix build for the 64bit Hurd. > gnu: guile-fibers: Fix build for the 64bit Hurd. > system: hurd: Use 64bit gnumach for the 64bit Hurd. > > doc/guix.texi | 9 +- > gnu/ci.scm | 4 +- > gnu/local.mk | 9 + > gnu/packages/admin.scm | 14 +- > gnu/packages/avr.scm | 7 +- > gnu/packages/base.scm | 74 ++++--- > gnu/packages/bash.scm | 9 + > gnu/packages/benchmark.scm | 6 +- > gnu/packages/bootloaders.scm | 10 +- > gnu/packages/bootstrap.scm | 46 ++++- > gnu/packages/c.scm | 4 +- > gnu/packages/chicken.scm | 7 +- > gnu/packages/commencement.scm | 35 ++-- > gnu/packages/containers.scm | 5 +- > gnu/packages/cross-base.scm | 27 +-- > gnu/packages/crypto.scm | 15 ++ > gnu/packages/dlang.scm | 3 +- > gnu/packages/elf.scm | 6 +- > gnu/packages/engineering.scm | 4 +- > gnu/packages/gawk.scm | 3 +- > gnu/packages/gcc.scm | 69 ++++--- > gnu/packages/gnupg.scm | 19 +- > gnu/packages/golang.scm | 3 +- > gnu/packages/guile-xyz.scm | 2 +- > gnu/packages/hurd.scm | 187 ++++++++++++------ > gnu/packages/julia-xyz.scm | 3 +- > gnu/packages/lisp.scm | 3 +- > gnu/packages/llvm.scm | 7 +- > gnu/packages/make-bootstrap.scm | 60 +++--- > gnu/packages/mpi.scm | 3 +- > gnu/packages/parallel.scm | 5 +- > gnu/packages/patches/gnumach-version.patch | 23 +++ > gnu/packages/patches/grub-hurd64.patch | 32 +++ > gnu/packages/patches/hurd-64bit.patch | 56 ++++++ > gnu/packages/patches/inetutils-hurd64.patch | 65 ++++++ > .../patches/libpciaccess-hurd64.patch | 58 ++++++ > gnu/packages/patches/libxcrypt-hurd64.patch | 38 ++++ > gnu/packages/patches/netdde-csum.patch | 18 ++ > gnu/packages/patches/openssl-hurd64.patch | 99 ++++++++++ > gnu/packages/patches/pciutils-hurd64.patch | 31 +++ > gnu/packages/pciutils.scm | 25 ++- > gnu/packages/perl.scm | 20 +- > gnu/packages/rocm.scm | 3 +- > gnu/packages/tls.scm | 9 + > gnu/packages/version-control.scm | 8 +- > gnu/packages/xorg.scm | 23 ++- > gnu/system.scm | 1 - > gnu/system/hurd.scm | 11 +- > gnu/system/images/hurd.scm | 47 ++++- > guix/packages.scm | 8 +- > guix/platforms/x86.scm | 11 +- > guix/utils.scm | 15 +- > m4/guix.m4 | 12 +- > 53 files changed, 1025 insertions(+), 246 deletions(-) > create mode 100644 gnu/packages/patches/gnumach-version.patch > create mode 100644 gnu/packages/patches/grub-hurd64.patch > create mode 100644 gnu/packages/patches/hurd-64bit.patch > create mode 100644 gnu/packages/patches/inetutils-hurd64.patch > create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch > create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch > create mode 100644 gnu/packages/patches/netdde-csum.patch > create mode 100644 gnu/packages/patches/openssl-hurd64.patch > create mode 100644 gnu/packages/patches/pciutils-hurd64.patch > > > base-commit: 7105e7125882be35e334448eafd6d81b37b627f0 --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 14/31] DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 18:06: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173134833216425 (code B ref 74290); Mon, 11 Nov 2024 18:06:01 +0000 Received: (at 74290) by debbugs.gnu.org; 11 Nov 2024 18:05:32 +0000 Received: from localhost ([127.0.0.1]:59090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAYn5-0004Gq-Vh for submit@debbugs.gnu.org; Mon, 11 Nov 2024 13:05:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAYn3-0004Ge-L2 for 74290@debbugs.gnu.org; Mon, 11 Nov 2024 13:05: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 1tAYmx-00058x-Gm; Mon, 11 Nov 2024 13:05: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:Date:References:In-Reply-To:Subject:To: From; bh=iXqClPY99ffNNwOPQ6mIxhwfP7lMMZS9Er+qeHUDxQY=; b=FU2ngLVZUhwKWAW/DNr6 6pWiihvl+eNEAu95dQQ1qaF/iogpZHQ7MYfacvzQSwNwdLyk4uY+wg+szcjubFZ97vp9sCbHUZ4iO xxSca2YbYxHVbNDWDHZqqrVd8byNfzAJ7P9Wy6HxCN3Y4X/rQoRwevwDRVs7gmpD98VwtDazFq0IH gzq95tihuIe52LYVfSWof9WECFMR6ZQqqj++NdDrreuUyoeIyErV9rxB0c7tbQtEgS0ZLARN2Gu45 vi3FcOOUNqws0DTG6+2I6Igrhn5GIU66JYRGbqtCa7Q0uLs/j8onNELqRj6LZoY1lmJ3rLn0RZzBg 0K/f/fTQ3HnweQ==; From: In-Reply-To: <43e8a79925bda014c70618de24c2936772bb829b.1731232753.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Sun, 10 Nov 2024 11:38:10 +0100") Organization: AvatarAcademy.nl References: <43e8a79925bda014c70618de24c2936772bb829b.1731232753.git.janneke@gnu.org> X-Url: http://AvatarAcademy.nl Date: Mon, 11 Nov 2024 19:05:07 +0100 Message-ID: <87o72lve7g.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Janneke Nieuwenhuizen writes: Oops! This inadvertedly changed i586-gnu-pc hashes: > diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm > index c4640b62e1..eb6a4f1917 100644 > --- a/gnu/packages/bootstrap.scm > +++ b/gnu/packages/bootstrap.scm > @@ -118,13 +118,22 @@ (define %bootstrap-executables > ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k"))) > ("i586-gnu" > ("bash" > - ,(base32 "1as8649aqaibahhhrvkj10ci8shpi4hq5n7gnik8rhhy0dc1jarg")) > + ,(base32 "0nb8ga2j7a4kf6j7pnavq8zf68mj8mhqh26nwkilz1ykj86vg9ml")) > ("mkdir" > - ,(base32 "1snqgpfrl00hfn82lm29jqylzjsfb9jd6ha74dp12phwb8fpbmb9")) > + ,(base32 "0ldsx9pwan40fx2hf4s9d10sfkhvkljvl20hksvm4192p7jb4shp")) > ("tar" > - ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m")) > + ,(base32 "1z6kfvpwhy14vc52i61v1vzzk3gzxka3db5rlg1jsq6kli35s2ab")) > ("xz" > - ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5"))) > + ,(base32 "1f7g40sk5a6k6qf65k58vlybnnmhyyzczdxy60m3jgcsp674wfcr"))) and did not use "-r" in guix hash -r (I thought that meant "recursive"): > + ("x86_64-gnu" > + ("bash" > + ,(base32 "0l0dnighcipvdfbk14q834n57q859i2b9ssiq4bnbh0jpxvvqp1l")) > + ("mkdir" > + ,(base32 "1nd17k8pwwi7zsqi685w4rn1p2cvfcalrzdhfgwpsk1ilxnmdvsq")) > + ("tar" > + ,(base32 "0lf94y22ngmxdwhsp0cvj33m23p33r999xnlrff0s1yvlf20w3ks")) > + ("xz" > + ,(base32 "145aq65rx7w0qk1sw9239888id5ri60ha0xp1kyp6ir3pvizh6by"))) --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-squash-DRAFT-gnu-bootstrap-Add-support-for-x86_64-gn.patch Content-Transfer-Encoding: quoted-printable >From 59a6dcd5f4ca63aa17c83366fc5b74cf4c93d61d Mon Sep 17 00:00:00 2001 Message-ID: <59a6dcd5f4ca63aa17c83366fc5b74cf4c93d61d.1731348265.git.jannek= e@gnu.org> From: Janneke Nieuwenhuizen Date: Mon, 11 Nov 2024 08:27:41 +0100 Subject: [PATCH] squash! DRAFT gnu: bootstrap: Add support for x86_64-gnu, = aka the 64bit Hurd. Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=3DUTF-8 Oops: Leave i586-pc-gnu alone and use guix hash -r. Change-Id: Id96715cee07572cd0635594d3b1aa6756fa8a822 --- gnu/packages/bootstrap.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index eb6a4f1917..066eef5cc8 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -118,22 +118,22 @@ (define %bootstrap-executables ,(base32 "0i9kxdi17bm5gxfi2xzm0y73p3ii0cqxli1sbljm6rh2fjgyn90k"))) ("i586-gnu" ("bash" - ,(base32 "0nb8ga2j7a4kf6j7pnavq8zf68mj8mhqh26nwkilz1ykj86vg9ml")) + ,(base32 "1as8649aqaibahhhrvkj10ci8shpi4hq5n7gnik8rhhy0dc1jarg")) ("mkdir" - ,(base32 "0ldsx9pwan40fx2hf4s9d10sfkhvkljvl20hksvm4192p7jb4shp")) + ,(base32 "1snqgpfrl00hfn82lm29jqylzjsfb9jd6ha74dp12phwb8fpbmb9")) ("tar" - ,(base32 "1z6kfvpwhy14vc52i61v1vzzk3gzxka3db5rlg1jsq6kli35s2ab")) + ,(base32 "0nq2c1zb3wv5bf7kd83sziaashydazrn7xgq6kijlk0zj2syzc2m")) ("xz" - ,(base32 "1f7g40sk5a6k6qf65k58vlybnnmhyyzczdxy60m3jgcsp674wfcr"))) + ,(base32 "033rhpk6zrpxpd6ffjyg5y2zwq9x9cnq0zljb7k8jlncbalsayq5"))) ("x86_64-gnu" ("bash" - ,(base32 "0l0dnighcipvdfbk14q834n57q859i2b9ssiq4bnbh0jpxvvqp1l")) + ,(base32 "1ib1kk1larki3dm46lhl756856zpjwhhlnzkgdyh9f1yf6wm431y")) ("mkdir" - ,(base32 "1nd17k8pwwi7zsqi685w4rn1p2cvfcalrzdhfgwpsk1ilxnmdvsq")) + ,(base32 "15cnckq4qj1nlmgqy9vq3qa3kcbfm1pc2z38pscxix11j4aqswsm")) ("tar" - ,(base32 "0lf94y22ngmxdwhsp0cvj33m23p33r999xnlrff0s1yvlf20w3ks")) + ,(base32 "1m8v7ddmn42wym2kl9mf7csnwsw6c3jdglg7d7kp7yaa16h5fbck")) ("xz" - ,(base32 "145aq65rx7w0qk1sw9239888id5ri60ha0xp1kyp6ir3pvizh6by"))) + ,(base32 "16cnr7vr0zawrwcnhshms3v5kyzb2vz1rp4kxmx507cs6rivd05b"))) ("mips64el-linux" ("bash" ,(base32 "1aw046dhda240k9pb9iaj5aqkm23gkvxa9j82n4k7fk87nbrixw6")) @@ -174,7 +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 "/20241110/" program)) + ("x86_64-gnu" (string-append system "/20241111/" program)) ("powerpc-linux" (string-append system "/20200923/bin/" program)) ("riscv64-linux" (string-append system "/20210725/bin/" program)) (_ (string-append system "/" program @@ -377,7 +377,7 @@ (define (bootstrap-guile-url-path system) ("i586-gnu" "/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.ta= r.xz") ("x86_64-gnu" - "/20241110/guile-static-stripped-3.0.9-x86_64-pc-gnu.t= ar.xz") + "/20241111/guile-static-stripped-3.0.9-x86_64-pc-gnu.t= ar.xz") ("powerpc64le-linux" "/20210106/guile-static-stripped-2.0.14-powerpc64le-li= nux-gnu.tar.xz") ("riscv64-linux" @@ -403,7 +403,7 @@ (define (bootstrap-guile-hash system) ("i586-gnu" (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")) ("x86_64-gnu" - (base32 "0fgasmbidp584ibr5fbirmp3wr8qchv84a50i4bichysp00gg26p")) + (base32 "0s2r8pwy8jcp1m8qdyiwvnv6f4wmcjq9a8g8jcbm974dd63ym2y3")) ("powerpc-linux" (base32 "1by2p7s27fbyjzfkcw8h65h4kkqh7d23kv4sgg5jppjn2qx7swq4")) ("riscv64-linux" @@ -613,7 +613,7 @@ (define %bootstrap-coreutils&co ("i586-gnu" "/20200326/static-binaries-0-= i586-pc-gnu.tar.xz") ("x86_64-gnu" - "/20241110/static-binaries-0-= x86_64-pc-gnu.tar.xz") + "/20241111/static-binaries-0-= x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/static-binaries.ta= r.xz") ("riscv64-linux" @@ -643,7 +643,7 @@ (define %bootstrap-coreutils&co "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923p= lvb0nfm1cfn")) ("x86_64-gnu" (base32 - "118s161df8hgrdfph2w5spnrms02rh1dk7mzfvx1k= 1prvgngpm9p")) + "05lacv0zx80798wmri6d7aag5vkpfm7q0xsrp1fm0= vldwdm1v39v")) ("powerpc-linux" (base32 "0kspxy0yczan2vlih6aa9hailr2inz000fqa0gn5x= 9d1fxxa5y8m")) @@ -701,7 +701,7 @@ (define %bootstrap-binutils ("i586-gnu" "/20200326/binutils-static-st= ripped-2.34-i586-pc-gnu.tar.xz") ("x86_64-gnu" - "/20241110/binutils-static-st= ripped-2.41-x86_64-pc-gnu.tar.xz") + "/20241111/binutils-static-st= ripped-2.41-x86_64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/binutils-2.35.1.ta= r.xz") ("riscv64-linux" @@ -734,7 +734,7 @@ (define %bootstrap-binutils "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcs= yss21kfjprs")) ("x86_64-gnu" (base32 - "07r74sa7341frhf5a7h1p3pklsrmfpfrf5s8dxm3y= z2kqzhish48")) + "0rzdn8357g4gias3k29bc6nhwv23bx029r83k7y4l= fnq6w86b1wz")) ("powerpc-linux" (base32 "0asbg1c4avkrvh057mx0942xwddd136jni382zqsx= zn79ls42yq8")) @@ -796,7 +796,7 @@ (define %bootstrap-glibc ("i586-gnu" "/20240816/glibc-stripped-2.39-i586= -pc-gnu.tar.xz") ("x86_64-gnu" - "/20241110/glibc-stripped-2.39-x86_= 64-pc-gnu.tar.xz") + "/20241111/glibc-stripped-2.39-x86_= 64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/glibc-2.32.tar.xz") ("riscv64-linux" @@ -829,7 +829,7 @@ (define %bootstrap-glibc "0x2x6w611k6v9qdabacawamw2475p04hm3s0q95xcg063wj= q4ig2")) ("x86_64-gnu" (base32 - "1dcgrnlxbsdic0xmmrjbr8gl6ra5y2xbj8f8jr6y0zvpdyi= 12ldd")) + "0fbmh8aa7lva4xm6a8n49pfsgw4gzai00c4ylvggvgryscm= 65qr7")) ("powerpc-linux" (base32 "0smmssyjrlk5cvx49586smmk81gkwff0i6r91n4rir4jm6b= a25sb")) @@ -907,7 +907,7 @@ (define %bootstrap-gcc ("i586-gnu" "/20200326/gcc-stripped-5.5.0-i586= -pc-gnu.tar.xz") ("x86_64-gnu" - "/20241110/gcc-stripped-14.2.0-x86= _64-pc-gnu.tar.xz") + "/20241111/gcc-stripped-14.2.0-x86= _64-pc-gnu.tar.xz") ("powerpc-linux" "/20200923/gcc-5.5.0.tar.xz") ("riscv64-linux" @@ -940,7 +940,7 @@ (define %bootstrap-gcc "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd= 70zvv5")) ("x86_64-gnu" (base32 - "0vqvjvw6xi16lihiqz4mhisfwx3dgs15y60q07ksdkgvi1= wdli2w")) + "1z9fiwrmknz8x3kcw0p6hdqq176bi43dg4andk40sid0vh= 34qc0n")) ("powerpc-linux" (base32 "1p7df3yixhm87dw5sccc6yn1i9db1r9hnmsg87wq5xi4rf= mirq7w")) base-commit: bf9b13cd1c109adbc372e15d9f17bf1ebe580446 --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com --=-=-=-- From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 00/31] Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Nov 2024 05:25: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: Cc: 74290@debbugs.gnu.org, Josselin Poiret , Tobias Geerinckx-Rice , Sharlatan Hellseher , Vagrant Cascadian , Ekaitz Zarraga , Simon Tournier , Guillaume Le Vaillant , Mathieu Othacehe , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Katherine Cox-Buday , Efraim Flashner , Munyoki Kilyungi , Andreas Enge , jgart , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17313890827386 (code B ref 74290); Tue, 12 Nov 2024 05:25:02 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 05:24:42 +0000 Received: from localhost ([127.0.0.1]:60116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAjOL-0001uy-LY for submit@debbugs.gnu.org; Tue, 12 Nov 2024 00:24:42 -0500 Received: from mail-pj1-f51.google.com ([209.85.216.51]:59415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAfYI-00075x-Cl for 74290@debbugs.gnu.org; Mon, 11 Nov 2024 20:18:42 -0500 Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2e30116efc9so4142154a91.2 for <74290@debbugs.gnu.org>; Mon, 11 Nov 2024 17:18:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731374262; x=1731979062; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=9QCgy3qWkTYlEobFw68zWzNcq6IW8b2YM30HKW78X38=; b=N7aTBfqy/2/670avsvZsemXZMv+CjDKc7oa4qhIvfoHbaHTJk2V+Y5R0QYCT2hiYx5 7IEwNfdSJZQiGxD80iSz6Cc67q2sFxCQLwAnypAseeiqcYdUGqYnEuDhzg4kZcZthOaf DcAOHQNUsWkgzCobZSKtuRrOUuhEn9xZZ/nLYFInANO7dKsRYCMc3kTDzKr31LwU7lRW 3f3TuDKlgRiv/t5yG5zExXlyMWTjWjWFrUZQdF93IkjLyHNWZXb0S9JcJtRfGjiVWar4 +Q1HLKYARVGf/bf9dpj5eNaNJjzzmcqlJ5wwhaPE86ZStdRMFmR/qMmPWNMC0orm2Gld I3Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731374262; x=1731979062; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9QCgy3qWkTYlEobFw68zWzNcq6IW8b2YM30HKW78X38=; b=AzBunmb1GNRI1qVNrEWpb+yauhNwqOrPYprXUXTqtoq8LG3EdrvcFQ0569Hjg7VETW MjNi2df0i4OrmUCpw3rPaGXnIzdwaGCrtjt7LvakkHc7kZYz3ymNv2/raGR+9nb37OB/ 7t3WbvUdPUEmJ2Zdy20q6Vdx5j48mU/QB1G84A9LnU49FapUd7REhuc6hBaKp83LPtFN /2iiw1bPM1qB1/tGoVJ1OTKkr8yyXss/PWkqOGP/5t5v8pHGhRufqtmhG4SOiJ14ei7z pTeM8JnRIRgLTc7z37v+yAZWA2aVSIVSuBRWqrTtDgNB1WSEVfI+zgqs6hoZyydj7d19 GUgA== X-Gm-Message-State: AOJu0YxUY11AsfxpFe8z+POCjNNwBgfXKJDrbR+XIqbQ7CpsfNwKkT7C PLGmiY4jtHXYnneMWmHhVPaSvnUlWkMDeeHRGnnxu9YYgQNfGcPI X-Google-Smtp-Source: AGHT+IF1v65hAG6ktEpd+Cpn61DmAmAgS35TuVOBGD1kExj+hBWwVi3ku8pnBl9cZ6+YdlkuZ8t90Q== X-Received: by 2002:a17:90b:4e83:b0:2e9:5004:2502 with SMTP id 98e67ed59e1d1-2e9b171f67emr19722745a91.13.1731374261581; Mon, 11 Nov 2024 17:17:41 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e99a62bf50sm11282579a91.51.2024.11.11.17.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2024 17:17:40 -0800 (PST) From: Maxim Cournoyer In-Reply-To: <87iksvyy1x.fsf@gnu.org> (janneke@gnu.org's message of "Sun, 10 Nov 2024 15:15:54 +0100") References: <87iksvyy1x.fsf@gnu.org> Date: Tue, 12 Nov 2024 10:17:31 +0900 Message-ID: <87bjyl8d3o.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 3.0 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Janneke! writes: > Janneke Nieuwenhuizen writes: > > From running etc/teams.scm by hand I found that you should have been > CC'd on this patch series, sorry. Working from a backup laptop that > missed the ../etc/git/g [...] Content analysis details: (3.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.216.51 listed in sa-accredit.habeas.com] 3.0 MANY_TO_CC Sent to 10+ recipients 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.216.51 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.51 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.51 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Mailman-Approved-At: Tue, 12 Nov 2024 00:24:38 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Janneke! writes: > Janneke Nieuwenhuizen writes: > > From running etc/teams.scm by hand I found that you should have been > CC'd on this patch series, sorry. Working from a backup laptop that > missed the ../etc/git/g [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.216.51 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.216.51 listed in sa-trusted.bondedsender.org] 3.0 MANY_TO_CC Sent to 10+ recipients 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (maxim.cournoyer[at]gmail.com) 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.51 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.51 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi Janneke! writes: > Janneke Nieuwenhuizen writes: > > From running etc/teams.scm by hand I found that you should have been > CC'd on this patch series, sorry. Working from a backup laptop that > missed the ../etc/git/gitconfig teams include. No worries. Note that the git configuration should self-heal/update itself on every 'make' invocation, IIRC. -- Thanks, Maxim From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 00/40] Add support for x86_64-gnu, aka the 64bit Hurd. References: In-Reply-To: Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: 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: Janneke Nieuwenhuizen Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.1731428905857 (code B ref 74290); Tue, 12 Nov 2024 16:29:02 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:28:25 +0000 Received: from localhost ([127.0.0.1]:39027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtke-0000Dj-29 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:28:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtkc-0000DU-0f for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:28: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 1tAtiP-0005HJ-RG; Tue, 12 Nov 2024 11:26: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:Date:Subject:To:From:in-reply-to: references; bh=zqf5uapcuNIQvKTX4LaZ/r7GhYHl1V61Nl5cBeDDbEA=; b=Y0AAUHM6s2BRJO K64RhfHoqTcVfR+jBY1Zb0HvmhFS11h5oqWd7I89+eGpHb7jet5C6/HpDTqxFuNTH3VJVy8L6ex1+ fZYzMtIMEP9v/WILQLRLjSukZys5NNHeoPbweLr0CaRnc5l2GLolMudguO7FN1a9LLrWwnGEKcQOj 0G2y5M18E54plvHqm4TUW7JV+pWgdIB6F+Ldp3Vp3UOG4RPyBulzVtEnJBg3/9HNomIMATRBx4BXj aQYyIOD+2fM8r8memWcke/ZLMOQrd0tIuPKmfsklUilt9tBdkfQT83IIxTIyx70AkUiYrWfI43IXJ r6Jqv4WwyXiLz0pS7PTw==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:09 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: "Janneke Nieuwenhuizen" New in V2: Add 64bit native compilation/development support: * commencement: update of gnumach-headers-boot0, mig-boot0, hurd-headers-boot0, * more 64bit Hurd/gcc-14 build fixes: m4, texinfo-4, flex, * cross build fix: gettext-[minimal], * rebased on latest master (NOTE: u-boot-tools tests must be disabled in order to build a VM, see ). Fixes: * guile-static now actually has (convinced libtool to create) a static guile, * guile-static-stripped-tarball is now packaged in a guile v3 bag, * binutils-static now actually has (convinced libtool to create) static binaries, * the hashes for bin/{bash,mkdir,tar,xz} now use guix hash _-r_, * the 32bit childhurd uses a 32bit gnumach again (and boots), * gnumach-headers-boot0 resets patches, resolving native i586-pc-gnu builds hanging, * a new bare-hurd64.tmpl (and devel-hurd64.tmpl) now work around this terrible "cannot-cross-build-gnumach-so-let's-guess-an-arch" issue, using NOIDE needed for the 64bit hurd to boot, and with better suggestions, This is about the extent of what it can do right now: --8<---------------cut here---------------start------------->8--- 15:07:14 janneke@dundal:~/var/geert $ ssh root@childhurd1    This is the GNU Hurd. Welcome. root@guixygnu64 ~# uname -a GNU guixygnu64 0.9 GNU-Mach 1.8/Hurd-0.9 x86_64 GNU root@guixygnu64 ~# guix shell --bootstrap -D --expression='(@@ (gnu packages commencement) gnu-make-boot0)' hint: Consider passing the `--check' option once to make sure your shell does not clobber environment variables. substitute: updating substitutes from 'http://dezyne.org:8181'... 100.0% substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 100.0% substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% The following derivations will be built: /gnu/store/w8y6ksif8m5x5340nc1f7chdmnidhsza-profile.drv /gnu/store/8kqnvyf9i8qgizq69314xa576fj4idy5-gcc-bootstrap-0.drv /gnu/store/kxi3vim4rl018vrg8gqchn84vda33dwy-bash.drv /gnu/store/mx6bmgkli4m404d9mzl4is9nsgycibw4-gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz.drv /gnu/store/mydw2x1m3nwxl2yz8p7kgr043mgzn1vd-tar.drv /gnu/store/ps0shilnqwpm40886dnqg4bkazw8pq7i-glibc-bootstrap-0.drv /gnu/store/fyk1fklwccp9m0g4x10rsgi6bw2nz3y5-glibc-stripped-2.39-x86_64-pc-gnu.tar.xz.drv /gnu/store/q4y6c1xk2vzfm5qff4kxw6skakkdz5mx-module-import-compiled.drv /gnu/store/z8bbhrwjlcrb1why3ahz1dk4x1xnwf0j-guile-bootstrap-2.0.drv /gnu/store/av844016j5sh8zy7y4h4wxkrs10a2rwd-guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz.drv /gnu/store/rs264sapynb56fapyrklb5plsn0gsk49-xz.drv /gnu/store/zw7x3ln4wl3b0hvrzgjjvywx5bdiffaz-mkdir.drv /gnu/store/8llks4si3nqiw0n6sb3nc70nhpnfzw9j-module-import-compiled.drv /gnu/store/h0i9912383rhczlxca6pv5d6w9np9ici-bootstrap-binaries-0.drv /gnu/store/pllyzbxxbg249x6ckn4hb67g3q4v7xk5-static-binaries-0-x86_64-pc-gnu.tar.xz.drv /gnu/store/pa9pzpm6blxiasz5wz98lxdbvlz1a2wn-binutils-bootstrap-0.drv /gnu/store/6cg3h8i0mrsizrg1y06gnj491ydhdj9v-binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz.drv building /gnu/store/kxi3vim4rl018vrg8gqchn84vda33dwy-bash.drv... building /gnu/store/6cg3h8i0mrsizrg1y06gnj491ydhdj9v-binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz.drv... building /gnu/store/mx6bmgkli4m404d9mzl4is9nsgycibw4-gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz.drv... building /gnu/store/fyk1fklwccp9m0g4x10rsgi6bw2nz3y5-glibc-stripped-2.39-x86_64-pc-gnu.tar.xz.drv... building /gnu/store/av844016j5sh8zy7y4h4wxkrs10a2rwd-guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz.drv... building /gnu/store/zw7x3ln4wl3b0hvrzgjjvywx5bdiffaz-mkdir.drv... building /gnu/store/pllyzbxxbg249x6ckn4hb67g3q4v7xk5-static-binaries-0-x86_64-pc-gnu.tar.xz.drv... building /gnu/store/mydw2x1m3nwxl2yz8p7kgr043mgzn1vd-tar.drv... building /gnu/store/rs264sapynb56fapyrklb5plsn0gsk49-xz.drv... building /gnu/store/z8bbhrwjlcrb1why3ahz1dk4x1xnwf0j-guile-bootstrap-2.0.drv... building /gnu/store/8llks4si3nqiw0n6sb3nc70nhpnfzw9j-module-import-compiled.drv... building /gnu/store/q4y6c1xk2vzfm5qff4kxw6skakkdz5mx-module-import-compiled.drv... building /gnu/store/pa9pzpm6blxiasz5wz98lxdbvlz1a2wn-binutils-bootstrap-0.drv... building /gnu/store/h0i9912383rhczlxca6pv5d6w9np9ici-bootstrap-binaries-0.drv... building /gnu/store/ps0shilnqwpm40886dnqg4bkazw8pq7i-glibc-bootstrap-0.drv... building /gnu/store/8kqnvyf9i8qgizq69314xa576fj4idy5-gcc-bootstrap-0.drv... building profile with 4 packages... bash-5.1# --8<---------------cut here---------------end--------------->8--- Reset and updated the hurd-team branch. Greetings, Janneke Janneke Nieuwenhuizen (40): gnu: gnumach: Update to v1.8+git20240714. gnu: mig: Update to 1.8+git20231217. gnu: hurd: Update to 0.9.git20240714. gnu: gcc: Add indirections current-gcc, current-gcc-toolchain. gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. gnu: cross-libc: Support cross-building for the 64bit Hurd. gnu: bash-minimal: Fix build for 64bit Hurd. gnu: elfutils: Fix build for 64bit Hurd. gnu: grep: Fix build for the 64bit Hurd. gnu: patch: Fix build for the 64bit Hurd. gnu: libxcrypt: Support the 64bit Hurd. gnu: libstdc++: Support the 64bit Hurd. gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. system: image: Add hurd64 image types. gnu: Add libgpg-error-1.50. gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd. gnu: perl: Support cross-building for the 64bit Hurd. gnu: openssl-3.0: Support the 64bit Hurd. gnu: pciutils: Support the 64bit Hurd. gnu: libpciaccess: Support the 64bit Hurd. gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. gnu: netdde: Support the 64bit Hurd. gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. gnu: rumpkernel: Support the 64bit Hurd. gnu: hurd: Build fixes for the 64bit Hurd. gnu: git-minimal: Support the 64bit Hurd. gnu: inetutils: Fix build for the 64bit Hurd. gnu: grub: Fix build for the 64bit Hurd. gnu: guile-fibers: Fix build for the 64bit Hurd. gnu: m4: Fix build for the 64bit Hurd. gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20240714. gnu: commencement: mig-boot0: Update to 1.8+git20231217.. gnu: commencement: hurd-headers-boot0: Update to 0.9.git20240714. gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0. gnu: gettext: Fix cross-build shebangs. gnu: texinfo-4: Fix build for the 64bit Hurd. gnu: flex: Fix build for the 64bit Hurd. system: examples: Add bare-hurd64.tmpl. system: examples: Add devel-hurd64.tmpl. doc/guix.texi | 9 +- gnu/ci.scm | 4 +- gnu/local.mk | 9 + gnu/packages/admin.scm | 14 +- gnu/packages/avr.scm | 7 +- gnu/packages/base.scm | 74 ++++--- gnu/packages/bash.scm | 9 + gnu/packages/benchmark.scm | 6 +- gnu/packages/bootloaders.scm | 10 +- gnu/packages/bootstrap.scm | 41 +++- gnu/packages/c.scm | 4 +- gnu/packages/chicken.scm | 7 +- gnu/packages/commencement.scm | 55 +++--- gnu/packages/containers.scm | 5 +- gnu/packages/cross-base.scm | 27 +-- gnu/packages/crypto.scm | 15 ++ gnu/packages/dlang.scm | 3 +- gnu/packages/elf.scm | 6 +- gnu/packages/engineering.scm | 4 +- gnu/packages/flex.scm | 8 + gnu/packages/gawk.scm | 3 +- gnu/packages/gcc.scm | 69 ++++--- gnu/packages/gettext.scm | 16 +- gnu/packages/gnupg.scm | 19 +- gnu/packages/golang.scm | 3 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/hurd.scm | 187 ++++++++++++------ gnu/packages/julia-xyz.scm | 3 +- gnu/packages/lisp.scm | 3 +- gnu/packages/llvm.scm | 7 +- gnu/packages/m4.scm | 9 +- gnu/packages/make-bootstrap.scm | 76 ++++--- gnu/packages/mpi.scm | 3 +- gnu/packages/parallel.scm | 5 +- gnu/packages/patches/gnumach-version.patch | 23 +++ gnu/packages/patches/grub-hurd64.patch | 32 +++ gnu/packages/patches/hurd-64bit.patch | 56 ++++++ gnu/packages/patches/inetutils-hurd64.patch | 65 ++++++ .../patches/libpciaccess-hurd64.patch | 58 ++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 ++++ gnu/packages/patches/netdde-csum.patch | 18 ++ gnu/packages/patches/openssl-hurd64.patch | 99 ++++++++++ gnu/packages/patches/pciutils-hurd64.patch | 31 +++ gnu/packages/pciutils.scm | 25 ++- gnu/packages/perl.scm | 20 +- gnu/packages/rocm.scm | 3 +- gnu/packages/texinfo.scm | 50 ++--- gnu/packages/tls.scm | 9 + gnu/packages/version-control.scm | 8 +- gnu/packages/xorg.scm | 23 ++- gnu/system.scm | 1 - gnu/system/examples/bare-hurd.tmpl | 21 +- gnu/system/examples/bare-hurd64.tmpl | 70 +++++++ gnu/system/examples/devel-hurd.tmpl | 70 +++---- gnu/system/examples/devel-hurd64.tmpl | 65 ++++++ gnu/system/hurd.scm | 17 ++ gnu/system/images/hurd.scm | 72 ++++++- guix/packages.scm | 8 +- guix/platforms/x86.scm | 11 +- guix/utils.scm | 15 +- m4/guix.m4 | 12 +- 61 files changed, 1312 insertions(+), 330 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch create mode 100644 gnu/packages/patches/grub-hurd64.patch create mode 100644 gnu/packages/patches/hurd-64bit.patch create mode 100644 gnu/packages/patches/inetutils-hurd64.patch create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch create mode 100644 gnu/packages/patches/netdde-csum.patch create mode 100644 gnu/packages/patches/openssl-hurd64.patch create mode 100644 gnu/packages/patches/pciutils-hurd64.patch create mode 100644 gnu/system/examples/bare-hurd64.tmpl create mode 100644 gnu/system/examples/devel-hurd64.tmpl base-commit: b10ce47d8be5b6c15987f4e1d93b3bd71b1eb220 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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@"; -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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?Court=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?Court=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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?Court=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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?Court=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 _ -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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?Court=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 '())))) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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?Court=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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=" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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?Court=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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]) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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))) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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?) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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")) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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=" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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" -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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. -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 + -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 '())))) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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"))) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com From unknown Wed Jun 25 00:26:10 2025 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 16:50: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: Janneke Nieuwenhuizen Cc: 74290@debbugs.gnu.org, Andreas Enge Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186215512436 (code B ref 74290); Sun, 17 Nov 2024 16:50:02 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 16:49:15 +0000 Received: from localhost ([127.0.0.1]:58313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiSZ-0003EW-0r for submit@debbugs.gnu.org; Sun, 17 Nov 2024 11:49:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiSV-0003EG-SS for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 11:49: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 1tCiSQ-0000Lm-1Y; Sun, 17 Nov 2024 11:49: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:Date:References:In-Reply-To:Subject:To: From; bh=YOJIA463KB1oyLDvxxUS4x0xF+tOEawCLPT3Ad//5sM=; b=cDXteF5GGIazij/4flgV +uP4wqqIZS7M/pYXQQfyfW66vX34ARraxVMMZfPLc9mPimozyXLboaZgt73pGyEWx8j7Dw6x6yaqj zVRBmLbZorOS/POE3Ao24QqlGLaulEw68HMh6d28VWm6Gno8rQ3vMvAoueAIzC4VFhcw33VzdA2n+ kppphQmxgA962ZUrL/b2d4iI43j0zPGlI6NUB0h/0qvIICKrfqwhPEFByI43ruESC5hkK/2BG5Edx GKsPfC/5eb8A/ol7Fe62xNHRgEe5L2lpDPKAKlOf9ihXMrXCM66TaTxGbtHOB60MeNCkisYM0zEzn 93w0m84QP3MPJg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 12 Nov 2024 17:25:22 +0100") References: Date: Sun, 17 Nov 2024 17:49:03 +0100 Message-ID: <878qthlsao.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Janneke Nieuwenhuizen skribis: > * gnu/packages/gcc.scm (gcc-13)[arguments]: Use quasiquote instead of > g-expressions. > (gcc-14)[arguments]: Likewise. > > Change-Id: I22269b31d49868effe967d46247b189ed9a9d394 [...] > - #~(modify-phases #$phases > - (delete 'patch-hurd-libpthread)) > + `(modify-phases ,phases > + (delete 'patch-hurd-libpthread)) I think we should not do that as this undoes previous changes. Instead, can we change whichever package expects to get an sexp here to use gexps? Ludo=E2=80=99. From unknown Wed Jun 25 00:26:10 2025 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 16:51: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: Janneke Nieuwenhuizen Cc: 74290@debbugs.gnu.org, Josselin Poiret , Maxim Cournoyer , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186222512941 (code B ref 74290); Sun, 17 Nov 2024 16:51:01 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 16:50:25 +0000 Received: from localhost ([127.0.0.1]:58327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiTg-0003Mf-PP for submit@debbugs.gnu.org; Sun, 17 Nov 2024 11:50:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiTe-0003Kv-PP for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 11:50: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 1tCiTW-0000l2-2v; Sun, 17 Nov 2024 11:50: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:Date:References:In-Reply-To:Subject:To: From; bh=dQJt2z7wcEUHiToHj6AxSXFke/xgvEGutMsbSlwF7nQ=; b=cG6RaEC6Yd3g49jAIfH7 8y2Xx1Ec7gVnBDY1p+v3z6iJ/oOQLvmd6GUEpsjmXW8Fd9XCgPbJBqKIfZuZOQBE46tT/MEJPyXR6 IY2rFKhYCq5dLGMW+SU8vZ/R2+g5BNlBhZEjHDQD81TRb83hDxRLVeyOko+XAtkOYYZyp0skDVMyl rglXVZ2k/G6CzH2OFT96bZ/cq2m+ntoQ8Mi8ZCD7o7iE34usYc/ZOITmIjRaXS+ae1ZQ1XpdaOLCp +nu7Zu1Ry0n7CFRl+MZGvhaAn4MUgtzK8XxQUh8GaJQhjogKsYB1XG+a0Q62um+axn4I7cDxrKewm bkNZX1f2vvoVaA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 12 Nov 2024 17:25:23 +0100") References: Date: Sun, 17 Nov 2024 17:50:11 +0100 Message-ID: <874j45ls8s.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > +++ 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"))) Are the i586-gnu binaries usable on x86_64-gnu? That would be sweet, and it would allow us have a single set of binary seeds instead of two. From unknown Wed Jun 25 00:26:10 2025 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 16:52: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: Janneke Nieuwenhuizen Cc: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186227113034 (code B ref 74290); Sun, 17 Nov 2024 16:52:02 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 16:51:11 +0000 Received: from localhost ([127.0.0.1]:58332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiUR-0003O9-56 for submit@debbugs.gnu.org; Sun, 17 Nov 2024 11:51:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiUO-0003Nx-Tp for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 11:51:09 -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 1tCiUJ-0000pm-Np; Sun, 17 Nov 2024 11:51: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:Date:References:In-Reply-To:Subject:To: From; bh=88WPgjEV4fjXqDyAxX5RPtRq/q2Fx07PVo9TBfF3jNE=; b=eo14iel1YVshK6Jal0PZ h+bd6Qu2j7TACVSzfA41bNyqkqN0Nu/ywDdnX9pkn995KnLLPkkdNNrgeNc1MPxrA60f5u8wsHQTM PFhtqowZL1j68tnLnr+BEWiwFWAKPvhHBIzcb/Hl326yh6T0eyKvmfIdggZKWdmnzXvZ0R4uS+kF3 zx22FyrHYZBq5q9uJ6EL/eO5dqbOgkxWLUA1NO8il2o3dzv7vTX2Yc5jM1LBvTgBA3VDUuV5gzOwH 4krSyJAaFx3GswuoqGDKeTrPuP/xeuDsJZHc3YywRUwrIXv/ZDp54LoJAzvV6M6hZ3FvQcW1o8qWW Ia8mR2KvTQujDw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <8dc78d1028c40206a6fc87197c3de2a5cce95dd8.1731427612.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Tue, 12 Nov 2024 17:25:26 +0100") References: <8dc78d1028c40206a6fc87197c3de2a5cce95dd8.1731427612.git.janneke@gnu.org> Date: Sun, 17 Nov 2024 17:51:02 +0100 Message-ID: <87zflxkdmx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen skribis: > * gnu/packages/gnupg.scm (libgcrypt)[propagated-inputs]: When building for the > 64bit Hurd, use libgcrypt-1.50. > > Change-Id: I608d283a4a307527d5b09a81fa1a53cec5d6bb76 [...] > (propagated-inputs > - `(("libgpg-error-host" ,libgpg-error))) > + `(("libgpg-error-host" ,(if (target-hurd64?) > + libgpg-error-1.50 > + libgpg-error)))) Could you add a short comment explaining why this version is needed? From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 04/40] gnu: gcc: Add indirections current-gcc, current-gcc-toolchain. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 16:53: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: Janneke Nieuwenhuizen Cc: 74290@debbugs.gnu.org, Sharlatan Hellseher , Vagrant Cascadian , Ekaitz Zarraga , Simon Tournier , Guillaume Le Vaillant , Katherine Cox-Buday , Efraim Flashner , Munyoki Kilyungi , Andreas Enge , jgart Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186233213139 (code B ref 74290); Sun, 17 Nov 2024 16:53:02 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 16:52:12 +0000 Received: from localhost ([127.0.0.1]:58337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiVP-0003Pr-Je for submit@debbugs.gnu.org; Sun, 17 Nov 2024 11:52:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCiVN-0003Pd-4Q for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 11:52:10 -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 1tCiVD-00016A-PM; Sun, 17 Nov 2024 11:52: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:Date:References:In-Reply-To:Subject:To: From; bh=ogfun8dfeipOzMPF2b7CHDgD9Btp7ZJGFC8Naikzz6Y=; b=BVeMdAm3N7zKdv/1IfrG 3GaZAVWDjR3k/sumwO5XwVJgetfCFjKATXiYB+YIDZGtas5qJdNj61Ljmf5Aa5ypnxaHTGbOjdL1V dcmvv3uyuATPxOMyrwT6Q6NlPwGshBsK9vdkG369ZZGuc0wubvm8EIpqSYDH3cAGH1vcjKI3Mn5Ps jl7AVjoS8/QpZUdAZmDbQJMzkvG3YlVaYm9vT0N8hqag+I4LTaWVaAjdqXAo8cYu2PpLXTzM7GO0y 15uRKJoEEnYCbSdzhV8YbiSDOJWJNVFh7pQXyTXnQE8w5GWotA0QdyDZqh2eBNqiOn7Uz1r95Znk2 O9500QTEEx2/FA==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 12 Nov 2024 17:25:13 +0100") References: Date: Sun, 17 Nov 2024 17:51:56 +0100 Message-ID: <87v7wlkdlf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) Janneke Nieuwenhuizen skribis: > 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 I would have loved to avoid those indirections=E2=80=A6 but can we? :-) From unknown Wed Jun 25 00:26:10 2025 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 17:01: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: Janneke Nieuwenhuizen Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186280514351 (code B ref 74290); Sun, 17 Nov 2024 17:01:02 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 17:00:05 +0000 Received: from localhost ([127.0.0.1]:58350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCid2-0003jO-VH for submit@debbugs.gnu.org; Sun, 17 Nov 2024 12:00:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCid1-0003iI-8c for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 12:00:04 -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 1tCics-0002IO-Qo; Sun, 17 Nov 2024 11:59: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:Date:References:In-Reply-To:Subject:To: From; bh=uPoSTSlkYPaaJ6YdE8r6zJFUoQxVL5bS/GFp36s+M1s=; b=AaLp9+zSZgz7OkXoJ+QN Bbp0gO00Ytv2VqIqNsZnzqikiV4Q+LI0oh/DkZKHaVpzF3b3K2a0V9jfFnJvYdWi8NdoLWQN6/MQI xeMg+D6ly7iRZVptm+ROKPNmwh/gUkWFk7dXO+tVfQZubMEPQSiYu5hxmJo6jZuxlIndQMR84zKNq X00XHatXwDOcx4/UQkO3f4gsek++MqfhR+yEptuyhsTbtwPGOjZaGxKmYKZWTCV2IjQHkBO0vjFrd 34FZPnG+73HkilQfdpye2HFqXqlJ4CiFKDB9NP26oBB0/2wUF8oXCsMXo8lc52L2iKCt2NxZDMjZS Xa47JvWcDJYsKw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Tue, 12 Nov 2024 17:25:14 +0100") References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> Date: Sun, 17 Nov 2024 17:59:50 +0100 Message-ID: <87mshxkd89.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Janneke Nieuwenhuizen skribis: > +++ 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)) [...] > +++ 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)) This affects not just cross-compilation but also native compilation. Let=E2=80=99s assume we only want cross-compilation to x86_64-gnu for now, = how about changing the GCC version used for cross-compilation, and only that: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 5781341a87..6120740b3c 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -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 gcc-14)) (define %gcc-include-paths ;; Environment variables for header search paths. --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable That would affect also non-Hurd cross-compilation targets, but if it works, it=E2=80=99s simpler. Then, as a second step, we could prepare a =E2=80=98core-packages-team=E2= =80=99 branch that upgrades =E2=80=98gcc=E2=80=99 globally, and that way we keep somethin= g consistent and simpler, without =E2=80=98current-gcc=E2=80=99. (Though it means we=E2= =80=99d have to wait before we can build natively on x86_64-gnu.) WDYT? Ludo=E2=80=99. --=-=-=-- From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 00/40] Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 17:04: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: Janneke Nieuwenhuizen Cc: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186300215167 (code B ref 74290); Sun, 17 Nov 2024 17:04:01 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 17:03:22 +0000 Received: from localhost ([127.0.0.1]:58368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCigE-0003wZ-52 for submit@debbugs.gnu.org; Sun, 17 Nov 2024 12:03:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCigB-0003wL-A3 for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 12:03:20 -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 1tCig5-0002sz-3F; Sun, 17 Nov 2024 12:03: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:Date:References:In-Reply-To:Subject:To: From; bh=KC7b7UpitbhCWj09rPUM3ANK0YEi7ankEaAqAk43Wf8=; b=sOheXXRvq02tAkwlPfi5 G6zP9s+UqytkkI1/YZsA2kJF9BK8sGAfWXEjRo/x60Xcn1Lu/KuQffk/DEPVhJLAzHyXEdLhAHwOs eUc47OC2BWFNPVSvp4AIVPUHpo0eO13aP+UEl0hjr/JcV8NXMQTTXDZaF+0IU2H97a7RxwV3Lskvp NS8cPf4WyFRdPYL4ukb0ZfDeF1DJBVjlkVTHL+oZQOh6c1dfOT+AUmlgxQQgvDyMIB1uRA9KvRHwA UAzMMFHLPw4LA0DD5oRKF9VuowOT2DpR0Y1Gz7+/F0lM7ZL3aMwmdooEB/PH/dx0iG2bEpZSWeWaO M0hnugMRSuLnXg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: (Janneke Nieuwenhuizen's message of "Tue, 12 Nov 2024 17:25:09 +0100") References: Date: Sun, 17 Nov 2024 18:03:02 +0100 Message-ID: <87h685kd2x.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi! Janneke Nieuwenhuizen skribis: > root@guixygnu64 ~# uname -a > GNU guixygnu64 0.9 GNU-Mach 1.8/Hurd-0.9 x86_64 GNU > root@guixygnu64 ~# guix shell --bootstrap -D --expression=3D'(@@ (gnu pac= kages commencement) gnu-make-boot0)' > hint: Consider passing the `--check' option once to make sure your shell = does not > clobber environment variables. [...] > building /gnu/store/ps0shilnqwpm40886dnqg4bkazw8pq7i-glibc-bootstrap-0.dr= v... > building /gnu/store/8kqnvyf9i8qgizq69314xa576fj4idy5-gcc-bootstrap-0.drv.= .. > building profile with 4 packages... This is amazing!! Glad to see it happen. I=E2=80=99ve just posted a bargaining proposal :-) regarding =E2=80=98current-gcc=E2=80=99 etc., let=E2=80=99s see where that = goes. Anyhow, this is great, it makes the OS more usable. Ludo=E2=80=99. From unknown Wed Jun 25 00:26:10 2025 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: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 17:28: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186443219471 (code B ref 74290); Sun, 17 Nov 2024 17:28:01 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 17:27:12 +0000 Received: from localhost ([127.0.0.1]:58436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCj3I-00053z-4Y for submit@debbugs.gnu.org; Sun, 17 Nov 2024 12:27:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36070) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCj3F-00053i-Lf for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 12:27:10 -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 1tCj35-0006W4-2w; Sun, 17 Nov 2024 12: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:Date:References:In-Reply-To:Subject:To: From; bh=tJDKY9gMoTrVLhhsGsX6SpgOKZ8TIz8/moc2h87z02g=; b=RqW30TlVQSXhgTrHqtqL s59okp6mFq9huH66Pnh6ol6N6SHQPnfmNfo9KxDBZLCwTdIboJr3u540iVGq/NM9etfglrzwXOq3F StsPKC1XlskWUiBeeZQcz0uv7uzQMwkfiQEyMy7MbSPz3ALGVVFzWZZDSyLgB/byTMY/thQGE/ryT Ogmr2yu8JWxUATFc/bXvhWobHnovwSattS5NZKF5lpWgNrHLNAZCTFd4cT3v3vhCRUUVLmfBxV9QD ix9y9znYMcWn3x09OigYhe/eJ4mN+X9cKtyo6xy+kk4oxi5fOGCKEEAxhvi1Dw13y90q/26bT/irI OnzkNOvQ+wc7KQ==; From: In-Reply-To: <87mshxkd89.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 17 Nov 2024 17:59:50 +0100") Organization: AvatarAcademy.nl References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 17 Nov 2024 18:26:51 +0100 Message-ID: <87o72dn544.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> +++ 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)) > > [...] > >> +++ 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)) > > This affects not just cross-compilation but also native compilation. Eh, if you mean for the 64bit Hurd, sure! That was the idea, it needs gcc-14... > Let=E2=80=99s assume we only want cross-compilation to x86_64-gnu for now, Cross-compilation works pretty well, I've been mostly working on native compilation the past week... > how about changing the GCC version used for cross-compilation, and > only that: > > diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm > index 5781341a87..6120740b3c 100644 > --- a/gnu/packages/cross-base.scm > +++ b/gnu/packages/cross-base.scm > @@ -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 gcc-14)) Interesting...I would have thought this would cause a world rebuild, because of the cross-gcc in commencement. Apparently, it doesn't. > That would affect also non-Hurd cross-compilation targets, but if it > works, it=E2=80=99s simpler. Ok, I very much like the simplicity of this. > Then, as a second step, we could prepare a =E2=80=98core-packages-team=E2= =80=99 branch > that upgrades =E2=80=98gcc=E2=80=99 globally, and that way we keep someth= ing consistent > and simpler, without =E2=80=98current-gcc=E2=80=99. (Though it means we= =E2=80=99d have to wait > before we can build natively on x86_64-gnu.) > > WDYT? I've been thinking about this route and decided against it because it seems to me that upgrading to gcc-14 will cause a lot of trouble/work. However, if that work is shared, and we have the build farm to help, it may be the best route. Maybe the wait doesn't have to be too long? Also, in the mean time, upstream support might improve. Maybe we can decide to go the route you propose and also keep this current-gcc patch on the hurd-team branch for a bit (we prepend a fat REMOVEME in front of it). We can keep working on native Hurd builds that use gcc-14 on hurd-team using this hack, until core-packages-team is ready to make it obsolete? Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 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: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 17:35: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Josselin Poiret , Maxim Cournoyer , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186489720673 (code B ref 74290); Sun, 17 Nov 2024 17:35:01 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 17:34:57 +0000 Received: from localhost ([127.0.0.1]:58451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjAm-0005NM-Sd for submit@debbugs.gnu.org; Sun, 17 Nov 2024 12:34:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjAj-0005N8-Vm for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 12:34:55 -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 1tCjAb-0007Nm-Q4; Sun, 17 Nov 2024 12:34: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:Date:References:In-Reply-To:Subject:To: From; bh=eyinAZcoOOhiL04Kl4Ot3U5smPtkDeeWWkmyVZV8C3Y=; b=nQb19nbEfAeKsts63fDW b4m1rdyoV2vgEqD7cx8hTU5EB46eP4PdTifMjtKXY+KrtDcB1Z5q9xupmhykIyWXKFwPTwLBv+e9K pdLznJxSdVQI1uGJWF5Epc5W9OXa49wrzySkxpITyDgHtqgEjRT4GgkEidS3Mc4SJ8tTL1fPBJoJW WgRRv0jSsbb48WYi93g9vmvZskUyhZ0W+pvrPlUTF/uNv4CwF/SrHOtx3pb5S8EYDaTy8yIdYQjof d4n0KBKky+VfQCwvawHxLnLBwOsLbDUtDirxwIg7wJPXI02LS8rkttHIQce1iZi8+lHfXwntDXMxP puFL3CCY+Z5lsA==; From: In-Reply-To: <874j45ls8s.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 17 Nov 2024 17:50:11 +0100") Organization: AvatarAcademy.nl References: <874j45ls8s.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 17 Nov 2024 18:34:41 +0100 Message-ID: <87frnpn4r2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> +++ 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"))) > > Are the i586-gnu binaries usable on x86_64-gnu? No, at least not currently. The mach message format even differs, AFAIK. --8<---------------cut here---------------start------------->8--- root@guixygnu64 ~# file bash-i586 bash-i586: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), static= ally linked, for GNU/Hurd 0.0.0, stripped root@guixygnu64 ~# ./bash-i586 --help -bash: ./bash-i586: cannot execute binary file: Exec format error [..] root@debian:~# ./bash-i586 --help -bash: ./bash-i586: cannot execute binary file: Exec format error [..] root@childhurd ~# ./bash-i586=20 I have no name!@childhurd ~# ./bash-i586 --help GNU bash, version 5.0.16(1)-release-(i586-pc-gnu) Usage: ./bash-i586 [GNU long option] [option] ... ./bash-i586 [GNU long option] [option] script-file ... --8<---------------cut here---------------end--------------->8--- > That would be sweet, and it would allow us have a single set of binary > seeds instead of two. Yeah...but no, and we'd need a gcc-14 anyway. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 00/40] Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 17:52: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186588523812 (code B ref 74290); Sun, 17 Nov 2024 17:52:02 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 17:51:25 +0000 Received: from localhost ([127.0.0.1]:58495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjQi-0006C0-VL for submit@debbugs.gnu.org; Sun, 17 Nov 2024 12:51:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjQg-0006Bn-Ma for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 12:51: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 1tCjQZ-0001rz-G6; Sun, 17 Nov 2024 12:51:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=lJ98Voavs6lC/25vWfPkGKn4dEwDDctihvSS3aDrqGE=; b=CBQu1xuRQ4JAFyQplYYH W06v7lSjrAMlL/t/5Hk+DMC+g0A2xLUd6yGAu5JxwZi8ELPR0PM9md730dCMiCHC4mFnegzA8msPh jtfD5hCHDlAkKpXwFVW1IgHtGjm9kGLPizbU9d8NxdUhs07ch2LSAfgSThL+V1TPqkAB8b5Bj5xV+ 638Mtpf13ohp25Q33fTCAijKPniBZTv1VXT4MVvgn2i9aMSWtj18kijDZJidfONqGMhFuyDiYObZv bYQlEyVoI229VrZjroPdT0MxBb+mLlX7xOb2tmazyqUtY/MiLmjpiZqECrL3qDNRI4ciRwWINqsO2 9KOX+dEr7U1LFA==; From: In-Reply-To: <87h685kd2x.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 17 Nov 2024 18:03:02 +0100") Organization: AvatarAcademy.nl References: <87h685kd2x.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 17 Nov 2024 18:51:11 +0100 Message-ID: <8734jpn3zk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: Hi! > Janneke Nieuwenhuizen skribis: > >> root@guixygnu64 ~# uname -a >> GNU guixygnu64 0.9 GNU-Mach 1.8/Hurd-0.9 x86_64 GNU >> root@guixygnu64 ~# guix shell --bootstrap -D --expression=3D'(@@ (gnu >> packages commencement) gnu-make-boot0)' >> hint: Consider passing the `--check' option once to make sure your shell= does not >> clobber environment variables. > > [...] > >> building /gnu/store/ps0shilnqwpm40886dnqg4bkazw8pq7i-glibc-bootstrap-0.d= rv... >> building /gnu/store/8kqnvyf9i8qgizq69314xa576fj4idy5-gcc-bootstrap-0.drv= ... >> building profile with 4 packages... > > This is amazing!! Thank you! FWIW, I'm currently up to here --8<---------------cut here---------------start------------->8--- building /gnu/store/b1zafmkrz9dhh8dmglgjiv4yrf29ygqa-file-boot0-5.45.drv... building /gnu/store/4b0xk1jdggh2vkca4mj3q29zgbmn06h1-findutils-boot0-4.9.0.= drv... building /gnu/store/k1anwx8nm03i6akc3y65gy1vqj2h14c0-gcc-14.2.0.tar.xz.drv.= .. building /gnu/store/kycw4rv3vc17a9147i4v8b5cy3cpdj7r-binutils-cross-boot0-2= .41.drv... building /gnu/store/jh9kknd4xnml9bxmdrs2j0vmjxixw6jk-expat-2.5.0.drv... building /gnu/store/ks454i900xdqizkvjzxff9yg78jhzh08-gcc-14.2.0.tar.xz.drv.= .. building /gnu/store/7sm2cm9dmhjqqq3qz52dsm2nb6ah4yrg-glibc-2.39.tar.xz.drv.= .. building /gnu/store/2ykm8n6yynnk4mv8b9qy6liccpbhj9h4-gmp-6.0.0a.tar.xz.drv.= .. building /gnu/store/vbk133fp4ldi2jrgbg5121f29z7x886w-grep-3.11.tar.xz.drv... building /gnu/store/h4r8v4kv268vksf2sb0fj1l026svbncg-guile-3.0.9.tar.xz.drv= ... building /gnu/store/77pq0ygp8xqxp198r1d924wmgyqc2df6-ld-wrapper-boot0-0.drv= ... building /gnu/store/w35zl5n42b8q4m095xb6ng8sxvxxm1xw-libstdc++-boot0-14.2.0= .drv... building /gnu/store/jg59zvvl58dkrpvyxcyg9sghax7skgvw-m4-boot0-1.4.19.drv... building /gnu/store/2ac7j9xyzv96v52z3gnipb30z61f71kf-gcc-cross-boot0-14.2.0= .drv... - 'build' phasebuilder for `/gnu/store/2ac7j9xyzv96v52z3gnipb30z61f71kf-gcc= -cross-boot0-14.2.0.drv' failed with exit code 1 build of /gnu/store/2ac7j9xyzv96v52z3gnipb30z61f71kf-gcc-cross-boot0-14.2.0= .drv failed [..] checking build system compiler gcc... no configure: error: Specified CC_FOR_BUILD doesn't seem to work make[1]: *** [Makefile:5118: configure-gmp] Error 1 make[1]: Leaving directory '/tmp/guix-build-gcc-cross-boot0-14.2.0.drv-0/bu= ild' --8<---------------cut here---------------end--------------->8--- but small things like guix copy (and offloading) don't seem to work. I'm working up towards a v3 (and getting that "merged") so that others might help :) > Glad to see it happen. I=E2=80=99ve just posted a bargaining proposal :-) > regarding =E2=80=98current-gcc=E2=80=99 etc., let=E2=80=99s see where tha= t goes. Yeah, I think that's a very good call. > Anyhow, this is great, it makes the OS more usable. Yes, that's the idea! Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 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: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 17:54: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186603024085 (code B ref 74290); Sun, 17 Nov 2024 17:54:02 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 17:53:50 +0000 Received: from localhost ([127.0.0.1]:58500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjT3-0006GO-Ip for submit@debbugs.gnu.org; Sun, 17 Nov 2024 12:53:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjT1-0006G9-6w for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 12:53: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 1tCjSw-0002NW-0J; Sun, 17 Nov 2024 12:53:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=hXyHJ6K0Rcikn8Kaka8tq41MSQzEH+OBbfk14520it0=; b=YSTESBar8HO9WgDrD0h4 tCD+WFTIRl6U40mTQtLeWSxgjclYM2Nr3zvOh8nufOAyQbvJCpWM/Sgyvl0joLen/P/vVQArl8/iA OCMGK8N0uIyXfIn5jgkiwuRbX75WLFEdC4vt36qf7L1srEvYzBAlJmMMAVG5EF/ORAJRmzRzaUzce VOuozQPg6EReXmx0aE2ja9wfG4n2qG7JHeBfd3dMK5NZ42SYrqZ8JbMW1Flcju8znL1Be8HTfU2wX o43Smywu0AF2Kwa++nDysyk2CZ7ItRQgM97vXPDE7P+kRTyYvG6gk8HURGSAUZCHisfVC9Uuufy14 UYMV8XS0bxJM+w==; From: In-Reply-To: <87zflxkdmx.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 17 Nov 2024 17:51:02 +0100") Organization: AvatarAcademy.nl References: <8dc78d1028c40206a6fc87197c3de2a5cce95dd8.1731427612.git.janneke@gnu.org> <87zflxkdmx.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 17 Nov 2024 18:53:37 +0100 Message-ID: <87y11hlpb2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Janneke Nieuwenhuizen skribis: > >> * gnu/packages/gnupg.scm (libgcrypt)[propagated-inputs]: When building f= or the >> 64bit Hurd, use libgcrypt-1.50. >> >> Change-Id: I608d283a4a307527d5b09a81fa1a53cec5d6bb76 > > [...] > >> (propagated-inputs >> - `(("libgpg-error-host" ,libgpg-error))) >> + `(("libgpg-error-host" ,(if (target-hurd64?) >> + libgpg-error-1.50 >> + libgpg-error)))) > > Could you add a short comment explaining why this version is needed? Sure. Upstream added 64bit Hurd support (me looks into git, hmm) in 1.48 with a single patch. I could also add that patch to libgpg-error-1.47 when building for the Hurd. Maybe that's nicer? --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 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: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 18:28: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Andreas Enge Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173186805129826 (code B ref 74290); Sun, 17 Nov 2024 18:28:01 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 18:27:31 +0000 Received: from localhost ([127.0.0.1]:58544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjze-0007kz-Us for submit@debbugs.gnu.org; Sun, 17 Nov 2024 13:27:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCjzb-0007kk-KM for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 13:27: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 1tCjzT-0007Jg-L8; Sun, 17 Nov 2024 13: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:Date:References:In-Reply-To:Subject:To: From; bh=1yva8uGvVH9OFbniERRcTOUajWCjZV0/7GlKwgOWoKE=; b=StDjwOry5/iW3crf1Ai8 TvAXztIqK10XhATEuEYJ4VVF11HgDZbPL9HzR2wMjbKIHDs/i9UCrkM7GDUpEqwm72xHMV38pQkfQ 5xN0xAJod/8U6g+YjsEe1gwIBWyBHz0T7xVZo8jAPNvL04iKsKHtE8tbw3JBFbBqTry1sPdnwHE1l qyeI5u2Pd5T6/E0ndvUxc3p5BEg5ZRu6cp8bdgouHmc7bTYkaKSBG/1SplSXDEGGN/H6VPcwjkSE+ Md6I9BJ2ocfTZGAVCS/T6XEcJmybzVhq5fM8QjVaf733i4LuoMf4ut4kT/T8gmH4GgE13Xm6CzV/O q8cHol/mFcqFPw==; From: In-Reply-To: <878qthlsao.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Sun, 17 Nov 2024 17:49:03 +0100") Organization: AvatarAcademy.nl References: <878qthlsao.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 17 Nov 2024 19:27:15 +0100 Message-ID: <87jzd1lnr0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Hi! > > Janneke Nieuwenhuizen skribis: > >> * gnu/packages/gcc.scm (gcc-13)[arguments]: Use quasiquote instead of >> g-expressions. >> (gcc-14)[arguments]: Likewise. >> >> Change-Id: I22269b31d49868effe967d46247b189ed9a9d394 > > [...] > >> - #~(modify-phases #$phases >> - (delete 'patch-hurd-libpthread)) >> + `(modify-phases ,phases >> + (delete 'patch-hurd-libpthread)) > > I think we should not do that as this undoes previous changes. > > Instead, can we change whichever package expects to get an sexp here to > use gexps? Hmm, how would that work? The package that expects a sexp is gcc-static. If we update gcc-static to also use gexps we can no longer build any gcc < 13 static? Unless we update also update gcc-4.7, gcc-4.8, and those in commencement. Maybe (hopefully!) I'm missing something? Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 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: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Nov 2024 18:47: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Andreas Enge Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17318692011071 (code B ref 74290); Sun, 17 Nov 2024 18:47:01 +0000 Received: (at 74290) by debbugs.gnu.org; 17 Nov 2024 18:46:41 +0000 Received: from localhost ([127.0.0.1]:58593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCkID-0000HC-0w for submit@debbugs.gnu.org; Sun, 17 Nov 2024 13:46:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCkIA-0000Gu-Ix for 74290@debbugs.gnu.org; Sun, 17 Nov 2024 13:46:39 -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 1tCkI3-0001ZR-2f; Sun, 17 Nov 2024 13:46:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=DZ6uXyno2Ru4W2AP+v1EINETeMoh9xmf7w74SolKx6c=; b=YXR5HbU7BcLf7w+QxeR7 0YtSVsPMJTB4cYRKhgNOlGs5MtFnmsVsWaHssTipAkv3v3D35VdT9gYottNtDPA2iqDfK9XbXK0pA 54FdgHzJBUxJc7pLAlFHYOSGXm5FpxHvsiC1bCjGSprQ3fRJptAz5P9HAoRizjGdEfnpg9X/hDp/e /88tsRK7lix9KSKk1t9mf/fUVOllqokPX6IoglSDKkAg2SJ6dF8Pld70jnfihbt5RDcr90lb3uEq3 xLo0lqysi+ewFig6JNo90nkLVGCANm9WULn5f3pkH4OlL9VdQ/APBITzRY/XTSnjii1heoXE2GHsu ppEroGQnFsyL9Q==; From: In-Reply-To: <87jzd1lnr0.fsf@gnu.org> (janneke@gnu.org's message of "Sun, 17 Nov 2024 19:27:15 +0100") Organization: AvatarAcademy.nl References: <878qthlsao.fsf@gnu.org> <87jzd1lnr0.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Sun, 17 Nov 2024 19:46:27 +0100 Message-ID: <87a5dxlmv0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Ludovic Court=C3=A8s writes: >> Janneke Nieuwenhuizen skribis: >> >>> * gnu/packages/gcc.scm (gcc-13)[arguments]: Use quasiquote instead of >>> g-expressions. >>> (gcc-14)[arguments]: Likewise. >>> >>> Change-Id: I22269b31d49868effe967d46247b189ed9a9d394 >> >> [...] >> >>> - #~(modify-phases #$phases >>> - (delete 'patch-hurd-libpthread)) >>> + `(modify-phases ,phases >>> + (delete 'patch-hurd-libpthread)) >> >> I think we should not do that as this undoes previous changes. >> >> Instead, can we change whichever package expects to get an sexp here to >> use gexps? > > Hmm, how would that work? The package that expects a sexp is > gcc-static. > > If we update gcc-static to also use gexps we can no longer build any gcc > < 13 static? Unless we update also update gcc-4.7, gcc-4.8, and those > in commencement. Maybe (hopefully!) I'm missing something? I have upgraded %gcc-static in make-bootstrap to gcc-14, problem solved :) hopefully. --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 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: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Nov 2024 08:47: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173191959422075 (code B ref 74290); Mon, 18 Nov 2024 08:47:01 +0000 Received: (at 74290) by debbugs.gnu.org; 18 Nov 2024 08:46:34 +0000 Received: from localhost ([127.0.0.1]:59871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCxP0-0005jy-64 for submit@debbugs.gnu.org; Mon, 18 Nov 2024 03:46:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCxOy-0005jg-Ge for 74290@debbugs.gnu.org; Mon, 18 Nov 2024 03:46:33 -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 1tCxOr-0005N6-Ua; Mon, 18 Nov 2024 03:46: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:Date:References:In-Reply-To:Subject:To: From; bh=nEN99mCtmQyK1z3x2EgudRnXW7hnDpPlTg7SnWeLEtA=; b=pjlqyg2XP2FTI2A3ve6u nyXSqZsopm6j86aFHFGThfkVvgfvXHPsgttBYcL6MAhvLmHk+kBlBBVJT8WOmIpKOA9JfIZvYQ/n3 dahQ/VDxPVsaWJD8oQH0RZOqU8rKfyt3f+qTG83Yi5xcp5URCA2aMAQ82eWV384G9/WSvebOMAIGi 0qoFzfSgglYI58lRELF+0TgnrUYVtwJD8GC9YuXVHK/Udi5DYlyfAn1+04Ni3nYsqRID1tVfGa2GO eQJ02dYsAy4DifI5I4Wa8jL85I5+uOdhc26S8Llh+J1UBx4tU17Mj/IeJLPG5hXPXu5DsisVJD7CR bk9ljaOqPu7MhQ==; From: In-Reply-To: <87o72dn544.fsf@gnu.org> (janneke@gnu.org's message of "Sun, 17 Nov 2024 18:26:51 +0100") Organization: AvatarAcademy.nl References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> <87o72dn544.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Mon, 18 Nov 2024 09:45:59 +0100 Message-ID: <87bjydhquw.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Ludovic Court=C3=A8s writes: > >> Janneke Nieuwenhuizen skribis: >> >> Then, as a second step, we could prepare a =E2=80=98core-packages-team= =E2=80=99 branch >> that upgrades =E2=80=98gcc=E2=80=99 globally, and that way we keep somet= hing consistent >> and simpler, without =E2=80=98current-gcc=E2=80=99. (Though it means we= =E2=80=99d have to wait >> before we can build natively on x86_64-gnu.) >> >> WDYT? > > I've been thinking about this route and decided against it because it > seems to me that upgrading to gcc-14 will cause a lot of trouble/work. > > However, if that work is shared, and we have the build farm to help, it > may be the best route. Maybe the wait doesn't have to be too long? > Also, in the mean time, upstream support might improve. > > Maybe we can decide to go the route you propose and also keep this > current-gcc patch on the hurd-team branch for a bit (we prepend a fat > REMOVEME in front of it). We can keep working on native Hurd builds > that use gcc-14 on hurd-team using this hack, until core-packages-team > is ready to make it obsolete? So, what about if we do, in addition to the %xgcc =3D> gcc-14 in cross-base -- we use gcc-14 on the 64bit hurd /system/: --8<---------------cut here---------------start------------->8--- diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a14de3002f..2b0b4b07b4 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3642,7 +3642,9 @@ (define-public gcc-toolchain-14 =20 ;; The default GCC (define-public gcc-toolchain - gcc-toolchain-11) + (if (system-hurd64?) + gcc-toolchain-14 + gcc-toolchain-11)) =20 (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 64ba37fd69..d90502f403 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -857,7 +857,10 @@ (define-public gcc-14 =20 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-11) +(define-public gcc + (if (system-hurd64?) + gcc-14 + gcc-11)) =20 ;;; --8<---------------cut here---------------end--------------->8--- Wouldn't that just work? We can do that in parallel with the gcc-14 update in core-packages-team. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 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: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Nov 2024 09:08: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173192086825721 (code B ref 74290); Mon, 18 Nov 2024 09:08:01 +0000 Received: (at 74290) by debbugs.gnu.org; 18 Nov 2024 09:07:48 +0000 Received: from localhost ([127.0.0.1]:59925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCxjY-0006gn-CC for submit@debbugs.gnu.org; Mon, 18 Nov 2024 04:07:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tCxjW-0006gZ-7C for 74290@debbugs.gnu.org; Mon, 18 Nov 2024 04:07:47 -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 1tCxjN-00082z-VX; Mon, 18 Nov 2024 04:07:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=3z6seS7A3rUogmlTyQAaOY1B27fapdqBt8RGs75j/1U=; b=L2YEMysQo4YfBjaltrBb urwQi21G0UUW+h5me0TLjWsSzkS6BgjuyEgbO1Sz6Xm3in+TkouMZ3M+6HAFrSTA4oBBulGDAjDcv 8jHaRy+TdPCaPIYgtgD07HePG1UUcCSAlqp1O+FSHfiFblXrEzvmelYTYPd9mCPyl/kdDGcTkYrEi wi6JwU/Z5sMAITUXLJZW8rhXvQ7Sp9uZY2kc/X6jB8/GY0eInEviL8Exvxoi4uwUMi0Ws0EZGfC8X TuRpy0sxnK62YGPYNK3SiPwihR2b0yJ23QSt33ny2P3l9Y/PJzrHShcNQc5i8l8hxHuc7eNE9nwnE TYX9cnUMJJ5qqg==; From: In-Reply-To: <87bjydhquw.fsf@gnu.org> (janneke@gnu.org's message of "Mon, 18 Nov 2024 09:45:59 +0100") Organization: AvatarAcademy.nl References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> <87o72dn544.fsf@gnu.org> <87bjydhquw.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Mon, 18 Nov 2024 10:07:33 +0100 Message-ID: <87r078hpuy.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) >> Ludovic Court=C3=A8s writes: >> >>> Janneke Nieuwenhuizen skribis: >>> >>> Then, as a second step, we could prepare a =E2=80=98core-packages-team= =E2=80=99 branch >>> that upgrades =E2=80=98gcc=E2=80=99 globally, and that way we keep some= thing consistent >>> and simpler, without =E2=80=98current-gcc=E2=80=99. (Though it means w= e=E2=80=99d have to wait >>> before we can build natively on x86_64-gnu.) >>> >>> WDYT? >> >> I've been thinking about this route and decided against it because it >> seems to me that upgrading to gcc-14 will cause a lot of trouble/work. >> >> However, if that work is shared, and we have the build farm to help, it >> may be the best route. Maybe the wait doesn't have to be too long? >> Also, in the mean time, upstream support might improve. >> >> Maybe we can decide to go the route you propose and also keep this >> current-gcc patch on the hurd-team branch for a bit (we prepend a fat >> REMOVEME in front of it). We can keep working on native Hurd builds >> that use gcc-14 on hurd-team using this hack, until core-packages-team >> is ready to make it obsolete? > > So, what about if we do, in addition to the %xgcc =3D> gcc-14 in > cross-base -- we use gcc-14 on the 64bit hurd /system/: > > diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm > index a14de3002f..2b0b4b07b4 100644 > --- a/gnu/packages/commencement.scm > +++ b/gnu/packages/commencement.scm > @@ -3642,7 +3642,9 @@ (define-public gcc-toolchain-14 >=20=20 > ;; The default GCC > (define-public gcc-toolchain > - gcc-toolchain-11) > + (if (system-hurd64?) Hmm, no that doesn't work; (%current-system) is #f at toplevel. We could only do something like (define (host-hurd64?) (let ((uname-info (uname))) (and (equal? (utsname:sysname uname-info) "GNU") (equal? (utsname:machine uname-uname) "x86_64")))) and then it still would not work for offloading. It might be a cleanish way to enable development in the 64bit childhurd before the full gcc-14 transition? --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 01/51] 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, 19 Nov 2024 06:59: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.173199948419538 (code B ref 74290); Tue, 19 Nov 2024 06:59:02 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:04 +0000 Received: from localhost ([127.0.0.1]:40407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBY-000553-66 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBU-00054N-VE for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:02 -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 1tDI9J-0003v9-Sh; Tue, 19 Nov 2024 01:55: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=BZ4C3eQZiCQGpZ+IzrtOY0D2IQNtzfVfQkk4aGYk/cw=; b=ksPu6PeQReCkol1QsTyC RsYh0dfNq/zTkiG5RE20PzJ3d8trTChnrH1AuM1mloLl7iPVCpRJlKnyEozoE9tOQtAkP+qoQjMwq RbFlllK6f4sCh/PxRMBIYUfwu0q+Re0kHI1EJdQ1X5CQc3xUkK3XBOx2BQve5jhPtDVEpxlRN6/ST yaaAQByjis5tGWu35uGkjLjn7NJ2fM+A1yvp3phkoeOQ9YWlnUDdsU9w3Gd13Q3RJ/DVI0aGzI2H0 8YizInJl3m5Yx3cGcMgZyCLuV39pYEtiRWVGnRBWlAWBbnCbK93S9C/EvJPFq01HpqZtcBs07yqD9 uEtpO3tAILH5/w==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:31 +0100 Message-ID: <763d643429bb1b89628f6dd6261a6b35cbc1df5a.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ff6c6be5f0..cd9ad3aebb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,6 +1463,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@"; -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 00/51] Add support for x86_64-gnu, aka the 64bit Hurd. References: In-Reply-To: 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, 19 Nov 2024 06:59: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 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.173199948619553 (code B ref 74290); Tue, 19 Nov 2024 06:59:03 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:06 +0000 Received: from localhost ([127.0.0.1]:40409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBY-000555-LM for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBU-00054M-VE for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:02 -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 1tDI9I-0003ut-Qg; Tue, 19 Nov 2024 01:55:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=I6LXbcBO7reH0VFu+5yFyjQI56kRfYU/JlqfaICzt+Q=; b=HwYnNgCrOgmyd8 r1tWFFBLamjQq+pSkT7Z1MKfso98/0aARghrHDoG0C+7oWb6bo39kjldUyywCiHn0yg7HV8FagCw4 uSMlfvQ+/qO1VO6kLAFUT/3C/tVBgzIr2P6vOngmz4SsWld93HrPap6NM60I+a3GRsqbgxGtIwU8/ jmb3huRBft4UpnUbs8JLV9PtIP98DpgzoZ/zaGqPHEyvBYlGb9qr0kqBYTtRsJHH3upW95z9VnC2r aLrdQLAMJLy6twPTuYyBs8jHrVEB0ydxFOcB1auxC7fgBrd/zTAItYgQPGbkMTqM7XrUgxNWVHjvZ VpOx7DDBdIMf4Q2Vs11A==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:30 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) New in V3: * Change of plans: Remove (current-gcc*) indirections; bump %xgcc to gcc-14, * Use gcc-14 in make-bootstrap, not just for 64bit Hurd bootstrap binaries, * Fix cross-built guile-lzib for the 64bit Hurd, * Add gdb-15.2 with support for the 64bit Hurd, * Fix hanging of static tar upon --mtime=@1 warning, * Fix hanging of bash while configuring diffutils, * Add three must-have patches from Debian to glibc/hurd, * Fix bootstrap-glibc's libm.so linker script, * Patch libgpg-error-1.47 for the 64bit Hurd instead of juggling v1.50, * Use gcc-14 [cross-]build fixes for guile-lzlib, bash-minimal, git-minimal, libffi, perl, and texinfo-4 generally when cross-building, not just for the 64bit Hurd, * Add gcc-14 [cross-]build fixes to 32bit targets for libedit and libssh. Resulting in --8<---------------cut here---------------start------------->8--- Last login: Mon Nov 18 23:03:05 2024 from 10.0.2.2    This is the GNU Hurd. Welcome. root@guixygnu64 ~# guix shell --bootstrap -D --expression='(@@ (gnu packages commencement) gnu-make-boot0)' hint: Consider passing the `--check' option once to make sure your shell does not clobber environment variables. substitute: updating substitutes from 'http://dezyne.org:8181'... 100.0% substitute: updating substitutes from 'https://bordeaux.guix.gnu.org'... 100.0% substitute: updating substitutes from 'https://ci.guix.gnu.org'... 100.0% The following derivations will be built: /gnu/store/3a5il5hniygz39mx3prp5hp63mzhap37-bash.drv /gnu/store/6zx9w9zhhp1azpzjh91y1vkf3n80mb3d-tar.drv /gnu/store/ayjm0r6x1j8zzsjyr1shwnp1riwxx99c-guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz.drv /gnu/store/bc5mrw4zsgxfap7jns5gawm8f3ph7qkc-xz.drv /gnu/store/yal3zl9d5z3v04031384ngwf95fnr5lm-mkdir.drv /gnu/store/6mm475diy40ndxwb0a0gf1zlbvh3hnzr-guile-bootstrap-2.0.drv /gnu/store/8k0hmakcghiz1iwd7k12j7h9jbca5snq-module-import-compiled.drv /gnu/store/b80napyrxi4zv7qvjk968ma7j6c9l9j5-module-import-compiled.drv /gnu/store/flib02wl6g7kx191vscbz2d4c88q1hn8-binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz.drv /gnu/store/chknjczabywxlq560wv8c90vfcsqly4k-binutils-bootstrap-0.drv /gnu/store/nmfksk734hdjs6pdwpn6rz15aba57liw-glibc-stripped-2.39-x86_64-pc-gnu.tar.xz.drv /gnu/store/f9zb5fdlyzikz3imcffdw3j2zxjrmigv-glibc-bootstrap-0.drv /gnu/store/hx98agiqzh97z6q8lxjrwgndvss72lla-gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz.drv /gnu/store/fpsga1c9a8ziz1bsp0gqjn3vrs2fy5b7-gcc-bootstrap-0.drv /gnu/store/vd3cms89c6dd5syk67casrncdf3srp89-static-binaries-0-x86_64-pc-gnu.tar.xz.drv /gnu/store/jlymwk4jqarbyndd42a700xhxswx3vjm-bootstrap-binaries-0.drv /gnu/store/x433dmz11as7axpkv69lqa2v44lg7npv-profile.drv [..] building /gnu/store/fpsga1c9a8ziz1bsp0gqjn3vrs2fy5b7-gcc-bootstrap-0.drv... building profile with 4 packages... root@guixygnu64 ~ [env]# guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' [..] /gnu/store/bnas62xn8zav82h39r5rfal40h0km2mf-make-boot0-4.4.1 root@guixygnu64 ~ [env]# guix build hello --verbosity=2 [..] building /gnu/store/c7vj6mqaji52ghpc1g3g9bws09fphyn8-Python-3.5.9.tar.xz.drv... building /gnu/store/4s4673b61571kxgpra9d28lrpp3yz0xq-bash-5.1.tar.xz.drv... building /gnu/store/7pc112kljri6vsk5s21skaypr4qk3n2g-binutils-2.41.tar.xz.drv... building /gnu/store/9z61jcjmmbvz4qgxdmkxrhwc9y1fzlmp-diffutils-boot0-3.10.drv... building /gnu/store/qf3wyl8kgzz2iy6z6bamdn4288sfgmdv-file-5.45.tar.xz.drv... building /gnu/store/vpjlhqh2nq3rdaw97ajydy9jnwhmy13s-findutils-4.9.0.tar.xz.drv... building /gnu/store/h2h7hh7kixxisf39lp68psik9jxc2790-file-boot0-5.45.drv... building /gnu/store/zdzz8hzd7b5jdgrsp8fr8flv3fmpvzpk-findutils-boot0-4.9.0.drv... building /gnu/store/jcipyysphkwc1dxa9wsc4nnbqylsdbqw-gcc-14.2.0.tar.xz.drv... building /gnu/store/8zmvmk2v347yw0sh9acgyxqhn10rrzdp-binutils-cross-boot0-2.41.drv... building /gnu/store/ia44hglqlnvslq5cw7mj1i0hvif9p5vp-expat-2.5.0.drv... building /gnu/store/skc7yvra95gzcbwgfnc1b1wcj6hw720c-gcc-14.2.0.tar.xz.drv... building /gnu/store/gi1ghd56yk94iqq2qp0573cypzm0p0sj-glibc-2.39.tar.xz.drv... building /gnu/store/jgw4blvxhibbmpc2d2fz1n1c5fn9fyak-gmp-6.0.0a.tar.xz.drv... building /gnu/store/7nfyg7z2g08shl9mc7z19ix3amfjpn0k-grep-3.11.tar.xz.drv... building /gnu/store/s5and4p7lg21043afbf7kg8qvic2l970-guile-3.0.9.tar.xz.drv... building /gnu/store/r90wl58jlmkrhv5ln42xvs12j373msi1-ld-wrapper-boot0-0.drv... building /gnu/store/8mizh7y6p0ypc8wwcbmg863m97qqwpm8-libstdc++-boot0-14.2.0.drv... building /gnu/store/79bjqzpk6lnmrlrq15qrjipsll59rqig-m4-boot0-1.4.19.drv... building /gnu/store/97h3533sf4b30mihx2wpia4kr6z1c2yx-gcc-cross-boot0-14.2.0.drv... checking build system compiler gcc... no configure: error: Specified CC_FOR_BUILD doesn't seem to work make[1]: *** [Makefile:5118: configure-gmp] Error 1 make[1]: Leaving directory '/tmp/guix-build-gcc-cross-boot0-14.2.0.drv-0/build' make: *** [Makefile:1046: all] Error 2 --8<---------------cut here---------------end--------------->8--- not bad, more work to do before we arrive at "hello". A new `core-packages-team' branch will change the default to gcc-14. This means that native building on the 64bit Hurd would have to "wait" until `core-packages-team' is usable enough for the Hurd. Until that time we may use (last patch): gnu: Use gcc-14, gcc-toolchain-14 on the 64bit Hurd. that selects gcc-14 when the host system (uname, not %current-system) is a x86_64-GNU. WDYT? Greetings, Janneke Janneke Nieuwenhuizen (51): gnu: gnumach: Update to v1.8+git20240714. gnu: mig: Update to 1.8+git20231217. gnu: hurd: Update to 0.9.git20240714. gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. gnu: cross-libc: Support cross-building for the 64bit Hurd. gnu: bash-minimal: Support [cross-]build with gcc-14. gnu: elfutils: Fix build for 64bit Hurd. gnu: grep: Fix build for the 64bit Hurd. gnu: patch: Fix build for the 64bit Hurd. gnu: libxcrypt: Support the 64bit Hurd. gnu: libstdc++: Support the 64bit Hurd. gnu: glibc/hurd: Add patches for the 64bit Hurd. gnu: bash: Avoid hang when cross-built for the Hurd. gnu: git-minimal: Support [cross-]build with gcc-14 and the 64bit Hurd. gnu: flex: Fix [cross-]build with gcc-14. gnu: libffi: Fix [cross-]build with gcc-14. gnu: perl: Support [cross-]build with gcc-14 and the 64bit Hurd. gnu: texinfo-4: Fix [cross-]build with gcc-14 and the 64bit Hurd. gnu: hurd: Fix build with gcc-14. gnu: netdde: Fix build with gcc-14. gnu: libedit: Fix [cross-]build with gcc-14 for 32bit. gnu: libssh: Fix [cross-]build with gcc-14 for 32bit. gnu: guile-lzlib: Support [cross-]build with gcc-14 and the 64bit Hurd. gnu: cross-base: Update %xgcc to gcc-14, to support the 64bit Hurd. gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. system: image: Add hurd64 image types. gnu: libgpg-error: Support the 64bit Hurd. gnu: openssl-3.0: Support the 64bit Hurd. gnu: pciutils: Support the 64bit Hurd. gnu: libpciaccess: Support the 64bit Hurd. gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. gnu: netdde: Support the 64bit Hurd. gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. gnu: rumpkernel: Support the 64bit Hurd. gnu: hurd: Build fixes for the 64bit Hurd. gnu: inetutils: Fix build for the 64bit Hurd. gnu: grub: Fix build for the 64bit Hurd. gnu: guile-fibers: Fix build for the 64bit Hurd. gnu: m4: Fix build for the 64bit Hurd. gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20240714. gnu: commencement: mig-boot0: Update to 1.8+git20231217.. gnu: commencement: hurd-headers-boot0: Update to 0.9.git20240714. gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0. gnu: gettext: Fix cross-build shebangs. gnu: Add gdb-15.2, with support for the 64bit Hurd. gnu: bootstrap: %bootstrap-glibc: Also fix libm.so. gnu: findutils: Disable tests on the 64bit Hurd. system: examples: Add bare-hurd64.tmpl. system: examples: Add devel-hurd64.tmpl. gnu: Use gcc-14, gcc-toolchain-14 on the 64bit Hurd. doc/guix.texi | 9 +- gnu/local.mk | 15 + gnu/packages/admin.scm | 14 +- gnu/packages/base.scm | 80 +- gnu/packages/bash.scm | 22 + gnu/packages/bootloaders.scm | 8 + gnu/packages/bootstrap.scm | 51 +- gnu/packages/commencement.scm | 24 +- gnu/packages/cross-base.scm | 18 +- gnu/packages/crypto.scm | 13 + gnu/packages/elf.scm | 6 +- gnu/packages/flex.scm | 8 + gnu/packages/gcc.scm | 15 +- gnu/packages/gdb.scm | 22 + gnu/packages/gettext.scm | 16 +- gnu/packages/gnupg.scm | 22 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/guile.scm | 16 +- gnu/packages/hurd.scm | 195 ++-- gnu/packages/libedit.scm | 8 + gnu/packages/libffi.scm | 8 +- gnu/packages/m4.scm | 9 +- gnu/packages/make-bootstrap.scm | 49 +- gnu/packages/patches/gdb-hurd64.patch | 923 ++++++++++++++++++ .../glibc-hurd-pthread_setcancelstate.patch | 92 ++ gnu/packages/patches/glibc-hurd64-fault.patch | 32 + .../glibc-hurd64-intr-msg-clobber.patch | 62 ++ gnu/packages/patches/gnumach-version.patch | 23 + gnu/packages/patches/grub-hurd64.patch | 32 + gnu/packages/patches/guile-lzlib-hurd64.patch | 32 + gnu/packages/patches/hurd-64bit.patch | 56 ++ gnu/packages/patches/inetutils-hurd64.patch | 65 ++ .../patches/libgpg-error-hurd64.patch | 78 ++ .../patches/libpciaccess-hurd64.patch | 58 ++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 + gnu/packages/patches/netdde-csum.patch | 18 + gnu/packages/patches/openssl-hurd64.patch | 99 ++ gnu/packages/patches/pciutils-hurd64.patch | 31 + gnu/packages/pciutils.scm | 25 +- gnu/packages/perl.scm | 18 +- gnu/packages/ssh.scm | 9 +- gnu/packages/texinfo.scm | 50 +- gnu/packages/tls.scm | 9 + gnu/packages/version-control.scm | 7 +- gnu/packages/xorg.scm | 23 +- gnu/system.scm | 1 - gnu/system/examples/bare-hurd.tmpl | 21 +- gnu/system/examples/bare-hurd64.tmpl | 70 ++ gnu/system/examples/devel-hurd.tmpl | 70 +- gnu/system/examples/devel-hurd64.tmpl | 65 ++ gnu/system/hurd.scm | 17 + gnu/system/images/hurd.scm | 72 +- guix/packages.scm | 8 +- guix/platforms/x86.scm | 11 +- guix/utils.scm | 35 +- m4/guix.m4 | 12 +- 56 files changed, 2532 insertions(+), 260 deletions(-) create mode 100644 gnu/packages/patches/gdb-hurd64.patch create mode 100644 gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch create mode 100644 gnu/packages/patches/glibc-hurd64-fault.patch create mode 100644 gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch create mode 100644 gnu/packages/patches/gnumach-version.patch create mode 100644 gnu/packages/patches/grub-hurd64.patch create mode 100644 gnu/packages/patches/guile-lzlib-hurd64.patch create mode 100644 gnu/packages/patches/hurd-64bit.patch create mode 100644 gnu/packages/patches/inetutils-hurd64.patch create mode 100644 gnu/packages/patches/libgpg-error-hurd64.patch create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch create mode 100644 gnu/packages/patches/netdde-csum.patch create mode 100644 gnu/packages/patches/openssl-hurd64.patch create mode 100644 gnu/packages/patches/pciutils-hurd64.patch create mode 100644 gnu/system/examples/bare-hurd64.tmpl create mode 100644 gnu/system/examples/devel-hurd64.tmpl base-commit: 1affd2b5aa7f5467a44cf757c4fc0c6956d3f3c9 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 02/51] gnu: mig: Update to 1.8+git20231217. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199949019590 (code B ref 74290); Tue, 19 Nov 2024 06:59:04 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:10 +0000 Received: from localhost ([127.0.0.1]:40421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBe-00055r-4K for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBZ-00054S-1z for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:05 -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 1tDI9M-0003vU-My; Tue, 19 Nov 2024 01:55:48 -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=Gg6wzNu/TMW/O95Mhzp+nneTviaAYIw85n06FjlS5l8=; b=BsFU+94Gnhhh7Aqqt51M KLGR4A+1Y6oPphmxbWA5iSqKoN3Nr5l1C/wsXd4NQfk3FhbD0aL/kbk/TLW7/DCX2ZtYxsM5F06q4 wnFbzuIPGFiSmS0niNwC+fbXo9bbsBufCFiOhNrzyyHJO+rffIjMBlPI6s9D/nM0U91Ks066IdsN5 d7fc2DyDGqyvM9cwvO/NN7XdqHQM9naidONtFE3POAWWJ/PV/iFq+89DdSBIksC2B6RnGYgZx95gZ R1mjDYJpNy+WZDyX5BSze4RbtIlx8LrHUfGrecOqR3DCn1UIrmMiEwQL27EYVIG3dYrJe1fk4qOvX QYrE4GBHMa3kGw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:32 +0100 Message-ID: <5173e555533cca3818f3e8a7b818185ab72f9e32.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 03/51] gnu: hurd: Update to 0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199949019598 (code B ref 74290); Tue, 19 Nov 2024 06:59:05 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:10 +0000 Received: from localhost ([127.0.0.1]:40423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBe-00055v-Ee for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBZ-00054U-21 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:06 -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 1tDI9N-0003vh-NQ; Tue, 19 Nov 2024 01:55:49 -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=grLRanCPY6hYm6LxiiZKsNhPOiLXPCYg/f3rpP4Ieq4=; b=nJkRMyY8KXSfAZYE90y0 nAbtoOTV0KZVp7veUObkf6b14mvZX4JnrHjWWPyPIdmy0wzjpgGFFdt8D6y1uxfoszLLoKmpVElGs wHPN/f+zvsB/3VfuLB6sDXvtqbyZ2e+8Arw12vAvrjj3c8rF6hMCb7rnbJXCju5aKMRDcLhBZd49o XhwOT2TSqqPUkghhDwX+SwW4AFq0YtPNJJ29dMMKBA2HrMgIFcHBu2jAVmIUDH/MaqrIEV0KIrD1J x1nYLTsfFkSNrt7euJYUwF76bkNDSWawjjXjWCACuTAzSdvG0bLBBRb8BbL5ZhhQV3W/MCAcZw8m5 fyn1dlRNyUfmfQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:33 +0100 Message-ID: <3bb598c7040a3323537a3ee3b5be4dcdfe118eb0.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 04/51] 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, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Christopher Baines , 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.173199949119607 (code B ref 74290); Tue, 19 Nov 2024 06:59:06 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:11 +0000 Received: from localhost ([127.0.0.1]:40425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBe-000563-SX for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBZ-00054T-22 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:06 -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 1tDI9O-0003vt-Jn; Tue, 19 Nov 2024 01:55:50 -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=Pa6Y9FF7/lLK4NUbc/ksHzZkdmPZ4YxoB3qlTOOJwww=; b=OL4Y+SUCiaKb80/lJQMj DApK5S+DeSPtXjMcGD/S/0duIGwnTCsTX1sSjxPCgiEG1UVznWUU2TC51syGuPQbDz6NUsy27dVHq ITU6Zp/xKsUUpFKFy15dT+UKj/GcwZDDpXoxgh761I6pI39MUztMH4hjik86Kw49hn0Ak8WnAk6hs W2fM6CqMW91CY+RsengpfQSxYNUij99NGUVyvsUNDs6b6uZ6Qw2gSrMysS+ERXFJdbYvzPPsTDGIh SAFNRpBdOCN499gozCL76LLPMV5j5yqfh5meOpx0Xu6IdpZAO9bUxNS6ffc3hcNTYoT8GITUwqJze PyPiro/wj5zvbQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:34 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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. * gnu/packages/cross-base.scm (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) [native-inputs]: Move final-inputs before cross-packages. (%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. (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. * guix/platforms/x86.scm (x86_64-gnu): New exported variable. * guix/utils.scm (target-hurd64? system-hurd64?): New procedures. --- gnu/packages/bootstrap.scm | 3 ++- gnu/packages/cross-base.scm | 6 +++--- gnu/packages/make-bootstrap.scm | 24 +++++++++++++++++------- guix/platforms/x86.scm | 11 ++++++++++- guix/utils.scm | 15 ++++++++++++++- 5 files changed, 46 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3743abf9fe..33cbaa30ae 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/cross-base.scm b/gnu/packages/cross-base.scm index 5781341a87..83672ab383 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/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index edc536bff4..689d48d342 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -145,7 +145,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 +157,7 @@ (define (package-with-relocatable-glibc p) (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) (package-search-paths 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 +397,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 @@ -642,6 +649,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 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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 05/51] 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, 19 Nov 2024 06:59: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199949219621 (code B ref 74290); Tue, 19 Nov 2024 06:59:07 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:12 +0000 Received: from localhost ([127.0.0.1]:40429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBf-00056C-Sf for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBb-00054f-3l for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:08 -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 1tDI9Q-0003w1-HI; Tue, 19 Nov 2024 01:55:52 -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=c8onV7OhuF9SSTXP9WNCS6hOWvgt/CoTjai2PjzC0k0=; b=japP3QyeLL/pbo0prETN 3aciOHhwtCvFNaxef9XNuLVVAVBh1XPoKUcBlI1FAgHElTxtZ3j+JQNy4xpIKj1iBZt9cIKs5e5oG +mpk99BEJUMu8rGCTBX3JJQoWoZSzhzFDRpi9MjByFMrCGq3cfS2YRp33NPYfU/HBQmL5yfI90ydb DIjlAgX4IQ8KGc/J7XGnRRjH1bCi15LqD81cTG98tDlZ7tC2SUEwZXbcAFlvG82YeCeFHDHpSYGpz 0HWw6/5j6mlSr/iwwd11bPJb5y/Pc7oOE7zlAJ3y07wTpWDB1odhHUZV2ZZOYmOhZx9P60OCZXFUC N36N9hGfKzuLaw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:35 +0100 Message-ID: <39e939ffd890362b01626b242d583d34e9176a9f.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 | 9 +++++++-- gnu/packages/bootstrap.scm | 2 +- gnu/packages/cross-base.scm | 8 ++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 90c25b54e1..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") @@ -1089,7 +1089,12 @@ (define-public glibc (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (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) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 33cbaa30ae..27798fe278 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -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/cross-base.scm b/gnu/packages/cross-base.scm index 83672ab383..4961b3b4c0 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") @@ -748,7 +748,11 @@ (define* (cross-libc* target (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (cpu ,(match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) (machine (string-append out "/include/mach/machine"))) (unless (file-exists? machine) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 06/51] gnu: bash-minimal: Support [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199950219701 (code B ref 74290); Tue, 19 Nov 2024 06:59:07 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:22 +0000 Received: from localhost ([127.0.0.1]:40451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBq-00057d-FU for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBd-000552-55 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:09 -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 1tDI9S-0003wT-7I; Tue, 19 Nov 2024 01:55: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=Qt95m4uKHM+54AY3ttIyfuvxneu8yjJgxxbpcdIZ4Bs=; b=A0zsLMbsTsy36jyN+Lc8 4GRWoD1yhMI3E2SseRh43owuizAThQzKH4aiInH9Se6nxhWxpRyILXu27EZGoJlR4L72NwCR6L6S4 aRXPSfjEG/Yy6u3SWhx5bd7jBujYQxzsm4KuLNo5HyAT6IOjt2XXUnXHqFi65yUT23mehmGjG7Gun jpkfPHiPO+h0Zh/LZMBXQzSgQBjXaOXoUWshV0akDnzZllI5ZWol7EwR1sgUevf2GJHW09REuNG8Z lL9OZ4RgwWXYESfEwA/Ky6/Gpq6dhiv2Z4xLFufkWe+OHefN1W4WZif4oebMnlrS/c2WeAH9n5jBJ nyq9Jph5XjT/3Q==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:36 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/bash-minimal.scm (bash)[arguments]: When building for the 64bit hurd, or cross-building, use "CFLAGS=-g -O2 -Wno-implicit-function-declaration". Change-Id: I1356c0aeac303bdf0254c28815716c83884008a0 --- gnu/packages/bash.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 93641a78d5..56918d79bd 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. ;;; @@ -251,6 +252,13 @@ (define-public bash-minimal ;; modules and related code. "ac_cv_func_dlopen=no" + ,@(if (or (target-hurd64?) (%current-target-system)) + ;; gcc-14 implictly uses -Wimplicit-function-declaration + ;; which together with -Werror causes: + ;; ./enable.def:492:11: error: implicit declaration of function ‘dlclose’; + '("CFLAGS=-g -O2 -Wno-implicit-function-declaration") + '()) + ,@(if (%current-target-system) '("bash_cv_job_control_missing=no" "bash_cv_getcwd_malloc=yes") -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 07/51] gnu: elfutils: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199950319709 (code B ref 74290); Tue, 19 Nov 2024 06:59:08 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:23 +0000 Received: from localhost ([127.0.0.1]:40453 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBq-00057i-Qu for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBf-00055P-6u for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9U-0003wl-0v; Tue, 19 Nov 2024 01:55: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=u7ZcwCvfIo4RA0wyM8D7UsyTx3DsVj1L+LGAlaX8E4Y=; b=bJpSAdk+FaoenyKtJAA7 OBzlPK0qkJr4yI8Y1nGqd/SP+yX6dwZ3ewq+OwhM/NTx7u6DUmGxeYS1FgPhKcMmRsGIlRUVYVCx6 it6uKLzFnLiqCEPW6AU57lZU5XXF5mNU8SfxB1WJwTjTfTwnuWUFpdovYSzo/hSr9b/5T6/Nx6tFC NsgLbF18qGOSYWAFs6uSCUyIw5/LkWbPp8fPVvrCOpC4pLPjoMBClXOq06PD2uPTDUYmntWzzHn7J LYCA76QHJAecjbkfZecJaMYUDkw2x46wvCz0w80MhZLJuhlgMKxfM3d1KsSUk2Vz2Ff6/2F5cYwo5 kHTcbEq/icMF8A==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:37 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 08/51] 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, 19 Nov 2024 06:59: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199950319716 (code B ref 74290); Tue, 19 Nov 2024 06:59:09 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:23 +0000 Received: from localhost ([127.0.0.1]:40455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBr-00057q-8z for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBh-00055d-8F for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9V-0003x1-DF; Tue, 19 Nov 2024 01:55: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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=jDAq7ewm7VGW9IbBO9xT 6dWEUoPad6h7/O0T1gFr8PvhkyUVNM8+g74iHx8Svqb/r9bD/rXwptDX5pVUk5XnVBd64o00MoHTS 4aWId3GnRUpLkQKUtjtEQqfS2ynLXsaa+cMUeT+4/WJVfIG+ltg1DI6hr90P+UliY+DDiiMSMm+XP pRFYwNS/DWymEDN67LzCx+l9wBmBlmwqLZYRlq+K9pUA6FruImmoSo3oxqsUDgNE3qQHXMQRrRXYe Rtl3pGmmNWPostBAzFSHi0xL6IxoaWz1H7ARjoB3ptqPfu0AksL12pjS2EnKsyeikK40DwjoOy6ot wRyGsDuECnfewQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:38 +0100 Message-ID: <33e729f2ea5e62c16279d6ce1b9bb2a1f3ddeb6e.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 _ -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 09/51] 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, 19 Nov 2024 06:59: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199950419736 (code B ref 74290); Tue, 19 Nov 2024 06:59:09 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:24 +0000 Received: from localhost ([127.0.0.1]:40461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBr-00057x-K6 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBh-00055e-8E for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9W-0003xJ-JV; Tue, 19 Nov 2024 01:55: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=uzE792OzozLBDOeZLY9UG0h9+GGvGGGvinw9jeHBrz4=; b=i/9MKYWK6hnjOnXhoCMy JqkqJD3t4/Sz1zyp5R0qr84/5i6NMOgMQhOiMtbtcSHXTgNjyDMR74k4y0kmP84ZLv8unoM1gIeQt ndGTeuWT2k9PHKTqUMc++oqeC3UVDPEXUez+QqT6ffftpDZI9jG7CxfwcFIkceHkI/ziUKzHgEivJ VAQCBZU4Hp5Oc8KnmtoVvHHwGbLafie8fN6CR6s77uW4D0vLqEuMkMtMByNWz1PiJ/sCKCEfX4o7M cekHKCaGpS3ShGuQUL/enDoJywZU87+MBvV2SJXR13Gk5/h1IjISvvqMvfClP+/CjwU1flI2b/ckw 4qhHCY5qgP565Q==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:39 +0100 Message-ID: <3b43e18a9c575b1db3204b9182e74e68ecfab619.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 '())))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 11/51] 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, 19 Nov 2024 06:59: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199950419745 (code B ref 74290); Tue, 19 Nov 2024 06:59:10 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:24 +0000 Received: from localhost ([127.0.0.1]:40463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBs-00058H-C1 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBj-00055s-A0 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9Y-0003xe-Bh; Tue, 19 Nov 2024 01:56: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=a7NmOy2KfV6cY0d2ca/CXJoA0Tsq6JjKypPbOUHOUhw=; b=mBH28XVLbbqosoCtFVnj h3kCDTgw8yb2A2Wym9uZQfRs2aAuPuG53/iEEepgf9QoXU7gUorbYZ3rbCtfpEx7++oF13tC5TlKF 270OWMDpVO4DZwRw9qdke9QxheEW3sOhejl7HO1Q6heA7SSgD+5aeGvNfVi9C1maoLB9EyPmr3ev0 o++Z2yhImzLpPB9BsLSiM39D+6dhdKgjg0AmPhV2xZqYum7+IyK5CEhezHzPO7gvS6Sz7OOUHXrd6 V1bAdA7uzqyRXfPKWWxBJuQSMcoVWD5rQdVZwR4zOi111OtwOhjBtbVuEfn30g9/fStdxuCMgkNQH vHROxVxUf2Py9g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:41 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 c9e475b676..64ba37fd69 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1024,7 +1024,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=" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 10/51] gnu: libxcrypt: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199950519755 (code B ref 74290); Tue, 19 Nov 2024 06:59:11 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:25 +0000 Received: from localhost ([127.0.0.1]:40465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBs-00058R-Si for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBj-00055t-A7 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9X-0003xU-Fv; Tue, 19 Nov 2024 01:55: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=oE8gEu4o9bNkA82P9wdAd86uhMmJhAOKnhaXn81mud0=; b=hPXJDoH9dn9GBtgdFapr piKYIBkd4qTtEIBorvBD5Ry+rqAI1cy5cn+89FBn4eOSbdSw+FmX9CLt0NWKgkhQZEqx6Q1diO82K QcofbGM1A5+b5NhiL9Xt5ORjsBmrUqF6+NUNZXVzK1lvUrJGbYNyxhz+fmLz0WzJrvJrIz34JQcmK oaX3p1FMHs1VTd6EPHppiZCvmKsa/4nAjjbb1+LEnyeCBApBE8x91HG6bmo022gcLG5ZA3b83VXq+ KJOwT9o0f6uukO680S1Bud2hCA+CNwnb+xV72aEICiYDoA9j3JHU9/EL8c9WWc19W21zcqz70PegS xyMIoM/959xdiQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:40 +0100 Message-ID: <66779608ae5f1662fd6f5ee55d323aeebc9f7101.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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-hurd64-patch'. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 13 +++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 +++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index cd9ad3aebb..9a775cc160 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1730,6 +1730,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..9ef1a53fa6 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,18 @@ (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-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "libxcrypt-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))))) + '())) (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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 13/51] gnu: bash: Avoid hang when cross-built for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:12 +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.173199950619769 (code B ref 74290); Tue, 19 Nov 2024 06:59:12 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:26 +0000 Received: from localhost ([127.0.0.1]:40469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBt-00058a-Li for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBl-00056P-BZ for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9a-0003xv-As; Tue, 19 Nov 2024 01:56: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=O2paMw05P4xg8gLY+nDmUoHYGnjWMhlOcVokJPZ7WCA=; b=q/2hchVg6Ykh361KRq3i kBrEZ6WLN2KpoWyZgPtIFUlF78xBmezHb2FQzsbcokkYN5h1gfmgbHeD6cZ2x9Xj3nu6gOXL522IW wP/Q4jbwRjirQtIOWjZqWy9kTQxAHX73uh8Ej39qD9hb6lfGf0P5gTfZB6IPMzgeoyseSQOKrixQQ 4wlCuhHjcQ5zQ8ETVcLAU0862lgcJUzyKizUJhpJrWxaJWgkoKjxHVdM9F6cn/aTCT1jHWgkZx7A/ qmy4mrH9vyFEn1RzAFU40nxTux/BFXvPlw9Hg4chxolp9FidG3CEJf4EbMr7Ckl7KHAK3CsxkKnsP UFDFIhQGJikAhQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:43 +0100 Message-ID: <123d8bbbda215439ea79e7b94c6b3e7b425ffcbe.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) For example, without this patch bash hangs while configuring diffutils. Reproducer: cat >x.awk < `bash' link. -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 12/51] gnu: glibc/hurd: Add patches 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, 19 Nov 2024 06:59:12 +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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199950719779 (code B ref 74290); Tue, 19 Nov 2024 06:59:12 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:27 +0000 Received: from localhost ([127.0.0.1]:40471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBu-00058o-9P for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBl-00056O-BI for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9Z-0003xo-Di; Tue, 19 Nov 2024 01:56: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=WT4b+T35rkO17WBj2DteiflhVb8/afw7UIcDzgEmjVE=; b=PetO24wt2lKSr/a+8q/K vFxRhNTay+NvXF6Fu/MQWIo0lxgG82Sps8dDmJpPrP8g6MeN/2uDGhACaSOC+3ufp+UDxxQm/d/wi OVzyHLFLncUNIUCuhHer0OLGRJd18vtSEcCnmhIhsZ3LfkdzWHqybmT8m81+yA4ZMqhAVByAEUrqj l9MmgXuif/Gx9AQ0L37/+vRH7Vfkf/jkRu8PrEj2oDGDIFIlhjodhqq76ubB4QYRhZNBTEGTzh2Ht GFYtcG4jJ0PnAF6vbJd9bxNk7/hHZwYvcdihybRrOKdqhj4Ep/W/sJcTlplkF3awJ0ybwcyfTr4Y+ Gogvo0kcn6HNqw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:42 +0100 Message-ID: <0f1b235cb863ff70acda30d9e11d45770e2dade8.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) These patches fix: * Statically linked tar to hang/segfault upon issuing the "--mtime=@1" warning; this is also applicable for the 32bit Hurd using glibc-2.39! See . * Shell replacement problems for the 64bit Hurd. See . * gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch, gnu/packages/patches/glibc-hurd64-fault.patch, gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/base.scm (glibc/hurd): Use them. Change-Id: I9ee65983876cd22ad1dc01aabb41a34074631599 --- gnu/local.mk | 3 + gnu/packages/base.scm | 11 ++- .../glibc-hurd-pthread_setcancelstate.patch | 92 +++++++++++++++++++ gnu/packages/patches/glibc-hurd64-fault.patch | 32 +++++++ .../glibc-hurd64-intr-msg-clobber.patch | 62 +++++++++++++ 5 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch create mode 100644 gnu/packages/patches/glibc-hurd64-fault.patch create mode 100644 gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9a775cc160..eb50df6e13 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1439,7 +1439,10 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-getauxval.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \ %D%/packages/patches/glibc-hurd-mach-print.patch \ + %D%/packages/patches/glibc-hurd-pthread_setcancelstate.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-hurd64-fault.patch \ + %D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch \ %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 83f8c0d9e9..bab1f258c6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1588,7 +1588,16 @@ (define-public which command.") (license gpl3+))) ; some files are under GPLv2+ -(define-public glibc/hurd glibc) +(define-public glibc/hurd + (package/inherit glibc + (source + (origin + (inherit (package-source glibc)) + (patches + (append (origin-patches (package-source glibc)) + (search-patches "glibc-hurd-pthread_setcancelstate.patch" + "glibc-hurd64-fault.patch" + "glibc-hurd64-intr-msg-clobber.patch"))))))) (define-public glibc/hurd-headers (package/inherit glibc/hurd diff --git a/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch b/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch new file mode 100644 index 0000000000..1d7c81b98e --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch @@ -0,0 +1,92 @@ +Upstream-status: Taken from . + +This is needed for the 64bit Hurd statically linked tar non to hang when +issuing a warning. + +since the move of libpthread functions to libc, glibc dropped the use +of __libc_ptf_call. But htl hasn't made the move yet, so we have to use +__libc_ptf_call there for now. + +Index: glibc-2.36/misc/error.c +=================================================================== +--- glibc-2.36.orig/misc/error.c ++++ glibc-2.36/misc/error.c +@@ -240,7 +240,8 @@ __error_internal (int status, int errnum + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + #endif + + flush_stdout (); +@@ -262,7 +263,7 @@ __error_internal (int status, int errnum + + #ifdef _LIBC + _IO_funlockfile (stderr); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + #endif + } + +@@ -306,7 +307,9 @@ __error_at_line_internal (int status, in + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), ++ 0); + #endif + + flush_stdout (); +@@ -336,7 +339,7 @@ __error_at_line_internal (int status, in + + #ifdef _LIBC + _IO_funlockfile (stderr); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + #endif + } + +Index: glibc-2.36/libio/iopopen.c +=================================================================== +--- glibc-2.36.orig/libio/iopopen.c ++++ glibc-2.36/libio/iopopen.c +@@ -281,9 +281,10 @@ _IO_new_proc_close (FILE *fp) + do + { + int state; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + wait_pid = __waitpid (((_IO_proc_file *) fp)->pid, &wstatus, 0); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + } + while (wait_pid == -1 && errno == EINTR); + if (wait_pid == -1) +Index: glibc-2.36/stdlib/fmtmsg.c +=================================================================== +--- glibc-2.36.orig/stdlib/fmtmsg.c ++++ glibc-2.36/stdlib/fmtmsg.c +@@ -124,7 +124,8 @@ fmtmsg (long int classification, const c + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + + __libc_lock_lock (lock); + +@@ -193,7 +194,7 @@ fmtmsg (long int classification, const c + + __libc_lock_unlock (lock); + +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + + return result; + } diff --git a/gnu/packages/patches/glibc-hurd64-fault.patch b/gnu/packages/patches/glibc-hurd64-fault.patch new file mode 100644 index 0000000000..24980e8c2a --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-fault.patch @@ -0,0 +1,32 @@ +Upstream-status: Taken from: . + +See . + +commit 11ad033e1c09c8b8e7bbaa72420f41ab8bcf0f63 +Author: Flavio Cruz +Date: Tue Jul 30 00:51:20 2024 -0400 + + x86_64 hurd: ensure we have a large enough buffer to receive exception_raise requests. + + Message-ID: + +diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c +index 5110c6030f..1fe973f54d 100644 +--- a/hurd/hurdfault.c ++++ b/hurd/hurdfault.c +@@ -121,7 +121,14 @@ faulted (void) + struct + { + mach_msg_header_t head; +- char buf[64]; ++ /* This is the size of the exception_raise request ++ * including mach_msg_header_t. ++ * See generated code in faultexc_server.c. */ ++#ifdef __LP64__ ++ char buf[112]; ++#else ++ char buf[64]; ++#endif + } request; + mig_reply_header_t reply; + extern int _hurdsig_fault_exc_server (mach_msg_header_t *, diff --git a/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch b/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch new file mode 100644 index 0000000000..600f89a711 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch @@ -0,0 +1,62 @@ +Upstream-status: Taken from . + +See , +and . + +Commited for 2.40 + +commit c8b4ce0b368115714bd4cce131e1683759471099 +Author: Samuel Thibault +Date: Sat Jul 13 17:00:55 2024 +0200 + + hurd: Fix restoring message to be retried + + save_data stores the start of the original message to be retried, + overwritten by the EINTR reply. In 64b builds the overwrite is however + rounded up to the 64b pointer size, so we have to save more than just + the 32b err. + + Thanks a lot to Luca Dariz for the investigation! + +diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c +index 2c2e7dc463..424c1fc700 100644 +--- a/hurd/intr-msg.c ++++ b/hurd/intr-msg.c +@@ -42,7 +42,10 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, + struct clobber + { + mach_msg_type_t type; +- error_t err; ++ union { ++ error_t err; ++ uintptr_t align; ++ }; + }; + union msg + { + +Taken from: + +Force putting save_data on the stack rather than in SSE register + +The signal management does not yet properly save SSE state, so that save_data +would get overwritten by signal handlers, notably leading to `` shell +replacement getting empty content because then the io_read RPC retry gets an +MIG_BAD_ARGUMENTS error. + +XXX: This is only temporary to fix the common shll replacement issue, and is +waiting for proper SSE state restoration. + +Index: glibc-2.38/hurd/intr-msg.c +=================================================================== +--- glibc-2.38.orig/hurd/intr-msg.c ++++ glibc-2.38/hurd/intr-msg.c +@@ -79,7 +79,7 @@ _hurd_intr_rpc_mach_msg (mach_msg_header + mach_msg_bits_t msgh_bits; + mach_port_t remote_port; + mach_msg_id_t msgid; +- struct clobber save_data; ++ volatile struct clobber save_data; + + if ((option & (MACH_SEND_MSG|MACH_RCV_MSG)) != (MACH_SEND_MSG|MACH_RCV_MSG) + || _hurd_msgport_thread == MACH_PORT_NULL) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 15/51] gnu: flex: Fix [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199950719787 (code B ref 74290); Tue, 19 Nov 2024 06:59:13 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:27 +0000 Received: from localhost ([127.0.0.1]:40473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-00058y-2y for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBn-00056k-D6 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9c-0003yM-Ls; Tue, 19 Nov 2024 01:56: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=9l4KVSOnda24IMPFgajqnKj4x3vM9NTeG2XRYAyA4Hg=; b=g2glSsGIrUZITQ5jbgBU prrTgWfZvToA8NYXY1qIyyhwBuHGE+MyCiq0aSykZ2NBoGSdhZGQgcmSPizbDgdKUdiPDsb9y90cr fBwR5Svs40mxk83277x4RbLHNe0faihvTJ413sznd+ucMvpIf+9Iz4s5HMuOCRX/eUCpUlgtsHK09 OzkHNOI5G0n69rCBJRP8TSYr5AUzQJBry+S6uticGW/sBOFA3wrT47uYsG2zOCIF/YoLvisyn0U1R UfjrR7MBcQ2dl5oTvhomYBnqTkhaPRlZr+TbLXdeBD9w3zeUQrLkNIQuD/BFw/yl4X+7dXgWSxN/8 Z+2BI4JoXROkBw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:45 +0100 Message-ID: <90804ab4f172718c941e2c7897ae87abc1ebb56e.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/flex.scm (flex): When building for the 64bit Hurd, or cross-compiling, 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..4ad1e1382a 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 (or (target-hurd64?) (%current-target-system)) + (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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 14/51] gnu: git-minimal: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199950819794 (code B ref 74290); Tue, 19 Nov 2024 06:59:14 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:28 +0000 Received: from localhost ([127.0.0.1]:40475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-000595-GC for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBn-00056l-D5 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9b-0003yD-Cg; Tue, 19 Nov 2024 01:56: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=cCAl94rsMNTlvu6NprBvKee9APP2XEpDFhvQ0GdiLAg=; b=a6vMB2lHOZhfDFUCH9mb lOZcC0tatyLkz/nlDVklyOYbaZ/xbyb2JV43lI4e+aUf0B3h4/viRTMDCM0q5B4ghInJdHhAcAgvx +ftuG90TbiyUJHgJVt0r2QSFgePorRrAjP9+5Yp3VYxZ4d2exl/O8Q5qBDR90loZKzqNuKCkIP/eJ Uty+ybMWRvCq6OCdltxpUGFXqxs4k9uOQrLAJKjEsBdfMclxrpWz4mP51gNJGRL9PlPiNCiRzkiPZ iDtmW3eDYZ6sjEaatqvIE89E7Il++X2NT8mCpU6uUGkrZd/vTvWxxK/IMOF69OIPg4HevGQJSVEpL wg8lPAmzsQAeuw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:44 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/version-control.scm (git-minimal)[arguments]: When building for the 64bit Hurd, or cross-compiling, 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c892a83a98..ca77b485ad 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -296,7 +296,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 (or (target-hurd64?) (%current-target-system)) + #~("-Wno-implicit-function-declaration") + #~())) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -305,7 +308,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. -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 17/51] gnu: perl: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199950919817 (code B ref 74290); Tue, 19 Nov 2024 06:59:15 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:29 +0000 Received: from localhost ([127.0.0.1]:40483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBw-00059D-1R for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBp-00056u-Ei for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9e-0003yt-RF; Tue, 19 Nov 2024 01:56: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=UIwR6zWpgjQu9Ditvecz9ZJh7DyV0oKKw+QUwHm+1Vs=; b=l55d13WqWKyOyXKupIAI Nj8gcreo2xbND6x0x2pOGZSTZ10C4SthK8r6yUiETVLpWQpZP1Th0L4ZUavvfKK+7bkYVwvR6Orjz 81VErz5dll+S9KmfkWa80sthGMgaqhdqSK0OzHheovISzTQquCBBV9jYfqXFL611tC4ij3pr9s7s4 Tm6oWc6JFkF71md+18Tw41/yJZ+kMnHxLmZjQIB+n+34Xq9KtI7T0qaHUNjbaRFAWl/QzGAbaDNMj XS+gCxGOTZSJoCF+e7eDTKs9FV4HBieHinjQZ8eyGnFzUScSY5LSYLQOFgRxhehWoUS8nueWnFhNH Pi7mKUq7g63Jmg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:47 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cross-base.scm (perl)[native-inputs]: Update perl-cross to 1.6. Change-Id: I4a77f51a6757ad4aed9bcca8f9bbbf2cbd162e15 --- gnu/packages/perl.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index faaac13bf1..3941ad4831 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -248,14 +248,16 @@ (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 "1.6")) + (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 + "0s06lkx5b79r9cn6pm5p6d4jbdjq7wg7rjr75nw5xdhw1z3wnl2d")))))) '())) (native-search-paths (list (search-path-specification (variable "PERL5LIB") -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 16/51] gnu: libffi: Fix [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199950919830 (code B ref 74290); Tue, 19 Nov 2024 06:59:15 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:29 +0000 Received: from localhost ([127.0.0.1]:40485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBx-00059b-0X for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBp-00056t-Ee for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9d-0003yf-Pl; Tue, 19 Nov 2024 01:56: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=lqpisiRgmw43Cx2rzKtRJIYjy0xr1729dZT+hDGieYc=; b=g6O/NSQFaCyNhTx1K9PM z1bLgUkXeHXilKsf5Mg9zw94hH0GY8vcQFtamoy6JtDeYlBiWSnJRqKCs+bMz6UvlDJUP0WH8jzQu D0XLXmCO7fgWwtOqNRhfmAe4p1O9lYG8ODUyON+R7xv1VZPS6q6/k+Q6Xux9VjpJbRYBrbdmm53IK p2w284xqRzbZCvLXNr7+gSpGZm46ppAGLVKR/jKQUD2zAlthMe33n/DdY5G/cyXMAo8psiSRh31YF +69eMH818MQ6mN8yVCIs2VzPQVHaxQzxdHwy1wTbuux42JJdXBkcILv8t23bYcr2Oj0R4yZhOXaGT zlk2w9r2CbUdLA==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:46 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/libffi.scm (libffi)[arguments]: When building for the 64bit Hurd, or cross-building, add "CFLAGS" to #:configure-flags to disable breaking warning. Change-Id: I05bf3f460f3e292626de1894b7a3cf381cb07702 --- gnu/packages/libffi.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index ba3fc6bc79..62be8f0c4a 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2021 Maxim Cournoyer ;;; Copyright © 2020 John Doe +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,7 +61,12 @@ (define-public libffi `(;; Prevent the build system from passing -march and -mtune to the ;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4". #:configure-flags '("--enable-portable-binary" - "--without-gcc-arch"))) + "--without-gcc-arch" + ,@(if (or (target-hurd64?) (%current-target-system)) + (list (string-append + "CFLAGS=-g -O2" + " -Wno-implicit-function-declaration")) + '())))) (outputs '("out" "debug")) (synopsis "Foreign function call interface library") (description -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 19/51] gnu: hurd: Fix build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199951019840 (code B ref 74290); Tue, 19 Nov 2024 06:59:16 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:30 +0000 Received: from localhost ([127.0.0.1]:40492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBx-00059m-ND for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBr-00057D-GP for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9g-0003zS-Ni; Tue, 19 Nov 2024 01:56: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=GYJYDWvcaLLc+ShZiUmXRy2h4jwaJDQffy5hjWiHZEI=; b=BAvjkYWlKGyUphek3+t5 WzMfqdhucKSjrL9fZRED7SIyRis4SxjRxzaxlsEBwJz9BYtfkRHPIzTxIpOhORJY1rI32FIQbMS0j YCosKEcJhSA0rmtjuyqzK2NyBZmeBmiDDnJb2mXTHjjn5DfEsRQ/Ccr/N5oCK96mizQiPKTYFba/5 m5CHsammf/mDThmzqOkxRwy6P99sQ8ovj+YqWPSR7KfEd5VAL8nkvxjEM1H5HwVvj7yQAhIGJa74y T7zp8RynuB63G35L5VlH/Ve3RIdLD5WKSlzD7iZEcfJLtzaX8r0+Gxnd6lEwSJsb4txql5ddkTr9O hxxJkq0ee52+Jg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:49 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd)[arguments]: In phase "build-libdde-linux", disable some warnings breaking the build, using "WARNINGS=...". Change-Id: Ib70926a90e1d37080c5b9dd333f19636cdae3013 --- gnu/packages/hurd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 06fae1bd3b..5a60d8ac13 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -478,6 +478,12 @@ (define-public hurd "/bin/bash") (string-append "CC=" ,(cc-for-target)) + (string-append "WARNINGS=" + " -Wno-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -Wno-int-conversion" + " -Wno-strict-prototypes") "ARCH=x86"))) (add-after 'install 'install-goodies (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 18/51] gnu: texinfo-4: Fix [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199951119859 (code B ref 74290); Tue, 19 Nov 2024 06:59:17 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:31 +0000 Received: from localhost ([127.0.0.1]:40494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBy-00059w-8j for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBr-00057C-G7 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9f-0003zB-NI; Tue, 19 Nov 2024 01:56:07 -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=dNHTgQn2iv/vmWV5oFdb5KfwYTvADA/xgJ7u01dY2v4=; b=UEB57vreQFgjFGFdX+wC /xbEBald9BV3C5m0F1Ma9X7Ake5LgLs5STMiZVtEx5emoBvEk0eh7E06+EaNemiL/tekBlFBcAI0a A3htX0Rrf930LI5zKCWaw0Rhm58f67BHffZWrAAzeJ/xZ3XRHMzxhZBj6/Er0SS3wuls1khZ3DezW FQj1Kr2a7sKtG6PrWbtmX3f3xuD+nLR6VV/NhmrVkHBuOOWnn9SngPokyo8+FEI1eyJwStfmntjzE IYIAjfOxesU1ix1BHHeVg6/1Ke45TLyzBPEKuY+YZj7YokFqFaGpHJcbEYcqDrK8aSccaA4XKn+PO j3D34Fk69PHnhw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:48 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/texinfo.scm (texinfo-4): When building for the 64bit Hurd, or cross-compiling, 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..c30ca3c788 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 (or (target-hurd64?) (%current-target-system)) + (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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 21/51] gnu: libedit: Fix [cross-]build with gcc-14 for 32bit. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199954120040 (code B ref 74290); Tue, 19 Nov 2024 06:59:17 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:01 +0000 Received: from localhost ([127.0.0.1]:40542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICT-0005D9-90 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-00057e-JF for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9j-0003zr-4e; Tue, 19 Nov 2024 01:56: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=iZ7gvj8TZhmo++vO5wvgaIjArhnfvdAxNWoJeaXJfSU=; b=eptyeAgv6P/PoxhZoIOE E8bV0FaE6Qfxs21T8o3bIDULs8Q8zTNxcE27co99IfSwWHp/c3w7/9MJA/k+YamMR4WfkCdxoPZP7 N7SWHm8KlmUY9biYP2zwqjqp1R6OKzVx6OW1KlT95/jkV/rR4Rv61zQTEVZitaQVsTKKdZfiqy0Vv onqpCUDsyu2yr6EtoOyrz5Q9F4vkWY1z975YAcykmgg80IWMUsNbBLwEh1uGzmvw/qC/rJ5IQ8rC4 hMR0AfAnJjrTJXV2zzKXnrio4zqrB+xrle5E+fUXbkBeVA6GiRYUI8uIHpgjFoNCa+AgYUaAuo4WQ 1FCf2b2uFf7pWg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:51 +0100 Message-ID: <183d4ea53dbc21e1271b7fe0b7e8e3a6303da264.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/libedit.scm (libedit)[arguments]: When cross-compiling to a 32bit host, add CFLAGS to #:configure-flags to disable a breaking warning. Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922 --- gnu/packages/libedit.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm index f04d3aafe4..252f8a4966 100644 --- a/gnu/packages/libedit.scm +++ b/gnu/packages/libedit.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,8 +22,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libedit) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages ncurses)) @@ -39,6 +42,11 @@ (define-public libedit (sha256 (base32 "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v")))) (build-system gnu-build-system) + (arguments + (if (and (%current-target-system) (target-x86-32?)) + (list #:configure-flags + #~(list "CFLAGS=-g -O2 -Wno-incompatible-pointer-types")) + '())) (inputs (list ncurses)) (home-page "https://thrysoee.dk/editline/") -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 23/51] gnu: guile-lzlib: Support [cross-]build with gcc-14 and 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, 19 Nov 2024 06:59: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954220054 (code B ref 74290); Tue, 19 Nov 2024 06:59:18 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:02 +0000 Received: from localhost ([127.0.0.1]:40544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICT-0005DC-Ma for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-00057g-JO for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:29 -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 1tDI9k-00040L-Vn; Tue, 19 Nov 2024 01:56: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=G0CmL8P0BdY2Fsasn7TwU3ZyPbmzzXdztEUf+ZRljYw=; b=CTMMWnola7iHf/d7HoQw WdVLZOrL29DJm2zIYc85hh2EqvFvMNxifh770+owShXQJo0kKKH1knHHwwwSKxS1ryCxlCmUjkonT Fzv0zg5wCBL7BYmoAJJb+6N0W1oEm0Vt8t5D8vWBXoG4jkRigTHtrHfMKwJ3zi1Cy3paL5kWeI2Xv BTaJY3XsdcLiffG2ju9P4G0jYH079Q/JDcy5+Z2YZ2A0A3bCU7+p+z7XnV+uJbhkkzU48UkqBdLQ2 CtwIz182cE6GcPyk4YxiEpSdFMoP6OvZG2sT0o49rqBOZnX1fgAB01VA9gbb1GUrcWNZZYjV7O8P8 yBoFkDDhHaJgqQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:53 +0100 Message-ID: <00e60fa4abeb1cb337acf0a4ff0d56de2700e448.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/guile-lzlib-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/guile.scm (guile-lzlib)[arguments]: Use G-expressions. When building for the 64bit Hurd, or cross-compiling, use it in new "apply-hurd64-patch" stage. Change-Id: Id03f71baa80e2f4f967f54037ce7d9f1c5dc4bb6 --- gnu/local.mk | 1 + gnu/packages/guile.scm | 16 ++++++++-- gnu/packages/patches/guile-lzlib-hurd64.patch | 32 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/guile-lzlib-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index eb50df6e13..be6befb921 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1516,6 +1516,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ + %D%/packages/patches/guile-lzlib-hurd64.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-ssh-rename-bool.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8dabbb2c5e..69dff9211f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christine Lemmer-Webber -;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Andy Wingo @@ -962,8 +962,18 @@ (define-public guile-lzlib "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (list + #:make-flags #~'("GUILE_AUTO_COMPILE=0") ;prevent guild warnings + #:phases (if (or (%current-target-system) (target-hurd64?)) + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "guile-lzlib-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~%standard-phases))) (native-inputs (list autoconf automake pkg-config guile-3.0)) (inputs (list guile-3.0 lzlib)) (synopsis "Guile bindings to lzlib") diff --git a/gnu/packages/patches/guile-lzlib-hurd64.patch b/gnu/packages/patches/guile-lzlib-hurd64.patch new file mode 100644 index 0000000000..12e8c3617d --- /dev/null +++ b/gnu/packages/patches/guile-lzlib-hurd64.patch @@ -0,0 +1,32 @@ +Upstream-status: Presented upstream. + +From 80dcd31562827f4b6d085affe9d9f22164f7ed34 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 15 Nov 2024 16:18:29 +0100 +Subject: [PATCH] build: Support the 64bit Hurd. + +* configure.ac: When cross-compiling declare LZ_decompress_open before +using it in conftest.c. +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 50dc5ac..4c56768 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,10 @@ AC_DEFUN([GUILE_LIBLZ_FILE_NAME], [ + [if test "$cross_compiling" = yes; then + # When cross-compiling, we cannot rely on 'ldd'. Instead, look + # the output of 'ld --verbose', assuming we're using GNU ld. +- echo 'int main () { return LZ_decompress_open(); }' > conftest.c ++ cat > conftest.c < Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954320067 (code B ref 74290); Tue, 19 Nov 2024 06:59:18 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:03 +0000 Received: from localhost ([127.0.0.1]:40546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICU-0005DQ-Ci for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBx-00058N-Kg for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9l-00040c-Qb; Tue, 19 Nov 2024 01:56: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=Y7bvj7bLCTrW/89zMFH39GYUzblPVrQRZUmycBA/1Do=; b=A0cgPs1qiklYm1I2ZXjy QdVu0DWDsbIvsb/LdFAa8fmR7+rCQCU6Lfw9P4Vm44JxUJPQ6/fgCQqYH1nbewu/q+fAWpwPufquE eZJH5ZieVYeC91eksflckbCansFsntfcHnXJxJkaTwGgPKFZTnqXzjMLTsIJM9OqPJ9wDQshPuN0U Iy7XDTdjFg7fXeldbuUhNKluI+9kgCwY+wrVnhS/bWsZU6psVQtoPd3usbbO7EUM8kPVPMBD14CRU CUouCKraTn1D03hZdRZRIWFwEFRCI8c/yYsvaXpZGbkXmKokPOk+hnJ48Z2LpVGgkgttVmnEOxlrR qhLWXeOlPEJEjg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:54 +0100 Message-ID: <02910dbe93acb473309c798d158e7ebab2a6dffa.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Gcc-14 adds support for the 64bit Hurd. * gnu/packages/cross-base.scm (%xgcc): Bump to gcc-14. Change-Id: Idf7696c50532aa4def2b2d37cdb5c70715125123 --- gnu/packages/cross-base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 4961b3b4c0..ad3616eaba 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 gcc-14)) (define %gcc-include-paths ;; Environment variables for header search paths. -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 25/51] gnu: make-bootstrap: Update gcc-static to gcc-14, 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, 19 Nov 2024 06:59: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954420093 (code B ref 74290); Tue, 19 Nov 2024 06:59:18 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:04 +0000 Received: from localhost ([127.0.0.1]:40552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICV-0005Dd-39 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBx-00058O-Kg for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9m-00040m-M5; Tue, 19 Nov 2024 01:56: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=1B8MPLM0v1P1/vnvx5RLM/LODq+I1B3+M3XWeOkGel4=; b=bmIKD1y5UxBjVWRxCMDj 8p92SzA3QR20CiDj2437rBBrF2QXwy4jI8m6nfBSp1zr3krNMzbTD888xm/4oMWQfn42bVfJ3t+Wv 5oXUdMg8HqNAvlYQIi3rbYT3sc7xbuzJVcvBMvZV7T/SqmN0cBLsTzKdTtlZYliv91DoCq7EGs0Fu IhLZadIFF5faNIG/sH/YXUzHCM59Z5y+o8Z8L5nM/PtX0vMSpnIA3CRQ1tYZL8MxU0nSuDQ6fGSbU euoRP0Oexz3CHyv2Un9sR9Qh9JgheFf+alyFTk0gzbzMOKZS9DteK64DIMugC+jNYCNZIB/y6cPIu nsDEZimWbAG9yg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:55 +0100 Message-ID: <87866dcf5a2a3beef0086aa2a8aa959b11983b0a.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/make-bootstrap.scm (%gcc-static): Use gcc-14. Update to use G-Expressions. [inputs]: Remove libstdc++ and libstdc++-headers. (%gcc-stripped): Use gcc-14. [inputs, native-inputs]: Clear fields. Change-Id: I4e6d779cb457b256d80d1882f182b72a6f7d2be2 --- gnu/packages/make-bootstrap.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 689d48d342..e0dcca7b33 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -488,11 +488,11 @@ (define (%glibc-stripped) (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc) + (package (inherit gcc-14) (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments gcc-14) ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) @@ -501,7 +501,7 @@ (define %gcc-static ((#:guile _) #f) ((#:implicit-inputs? _) #t) ((#:configure-flags flags) - `(append (list + #~(append (list ;; We don't need a full bootstrap here. "--disable-bootstrap" @@ -526,9 +526,9 @@ (define %gcc-static "--disable-libssp" "--disable-libquadmath") (remove (cut string-match "--(.*plugin|enable-languages)" <>) - ,flags))) + #$flags))) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'pre-configure 'remove-lgcc_s (lambda _ ;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in @@ -538,12 +538,12 @@ (define %gcc-static (substitute* (cons "gcc/config/rs6000/sysv4.h" (find-files "gcc/config" "^gnu-user.*\\.h$")) - ((" -lgcc_s}}") "}}")) - #t)))))) + ((" -lgcc_s}}") "}}")))))))) (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") - ,@(package-inputs gcc))) + ,@(fold alist-delete (package-inputs gcc-14) + '("libstdc++" "libstdc++-headers")))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -556,17 +556,19 @@ (define %gcc-static ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc)) - (package-native-inputs gcc)))))) + ,@(package-native-inputs gcc-14)) + (package-native-inputs gcc-14)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. (package - (inherit gcc) + (inherit gcc-14) (name "gcc-stripped") (build-system trivial-build-system) (source #f) (outputs '("out")) ;only one output + (inputs '()) + (native-inputs '()) (arguments (list #:modules '((guix build utils)) #:builder @@ -632,6 +634,7 @@ (define* (make-guile-static guile patches) (propagated-inputs (modify-inputs (package-propagated-inputs guile) (replace "libgc" libgc/static-libs))) + (arguments (substitute-keyword-arguments (package-arguments guile) ((#:configure-flags flags #~'()) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 27/51] system: image: Add hurd64 image types. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199954520113 (code B ref 74290); Tue, 19 Nov 2024 06:59:19 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:05 +0000 Received: from localhost ([127.0.0.1]:40554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICW-0005E2-6j for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBz-00058w-MW for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9o-000419-Qn; Tue, 19 Nov 2024 01:56: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=PyhNVzNTCBqNggG0y5zxgIrF7PsKideagxLANCne5eQ=; b=KNAouupeZJpLvXdLlpx5 zqwTCRy+00RyIuYBa6SabZdn04WfSLZf87ZeMdPVzjzx3NzV5gtUZb13Zk1bg7RxMkvk6TgGYCqgh yPh/JzA/MWdNG2nqpkNwq2gMW17RQiIVSVnI6J/W+BwAI5sgZZArYPKgNc2EbWdifdKIWx8NHPWXB Gkz9sPAxnLmRdcQpHAxP6SKJOn9jw8igpl7MK0Per/DSZktrtko6szfkxYmqQjLB5C75bD83da/oL aNsME62jwLOxuKflpaq4f2IGHNJYquRN8kD1cIimeTiKNYq6RoDdfBchiUNSMidmyhdMEPVNfZ/2L eK+HOxSWjSTn6g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:57 +0100 Message-ID: <20f53327749d766cf31a35e0f1f3a5f9803843c6.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 20/51] gnu: netdde: Fix build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199954520131 (code B ref 74290); Tue, 19 Nov 2024 06:59:20 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:05 +0000 Received: from localhost ([127.0.0.1]:40562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICX-0005EJ-5f for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBt-00057Q-HY for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:25 -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 1tDI9h-0003zc-Us; Tue, 19 Nov 2024 01:56: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=xEF0ll7dUIqVcV6ikDQ7f4MB3hi/jMUESKOS+d4IpDk=; b=lL2ORLH+LGwjW/Vghvbg 71/aIt1d/JFz7YVguTGXl7Dph/wxfBA5zP72QhzqCJW3oN5pK/Xf+VLIfyJR3BNZI4am7msZajcbl ua6NCqByVWZMIwRhdxDCre0tuSq8bAkFoUa8b589kFgNelWurB6HmnP9dIaACOTOm513HExrKjxCI ZmKfdsXk1OxcPD/7SHjIy59J6LSWLfw9t7GFGG4xv2f31uV8a2NZBLckctbKmD1FEV8Yc0WY+YsMB mzLh6mf2sQxqaHIJv+ANngUHFwkgqOg3IJBUbtIsHE29nXK2yKVqrOEMMF2FQ2h+eabq6DG+aUx/u OUkfJV9VuPeqsw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:50 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (netdde)[arguments]: Disable some warnings breaking the build, using "WARNINGS=..." in #:make-flags. Change-Id: I39f577c51eaa3d86abf80a54f7c172324cf56749 --- gnu/packages/hurd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 5a60d8ac13..5fdb6359d1 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -592,6 +592,12 @@ (define-public netdde (search-input-file %build-inputs "/bin/bash")) "PKGDIR=libdde_linux26" (string-append "CC=" ,(cc-for-target)) + (string-append "WARNINGS=" + " -Wno-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -Wno-int-conversion" + " -Wno-strict-prototypes") "ARCH=x86") #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 22/51] gnu: libssh: Fix [cross-]build with gcc-14 for 32bit. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199954620142 (code B ref 74290); Tue, 19 Nov 2024 06:59:20 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:06 +0000 Received: from localhost ([127.0.0.1]:40564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICX-0005Ea-Np for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-00057f-JM for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9k-000403-0P; Tue, 19 Nov 2024 01:56: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=Tzx7sfpF6zPexd9qQ5YlxNXlGGlqiXkutTcT8A/yEyU=; b=L1YkvMmD9SMbNQp65lG9 vTCPWIVIxXYZudOjPvJncOwPjcNyOjYq12yB0jImyCF8DKkpf2hjlHlp/XMlHJ0Hgt6NxylRHbmYL TawAl1sMeglxpUlLA3swfANawotuo/zyUXTYHGzI2bJGsRkhCtw4tqCcTrgsLj0doz6Ra7hie7jZq zv3ic1fRQ+QfhC746y5Bj10qJtEX0F+sGZWY0fTQDl/qspq1QmeVeRWggQuwYJ9on5TKiEJbSCaAP Nt/Tf5dnRS1UdmkqkEcxLrQMw4ValZiaHZ69c5rkw1GwkE8RdHFuSmeHmtMD5kk9z0pMgkgcil/tz Xg1I7q4WlewV4Q==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:52 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ssh.scm (libssh)[arguments]: When cross-compiling to a 32bit host, add CFLAGS to #:configure-flags to disable a breaking warning. Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922 --- gnu/packages/ssh.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a29a10e954..1f33259246 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019, 2020 Mathieu Othacehe -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire @@ -156,7 +156,12 @@ (define-public libssh (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - '(#:configure-flags '("-DWITH_GCRYPT=ON") + `(#:configure-flags '("-DWITH_GCRYPT=ON" + ,@(if (and (%current-target-system) (target-x86-32?)) + (list (string-append + "-DCMAKE_C_FLAGS=-g -O2" + " -Wno-incompatible-pointer-types")) + '())) ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. #:tests? #f)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 26/51] 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, 19 Nov 2024 06:59: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 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.173199954720173 (code B ref 74290); Tue, 19 Nov 2024 06:59:20 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:07 +0000 Received: from localhost ([127.0.0.1]:40571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICY-0005Ep-B2 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBz-00058v-ML for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:33 -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 1tDI9n-000410-WF; Tue, 19 Nov 2024 01:56: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=qnejf/nM1shUTk9fMaLeXQeh+jXU5MFLXFeAnfamxJ8=; b=r/piUegEFxXp4YAhYQaT lp3BCNYHLI4CeZjTqVZzixK33eYzy63NV61K0mBCtcSQqM9+tmEuNWxD7hZzeMl/UNKn457yNG7OW +SW3yg7Xtx/Bcm++6G1FM3LP1YeR89TFZLanqqX6KQl1XHDO8iAH91wy6t8vvC0twEn+PlpbSfjdn MwoSDTALOY3bnM1Pkvxa3qakNwPt2OgRIw6x24AZScKobFNT/50E5TaVog9nS+4FucO2I1KQ+eODv r06tqgbfAamm32MSbrqRl1pAdGEH2tPhu2ZQM7kzlDfcAK6lonpTk0LO1vcD1jSc7kIrKT1Cet0Wy qxak+tyV6Y0f5g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:56 +0100 Message-ID: <2c35be492f8b105d92a940e3647cc162716f1650.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) XXX TODO: v Boot a 64bit hurd, and v Guix shell --bootstrap -D -e '(@@ (gnu packages commencement) gnu-make-boot0)' v Guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' o Guix build hello, o Guix shell --bootstrap -D guix, 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 draft, o Release blog post! On commit: 610e996dcc82ab7819e9c19d81fdc78b7a9c822c gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/7n1vcnzgad4cppzcmd7vnadsggrfm9as-bootstrap-tarballs-0/ With guix hash -r: 0m66rvp5728c12xab5042gd4v0l1df0821l68brscrc5qr08imsj * 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: I828159aedb3f66caba98e935083cc3682429f219 --- 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 ba4bd2cc79..ce00811b49 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 27798fe278..301ee3ca12 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 "0zrcb59s6zm53p74yk0kw8kya5nndcscj4cqvz99fppcblq6c83g")) + ("mkdir" + ,(base32 "1lbfl66nyvrc8n2ngd9y2gpsm31p4hkn8k6viln0gvd434pf9hnl")) + ("tar" + ,(base32 "005d5xpnhiyyy2p0widygc65hnrvqd1ryc8ja2q5vpm5ranvbayr")) + ("xz" + ,(base32 "1qbqxjqm3jsi0av40s62n1nskc98lwl7r12phlw4ca6c1zrlij12"))) ("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 "/20241118/" 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" + "/20241118/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 "1ymp3lck1l5fybsa542ny2fdkfydfcfvqbgr3qh03yvq4fwfn6mc")) ("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" + "/20241118/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 + "0g5rn94a2kd6g9ggf5m59hypawkwm7r07wwm5730s1mi9w62p248")) ("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" + "/20241118/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 + "1zia5fpap35dcpfmmfy6i4p8l3h0d7lzk9bg8apv7vwgw4l1rv9z")) ("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" + "/20241118/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 + "0d21cy22bhvf11gc859s8ig7gc680ish8mv5xy2l8vrnc12k3q68")) ("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" + "/20241118/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 + "1di5zbnwnkw679fnhih10c4q8rg2qgqzs424c3dg91sd9l0y0a4j")) ("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]) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 28/51] gnu: libgpg-error: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199954820199 (code B ref 74290); Tue, 19 Nov 2024 06:59:21 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:08 +0000 Received: from localhost ([127.0.0.1]:40579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICZ-0005FK-LW for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC1-00059T-Nn for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9q-00041Q-8J; Tue, 19 Nov 2024 01:56: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=B3Pqy5ZDGyQ/fvy+5OmO8jCcLjBlWaBDnk6MStRPdVA=; b=gqRMQ0fZCew0mxDPsI7g na59/Lj3aHC6H6NsTcuRhSOAFr+Hmb6M1CwYIRjgenENi6ljns/VsV58ZOmSx1JnkfVqdQOGJXrO8 vMWFdqtGm8V69+KGaNnAyfCX2QvvXKpnYJafV7JvloWfiJFvmhGEqsIU2wM5IPosPATxlzCR/q0VN ImbNf1/L6vBZffM30zut/cYRccYmwdKqvrfTick1MmSkeAqGAy0A7QN6D1emn2S4dZ5XKR/FL/niy S1G7ewgknzQaeeTbKV2/LDAkzRSMbOx6Dte+FiGwb1vFVej/5DRCG8kv45/IcRNM/xS33hirkmhwI cc1jaxZfhyMqgg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:58 +0100 Message-ID: <25bd177d4c3c8811d46300ee01ab04fb5c7a66b5.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/libgpg-error-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnupg.scm (libgpg-error)[arguments]: Use it when building for the 64bit Hurd. Change-Id: Icabb7cd7bb5bcc771ccee5b8a7f57f52b9b58183 --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 22 +++++- .../patches/libgpg-error-hurd64.patch | 78 +++++++++++++++++++ 3 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libgpg-error-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index be6befb921..147f8d8709 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1625,6 +1625,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ + %D%/packages/patches/libgpg-error-hurd64.patch \ %D%/packages/patches/libguestfs-syms.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2e97c2244a..6535f94cb8 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. @@ -144,9 +144,25 @@ (define-public libgpg-error ;; configuration, as this is not correct for ;; all architectures. (_ #t))) - (#t #t))))))) + (#t #t))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "libgpg-error-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~()))) ((system-hurd?) - #~((add-after 'unpack 'skip-tests + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "libgpg-error-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))) + (add-after 'unpack 'skip-tests (lambda _ (substitute* "tests/t-syserror.c" (("(^| )main *\\(.*" all) diff --git a/gnu/packages/patches/libgpg-error-hurd64.patch b/gnu/packages/patches/libgpg-error-hurd64.patch new file mode 100644 index 0000000000..aac8ce61f1 --- /dev/null +++ b/gnu/packages/patches/libgpg-error-hurd64.patch @@ -0,0 +1,78 @@ +Upstream-status: Taken from upstream (1.48 series). + +From c62157c615a6379677c8f106bf9413d2611fd95e Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Sat, 6 May 2023 16:10:55 +0200 +Subject: [PATCH] core: Add hurd-amd64 support + +-- +This supports the x86_64-pc-gnu triplet + +Signed-off-by: Samuel Thibault +--- + src/Makefile.am | 1 + + src/mkheader.c | 2 ++ + src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h | 24 ++++++++++++++++++++ + 3 files changed, 27 insertions(+) + create mode 100644 src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h + +diff --git a/src/Makefile.am b/src/Makefile.am +index c61adde..9389e99 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -67,6 +67,7 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-apple-darwin.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \ +diff --git a/src/mkheader.c b/src/mkheader.c +index 8fbfbd6..cc0eaa3 100644 +--- a/src/mkheader.c ++++ b/src/mkheader.c +@@ -108,6 +108,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack, char **r_os) + {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" }, + {"x86_64-pc-linux-gnu" }, + ++ {"x86_64-pc-gnu"}, ++ + {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, + + {"arm-unknown-linux-gnueabihf", "arm-unknown-linux-gnueabi" }, +diff --git a/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h +new file mode 100644 +index 0000000..7c7e6f1 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h +@@ -0,0 +1,24 @@ ++## lock-obj-pub.x86_64-pc-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[32]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## + +base-commit: 7a42ff0ec971f4f2add28b0edad6cf381b5b8acc +-- +2.46.0 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 29/51] 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, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199954920217 (code B ref 74290); Tue, 19 Nov 2024 06:59:22 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:09 +0000 Received: from localhost ([127.0.0.1]:40587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICa-0005Fk-Q5 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC3-0005AC-Ps for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9r-00041b-1s; Tue, 19 Nov 2024 01:56: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=GoAeMddNyBDVybPTmya05BStkXK1mIySOPuk2z++aLw=; b=GYi2xCZ2g/iqINWyIuDy 1vR3g5+CzHjMiOJCNAdqPIeUKL2G/a4T+lZw0JwQWXjeRY7SA7V48E5DWfxrGk7aUsaKw+DMJOFTN o6BTRUxlz0OCDjvwNF5cvmZVpR0/7f+KRrt3ccOdkBe55yDDeLE7xIl50NbSG2S+vnXB29Yh3dNe6 r5QIXbTjGJ3ucuZT+imLmj0fVIyk4L9lWdJZDp/tjM2S7NZ94nDvfbHu+z7h1RNyF+465zkPDvCVY 9aSg7w7pCr1coUXQ/rIoHM25Ig5dAdsh3JQF+Zk91qbChuSENnOAf3tVPa72JjhLes8/NmAnEdcNF OLU9zEWgHA4mtA==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:59 +0100 Message-ID: <061a58f90f9a5f7f43b148bc8d71f6322e9a3cec.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 147f8d8709..a0408d20f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1901,6 +1901,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?) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 30/51] gnu: pciutils: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199955020238 (code B ref 74290); Tue, 19 Nov 2024 06:59:22 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:10 +0000 Received: from localhost ([127.0.0.1]:40593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICb-0005G2-Ll for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49960) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC3-0005AD-PM for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9r-00041m-U6; Tue, 19 Nov 2024 01:56: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=zF43VOco6aqIFdqJ22hyYazvSN62LpGEcNUrlszboHM=; b=gphuD+DwB9is5b4Xu5Pf 1XI+Wg34OXXiz/3hVlxpmiEZDkUeBYgrKchoU30sXJZqyzopKcmdMAvkmjGt4bO97eycfsHC9bxxB OnzJggntAmtBvQnXEIrjkjPi6QTrv+kJ//mC/tr7hTJF8G7EWylph2TohXS+D2jf/c7hZ9ht9SWd2 wFY8VnqzZJE9NimLHeLmcO4as1c3dIVNeL1RVxxx+9vQAnN4B3l7zEvcr7tu0UuXSz3SZZN6VwGXi GXe89K54zsJ2cyUa9IqwLNQ5N8+5FAll8eel6YSnp5QAxWre2WHuoWbxjh8Y5Ofivzhj5Y3fHq2vr fyxKGLUTFXm8GQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:00 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 a0408d20f2..89042a0716 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1916,6 +1916,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")) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 31/51] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199955120256 (code B ref 74290); Tue, 19 Nov 2024 06:59:23 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:11 +0000 Received: from localhost ([127.0.0.1]:40598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICc-0005GM-M5 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49966) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC3-0005AE-Pr for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9s-00041r-Oh; Tue, 19 Nov 2024 01:56: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=5WmN5s4SEXDdwi7Ezhtzk//j4Xdmdm1VRGzTnrF69cQ=; b=bXxb+FjobD8qWgeeyevu HgJgrOgyCxPi/vBcEr8O9qTroOwHq6krYNb1fAf97ki2mRZfkaLme1MYBf9n2D9RbXkV/S7JvE6S4 gSKIqqWkCZo7mjQdvb/psP1QELqY0ngccZmJCyvPQ/X+1iJJIwu1UzUoDwP1jDqWvc6dalEzY+K/x vrU/3LqPE00BmY1Lt4KPxLB7RtNH9T+d8xGmEnGxuKEniY10f7fS3lPZYuj8bSiDfeFTT3XFCviVD RzTKFzTfu3yElLUiqbQE3WEpFObDxkexHKXqcYxshr8EfuFV5lWfHP6/VesXPfztFjKnfs9rX8JXv fxm5yfNmp5Ug5A==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:01 +0100 Message-ID: <4e74903a8a7627615bd7d14334f10ef09e755c79.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 89042a0716..b6e25cd43d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1711,6 +1711,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 32/51] gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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.173199955220269 (code B ref 74290); Tue, 19 Nov 2024 06:59:23 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:12 +0000 Received: from localhost ([127.0.0.1]:40603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICd-0005Gf-Le for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC7-0005Ac-Sb for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9t-000423-QJ; Tue, 19 Nov 2024 01:56: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=IdcQCyQ/vo8uDTni/SmHls3ywYSMyTuo8J3ltumovBA=; b=ocpv4SBDUkKsqY83AidB pLD76ESNgn/KSF2yQLz8RWjutCA8NLS8iQCd0N4exbQsFNUaoU1rjB95aCY10YReW5R+/Frv1SFJU wH8t40Q/5pn6VdhfZomqfv/fbqyPApaY19SFEZ0It9GioSxRuYDd4yq3s/j+/ay4BMNp0Xx1ZdFeH 7xWBpMn8crWh38Y6CkB5PF/GQlGwZ8RQTVe8mU2AbCiklYdti27AuKrH5LvcAVCno0/Zy1xOTTyMb cLt+fYEeNl5fa9viwseH7p7qPzRJuo/3uK6wVLb5zb9EgSaRuywNEti9ROICaEOJ8UMzTQMP8yyPB 8iKr/88QCln91g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:02 +0100 Message-ID: <1fea08519fe4b1b5f62b2d3de3e6520a1a74b8e7.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 5fdb6359d1..2c231425aa 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 @@ -567,8 +567,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 @@ -582,7 +582,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 33/51] gnu: netdde: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199955320281 (code B ref 74290); Tue, 19 Nov 2024 06:59:24 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:13 +0000 Received: from localhost ([127.0.0.1]:40605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICe-0005Gp-6R for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC7-0005Ab-Sb for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9x-00042a-0V; Tue, 19 Nov 2024 01:56: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=mG2IXGN2iXW/3r3SSj6sbcsDh9atD8S2wy/yV1JDqTA=; b=Ufn2jrKfHfiTtPzUfrxF VzbuUxJdkMXRZUgoO/eZRwS0STrdyZZb/mq3ttB27etzsLIxI8mEFRkmgPapvCdfoRT1hR42NZhOb yB7IuFbOIvRBpUsyqYyA5g/isRom7xnjE8768vrEJTc75bFxd/T0Had2NepW0xRekH8VJDdaNPLZc LBdNRkr3xegHqIq5V0I2eI8Sjj5xBhbNff/rg8MeUUNj9ClI33Il83t7gWrfhS79qtSr/hemjCcMi nBjl6LHkGecBvSIO+ar1oxzEx5qwgTMz7S5C1uRBQABNoOysvQ+0BVvsgPlYGDOFFeu7NilIqWNhe 4TJke6tpzOdQ6g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:03 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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, and follow upstream's "amd64" symlinking voodoo. Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 19 ++++++++++++++++++- gnu/packages/patches/netdde-csum.patch | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/netdde-csum.patch diff --git a/gnu/local.mk b/gnu/local.mk index b6e25cd43d..e4b6de83cb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1826,6 +1826,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 2c231425aa..defa3f2689 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -579,7 +579,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")) @@ -599,6 +600,13 @@ (define-public netdde " -Wno-int-conversion" " -Wno-strict-prototypes") "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 @@ -616,6 +624,15 @@ (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" (delete "PKGDIR=libdde_linux26" make-flags))))) 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" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 34/51] gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199955320295 (code B ref 74290); Tue, 19 Nov 2024 06:59:24 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:13 +0000 Received: from localhost ([127.0.0.1]:40608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICe-0005H3-VN for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50008) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIC9-0005Av-U9 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDI9y-00042q-DU; Tue, 19 Nov 2024 01:56: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=Ml7qt6m977oIZHOXMwWHbWIc+SYvMnIygOWThmx+pv8=; b=CFSV8GNyb5pPRChp9KmM DfpLVUzdtfiTT56M23/0qV4M+cB38piHBDwYjYk6hdqGoDqGoONgseCmna9adegW8qS8xJhAZN59K v1rAMeHfP9LgN2LNm/vnfTm1FR1CL1eP/okLFdWAyeI4VEZix7WbTGatZWimSjptQruWism+Cgtd0 9LSBlfr3bZyPvdfefJtZ/ApmawEHWbDtKTQJG9snvOWWGmFdGNLEWNYKQk8LkUrLnWWcX3u8pu38n YSLJicWmYtfYUCv6vvA8oS+cxKCZv5AS9pkYp8PBr51ZCLCrEdBzlyYXZ5egjQeNuw8pWx2Q9WLea pLb3997EuVq3Og==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:04 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 defa3f2689..0df514cc78 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -676,8 +676,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)) @@ -691,7 +691,7 @@ (define-public rumpkernel (commit commit))) (sha256 (base32 - "0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r")) + "1ygn3ysji06ik3k44sf906fjpdmabznkspw70llldbk2zkrcdw7i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -811,7 +811,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=" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 35/51] gnu: rumpkernel: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:25 +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.173199955420309 (code B ref 74290); Tue, 19 Nov 2024 06:59:25 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:14 +0000 Received: from localhost ([127.0.0.1]:40613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICf-0005HI-Ig for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52144) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICE-0005BK-1X for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:46 -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 1tDIA1-00043o-1z; Tue, 19 Nov 2024 01:56: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=p/fc0uQcseXNqhyISel/qHQYVRi4koMAZyjnGE676gI=; b=YNjjGSpffDVVjv84hPN/ JjVXOFtdyU8IjGNU2WW+TyPZH/daUg6AvcbAe5UljlxPjE6LZKxI4uxkm2V1zsKXiOLmTuxYLbhue fRpL8HHZSTNqYfmH4tAq4OuCZkj0lITt7O18U04zzfkHb+EcZqJGy1BP285WdZarK2dZugyQcaIPs FXE71LgEs5HDHNFbOt7Rg7rkMpWEq92wVBEtFa//HdJtp0AEyjhF8z19XFNgttgjfpJWTLVaggieL HfpQ1hWwPeNj8qmJlUXJrfsLOZgOMEXjAco7wb35RzxyBlnE6wUNL8wUeg/yIpXiVJUQxmdKkULEx sAwiFc3yUkV3BQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:05 +0100 Message-ID: <3e3f9e7098a0dbde70b068e39d6898571e4303cf.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 0df514cc78..6701d00251 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -792,6 +792,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" @@ -802,7 +805,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" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 37/51] 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, 19 Nov 2024 06:59:25 +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.173199955520329 (code B ref 74290); Tue, 19 Nov 2024 06:59:25 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:15 +0000 Received: from localhost ([127.0.0.1]:40616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICg-0005Hb-Bd for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICE-0005BM-1Q for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:46 -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 1tDIA3-000440-50; Tue, 19 Nov 2024 01:56:31 -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=VB42GMco4qrpKykieVzHxQv6yc8s12IUhc59oK/i9uc=; b=evmoruivZRhpp5aitffu X9ngrEp8m35vu8v87qi6qk1Ls2PHknCn5zIpDyvjxGVlAuU/bu6eaoPbPl3yevuSuhLJtIYHG5GCL 9FE7KhcrjQjNcINIvXPKdQ/4+zT3ZacR9CqnbbT4L2gpa1VtZoGnyURHehAX/sftI2/Z0J8694kuf ECW2GPMEgkD1sMbHM1W9WCAg4qfwn+wBBO+udLUZHj9NC2os6eDSieyhcSyHNqlbb6gnwqvVLhySu SuvL+Ft3XPNIRKicOV7VsLOJmiMp1PDcP+vFUth3JFdf8jNc5aPCEK7fIcLoS2yWUPzEFLtroER7y zrOE6eSHqrKuLQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:07 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 8a607e5df7..0979414ec2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1577,6 +1577,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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 36/51] 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, 19 Nov 2024 06:59:25 +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.173199955620345 (code B ref 74290); Tue, 19 Nov 2024 06:59:25 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:16 +0000 Received: from localhost ([127.0.0.1]:40619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICh-0005Hp-C5 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICE-0005BL-1Y for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:47 -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 1tDIA2-00043r-VM; Tue, 19 Nov 2024 01:56:30 -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=3eDAYvhD7/S4zRN1iNNY2OHp5VUTvmov5DDcV87PBp0=; b=Ps3/z+JZ9L45utHbfS+H wlsMWN6je9UbLxDWiUKwng0DneFRAPzSioNBxsOdfRlqUfKe/Z+HAqFA6oR5QVRCQu0LgV3lyx+ll 2sDt6qIiWYCOFSnx9fGYQulTaDIdoU86Y8i7VBKU4ksNcANusFbU4Kx2GwZ8RnZKg+KPykBzgYiJx IvH0WIC+fO0EE1qj8w0yN7j/G+NeIDbe0SC1cVbsEktBslt6PCB7HHhG4jdsFQUE8iqf2BmdIQut9 CJsn2yR3HnONR6i/053mYNO8JyhAwpLOljxpRArluUM4dh0SNIrAXIfvYNOcGLjFE2hp1Y5kTIz/g UUwM4A1FcVM59Q==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:06 +0100 Message-ID: <92b73ddd7fe349d12445f8e0f39cdca8dfc6599c.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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, and follow upstream's "amd64" symlinking voodoo. Change-Id: If264a91b2433add13f9121c482f0abe67ae5f1e9 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 126 ++++++++++++++++---------- gnu/packages/patches/hurd-64bit.patch | 56 ++++++++++++ 3 files changed, 135 insertions(+), 48 deletions(-) create mode 100644 gnu/packages/patches/hurd-64bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index e4b6de83cb..8a607e5df7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1553,6 +1553,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 6701d00251..63249b4ef7 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,54 +468,84 @@ (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)) - (string-append "WARNINGS=" - " -Wno-declaration-missing-parameter-type" - " -Wno-implicit-function-declaration" - " -Wno-implicit-int" - " -Wno-int-conversion" - " -Wno-strict-prototypes") - "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-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -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") @@ -599,7 +630,6 @@ (define-public netdde " -Wno-implicit-int" " -Wno-int-conversion" " -Wno-strict-prototypes") - "ARCH=x86") (let ((arch ,(match (or (%current-target-system) (%current-system)) ((? target-x86-32?) 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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 41/51] 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, 19 Nov 2024 07:00: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.173199958920553 (code B ref 74290); Tue, 19 Nov 2024 07:00:02 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:49 +0000 Received: from localhost ([127.0.0.1]:40651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDE-0005LP-E8 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICK-0005Bm-5i for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:52 -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 1tDIA8-00045a-EZ; Tue, 19 Nov 2024 01:56:36 -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=WUZeir+Y0D5Fntp393hj0+/RZuqCHnBVhXweLV0Sl2A=; b=eUb+103t07DDaRD8dgjV ni+Qw9wrMc+pwbxm6Hg0CE8NjnxPGyKz1N6x62600fSy9c9dxpHgBw5T8BHKOE3M0lXFW1h2vBA6S 7CE6odxD4QnrCilgpVBExisyIkc18RyLJViAFuqfqOrl6acp1e28weYE0y3M1HFidLsQOGXN9Dxkn aU6ViUfrn24jJfofHodeZHP25I7s5sbqXKZ/S6x81a+U0ubOHpJSJMen7UrKuoXeLc6NQXqbmbpSm AjUi8NEuOtg6ryYhv7kpaEN2oW6OkirjMMj9LXnzwTr11wBnlMPHLZ6EvGcd6Oklutf9EoHF6Gc7/ eMLC7qNldKwmoA==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:11 +0100 Message-ID: <5f22c74f56573069ab9d155832f17424193bf296.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 1cfaaae1e7..2f805b3e63 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2635,7 +2635,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)) @@ -2649,7 +2649,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) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 44/51] 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, 19 Nov 2024 07:00: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 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.173199958920559 (code B ref 74290); Tue, 19 Nov 2024 07:00:03 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:49 +0000 Received: from localhost ([127.0.0.1]:40653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDF-0005LR-0e for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICM-0005C1-7M for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:54 -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 1tDIAB-00046H-PC; Tue, 19 Nov 2024 01:56:39 -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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=nsaRWQKAX7LYHek5/ACi kyYXfezIrvm/52OMWgch/isfRjNPYFPAxQqsfCFFLHd1WVZ++muXMAQ91ntB53laQZ/USEoCa/eW1 j9BpFAM+DeGkE3Gr3Yy7PBBjZE7yGIJQ6DibD0l4VWkSkd+DM2oewbT2w2KxWFpea21TLQOyD5woi FoM+uVEO8QICigDkPmfEvVXXylla64FBRgCy74O80+R98SlTr2ZYZo8DC5udaCeXiDMjCOPzhV7WT elQBMUeNft080Z857JLJyKs85Jo+P8dSL1gNHjZmFysC1X2bhmwrBGbF5AlB7kbbiHdXk5OgdaJy3 DsG0LCgYIi6qbQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ad70bae501..a14de3002f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2273,9 +2273,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))) @@ -2446,7 +2446,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 43/51] 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, 19 Nov 2024 07:00: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 , 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.173199958920567 (code B ref 74290); Tue, 19 Nov 2024 07:00:04 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:49 +0000 Received: from localhost ([127.0.0.1]:40655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDF-0005Ld-ED for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICM-0005C0-7K for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:54 -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 1tDIAA-00045y-7u; Tue, 19 Nov 2024 01:56:38 -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=BeOgD0UmX7EVnVKq7bSxcI53DT9PJfVxrIKTnsHKm+c=; b=D5oEMRcLuRya0zUumrPN FeMuF6g7DF4vLLdnvo+KH1rUR9C1QFDZlOAWJwCgm7nS9Gtl+csHR3IXj7CqpwzY/xz0VaExdkafQ eO0MLWbK69xaafwdNjmI47iEz0y4Ced4w7p7ZGmFhHS6OPc7+m4a/88t++4jcU1o2ZJ5hXzqEPknX NHJEkUBpJT04cecs73T8Mhj8vB5CPKNnZTArg91uoeWk+N+hZz9fQF555mu8HemzsdoXhw8o+eFPt wEZ6hyEcsY1ORACvxs31cWHkArvyZH2hazy3ZQ1Hlng1USZwebXiUkWVC/g7AlnviFqQ3uKeG7a8u +/AF/RA0zrZDfA==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:13 +0100 Message-ID: <83f6710ae8d2308e2b1dbb82b9fb7dc51dfeaddd.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 742ccbc63b..ad70bae501 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2699,7 +2699,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)) @@ -2712,7 +2712,7 @@ (define hurd-headers-boot0 "hurd-v" version ".tar.gz")) (sha256 (base32 - "0ybmx7bhy21zv1if2hfdspn13zn68vki1na72sw2jj87gj8przna"))))))) + "0wcihffclwijjamx4cjbr8i92yg780538ipg2z208ahg96jjrmgq"))))))) (native-inputs (list autoconf-boot0 automake-boot0 mig-boot0)) (inputs '())))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 45/51] gnu: gettext: Fix cross-build shebangs. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:00: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959020577 (code B ref 74290); Tue, 19 Nov 2024 07:00:05 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:50 +0000 Received: from localhost ([127.0.0.1]:40657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDF-0005Lg-Pv for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICO-0005CE-8h for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:56 -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 1tDIAC-00046X-Vx; Tue, 19 Nov 2024 01:56:41 -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=vc6TmPsZt9gRfGUT3TPTCxPOTd6Do/TxOPguHB3OS0M=; b=o7pIBpAK+DsLPtYzorEM tpcRdL3uTIHzZUQYJtL/YSrQVxovPRUn88wI2Dq+zlqoxUEEbfMo/fOtMCZ6vFb4ixFvTie+p38K0 N/kv1n6tKYodO9qtpZj+t6/0JZHtmW8gS+RFGwWXhTK0nlStTjfAWP2MxykXsAvF8iKLzVo3d3p9O OvevAQh47S+naBxLeoNf6nLTV3DuDSMDPUpse5P6Knxnfl8Yl4XAgZ10lfwOhLmg5SruYPC9JScFL SggyZKqxcHvAlGYBB7CyGEeSpG8NghQ+ZdqGFtlN+8A43CSAg7AeJtB4yjiAhfkVdutFDoOukPfWM HunmlZIDdZLq7g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:15 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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"))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 47/51] gnu: bootstrap: %bootstrap-glibc: Also fix libm.so. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:00: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959020584 (code B ref 74290); Tue, 19 Nov 2024 07:00:05 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:50 +0000 Received: from localhost ([127.0.0.1]:40659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDG-0005Lq-7t for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICQ-0005CR-AX for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:59 -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 1tDIAF-00046t-2i; Tue, 19 Nov 2024 01:56:43 -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=e3AceFocsajaPJhd3KemYY4Gxg63jbUWxAzZc4texAU=; b=AgUysM2r7HrX7ZXuDkj9 po9yXnGSg7UfjBAZA92Uyd/0NyfIDOt1bLEbaR3IetUyr6SjN4ddbdOcDOn54Y7NeXD1zZd7AZJd9 DNrHpm3fJndcKz/ERiQuSkudz26XQKojDP0wkDglz4hVbU7hTvnaD6MG+jXkgj/FNWd3sTzHvbvb9 WJA8191YZmQMwLjSMWBPdkfOmnjljOBVvMkSt1gjpFLgTMZpC/q5necKIDtDVtuImKMQTD2tkz8aI QdVxrb2zXuqrAnb5KsJeQYhnZb/XIm00T2HELMKDKaBUrfaeYSn3MUvLusv7Vu0oIQZsM6GnyA/Ix Z1Kx6dWlu23pYw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:17 +0100 Message-ID: <2b945a5a46218b04a37eb9d01530e93baf00608d.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On the 64bit Hurd, glibc-2.39's libm.so is also a linker script. This fixes having it refer to /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libm.so.6 /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libmvec.so.1 * gnu/packages/bootstrap.scm (%bootstrap-glibc)[arguments]: When building for the 64bit Hurd, also substitute libm.so linker script. Update the regexp to also cater for libh[urduser] and libm[achuser]. Change-Id: I399d8f3ad9be6b8892955c2cbe59a10093120c77 --- gnu/packages/bootstrap.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 301ee3ca12..f8490ce56c 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -774,12 +774,12 @@ (define %bootstrap-glibc "/binaries.tar")) (chmod "lib" #o755) - ;; Patch libc.so so it refers to the right path. - (substitute* "lib/libc.so" - (("/[^ ]+/lib/(libc|ld)" _ prefix) - (string-append out "/lib/" prefix))) - - #t)))))) + ;; Patch linker scripts so they refer to the right file-names. + (substitute* ,(if (target-hurd64?) + ''("lib/libc.so" "lib/libm.so") + "libc.so") + (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix) + (string-append out "/lib/" prefix))))))))) (inputs `(("tar" ,(bootstrap-executable "tar" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 38/51] 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, 19 Nov 2024 07:00: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: Efraim Flashner , Vagrant Cascadian X-Debbugs-Original-Xcc: Efraim Flashner , Vagrant Cascadian Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959120592 (code B ref 74290); Tue, 19 Nov 2024 07:00:06 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:51 +0000 Received: from localhost ([127.0.0.1]:40661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDG-0005Lx-M3 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICG-0005BU-2L for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDIA4-000449-84; Tue, 19 Nov 2024 01:56: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=C4yEU+wIRa9/I+Q3U2Qm4YrtGc+y+501EWY4LvaXMU4=; b=HnR+ITAUo0mZuADzefyd oR+pZWjgu9kgLRxQmt14tOmhomji/56zXXYvYM83hhRbhDaYdmutn8I2xeOh1PHIs+KaPjbhkMrlF Vhpur143KP0FoQN64cMIyIB3rcFtghmciebIMptTxyue2hs8PuQhra3p/aGdkySKVFP+uv6Rl5vBM 5gxR9ODYEeJmvruaNPpRaqMBAJmE+z8A+YokjsK9QJQxoYoCl4IZVM7tAF1ExTJ4lSTOlK5qgwMcR jt1msqRNCe21l7Jhp1jgORPtIbQp5vDml/U7CSjKyXDrhiOfLK03m59wcGO6cULLH13OUxJQAf0vL gkMHgbfLcBckBQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:08 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 0979414ec2..84966efdb5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1494,6 +1494,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 da5abaca55..61ea74b69a 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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 39/51] 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, 19 Nov 2024 07:00: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.173199959120599 (code B ref 74290); Tue, 19 Nov 2024 07:00:07 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:51 +0000 Received: from localhost ([127.0.0.1]:40663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDH-0005M5-8P for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICI-0005BY-3r for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDIA6-000455-GO; Tue, 19 Nov 2024 01:56: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=aHUyDKreUqrQkJ3AC8RZ9Btm7Jw0IOr/r4RHfhKZ2CM=; b=hONuGCFR5+fERAfa8gK4 w8fa/sNlHC4dFMxXCZG54kvct/UuCjD1150UKaxRHZWlSvZZLFqjCVnPVjh63p35OKbB9OOlp2Oms Gj6SYnDnW+M7U2qg4DlnLyljLeSxJ0itiAuyQbV6GdtK11f/MVIK160IBi23uWDWB7WJfgEM9XD3Y Y0B7tFzdX33EVxG6HmLasRtwsa7Romcj8DhCnUqsH/i8cDGWToqKm6PwhZsxzC/sslu30vkrapdNa ge9bH2nLMdTlR/wC6c6vn3NZAVkfqlQHxZbXWR25uYWjzB+R66M0Dxt6ImnQtmbFwaG0hP564ge2/ Tr3io93vu+GdpQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:09 +0100 Message-ID: <4195526ce5a0ee3819027794156fedf5fea24c8b.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 044a491259..f0f16125d6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -856,7 +856,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 40/51] 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, 19 Nov 2024 07:00: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.173199959220606 (code B ref 74290); Tue, 19 Nov 2024 07:00:07 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:52 +0000 Received: from localhost ([127.0.0.1]:40665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDH-0005MC-JS for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICI-0005BX-3q for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58: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 1tDIA7-00045P-J3; Tue, 19 Nov 2024 01:56: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=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; b=HI+DxWZOk5xUJiTjObU9 X2MNnCKz5MLBm3Sv918MJaaQag3VpF1M5n2PYhInLhKK4M/ptbFsaeOpAvIJqSvk3dVPiViFRjX6F Q0c3X6QyxdlZI9m68fJgSRuHXRzM1gKtYYCg1SHGe6jyMuHmmb/M/X7wpdc2IB9edW6hKHWzNLGW4 y47MrKiyLe19lZkrNtYFzZT5J3GLZgKyIyU0oftk3x3dB6EClXsgY3uSr79Z/uAwWR+Qy+/8c80rs veHLOJgVv5vs4P4RdkyAfuXez7JnTVSPkrSMeu8hhMue3y6UxsX0vCl1txuYGEMHEBG6gL0wPtn1d 7HjDWlYFi7djxQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:10 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 42/51] 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, 19 Nov 2024 07:00: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 , 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.173199959220614 (code B ref 74290); Tue, 19 Nov 2024 07:00:08 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:52 +0000 Received: from localhost ([127.0.0.1]:40667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDH-0005MJ-W7 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICK-0005Bn-5h for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:52 -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 1tDIA9-00045j-9i; Tue, 19 Nov 2024 01:56:37 -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=zJbKGkWlYd1swF4O5NU/WcKrUZufd6Str9cF0iYKHiQ=; b=o+EADaLpBwHHlckHlGX/ 0Q10sMYkZ4a5Xj7KUhVMP5L4X6kihmN2zRsvksqpV5PYMYOeQW70TCckE/FQmxgoO/jt7lUGwCNY7 Y0TSZ0XQxUy3fa5qDzlt7xiDTKC3eAKP9kc2jH/BufqfokKs9x4mTel9wGeTuK1qhqKSxxvlC9H4j ClqhIIwWvzZabNMiuTGdAE/VdRSdvYtuzWguWVzpBuu0DGA8z6QEz9xvX3MoaOIpc3i/fuER0endU Hl8HE3I/yjrHTDK/F9ysfaaG90Ar5cD1jvd670lFzOoBFj+vf8swfsMFqBGC3ufKqTjYTOSQiy492 3mURBldv1u9Oeg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:12 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 2f805b3e63..742ccbc63b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2670,7 +2670,7 @@ (define mig-boot0 (package (inherit mig) (name "mig-boot0") - (version "1.8+git20230520") + (version "1.8+git20231217") (source (origin (inherit (package-source mig)) @@ -2683,7 +2683,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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 46/51] gnu: Add gdb-15.2, with support for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:00: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959420622 (code B ref 74290); Tue, 19 Nov 2024 07:00:08 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:54 +0000 Received: from localhost ([127.0.0.1]:40669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDI-0005MR-CP for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICQ-0005CS-AV for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:00 -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 1tDIAE-00046h-3O; Tue, 19 Nov 2024 01:56:42 -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=B2X/cYXBzZxFn8MgiXaXrrLwEzFkbTtTrfxr/k5ripM=; b=jO4TykgA56yWIs/KeJRP 00dCbOUzHkk/62f09ujExRd3qdXpF9woHY0FB9atKbkA0f0qZCRecuhYWzdpeP74585IhF6oYumpX odHDx9wWms1mdAEVvbTmXWpxZvGTCVsIoL3An5WMBpKIJd9+y+BVG5ybWDexEaMJ+jRNNkglmfBRn SRr+GKJ8epyX4Meuo8CFwjaBtxpwTd5xiDXQsD0R3PghofaSQaOE7AzYOBVwAN7ppn5wMCux2Oj12 RwRlafrJ+RkbdyOnZLKT5n7SKhpTTxBha3XqY5XhFY8ImLzLJDyZV5tySqdoiOyjJn4TfDmkz81IN lCLHRgQZONMXQg==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:16 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/gdb-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gdb.scm (gdb-15): Use it in new variable. (gdb-minmal-15): New variable. (gdb/pinned): When building for the 64bit Hurd, set #:configure-flags to "--enable-targets=i586-pc-gnu,x86_64-pc-gnu". Change-Id: I52d28092be6c415b8668bb5a77d41c87df841351 --- gnu/local.mk | 1 + gnu/packages/gdb.scm | 22 + gnu/packages/patches/gdb-hurd64.patch | 923 ++++++++++++++++++++++++++ 3 files changed, 946 insertions(+) create mode 100644 gnu/packages/patches/gdb-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 84966efdb5..552eefeaeb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1374,6 +1374,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ + %D%/packages/patches/gdb-hurd64.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/gdm-elogind-support.patch \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index bf46716047..af5ebde3f6 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -67,6 +67,9 @@ (define-public gdb/pinned #:out-of-source? #t #:modules `((srfi srfi-1) ,@%default-gnu-modules) + #:configure-flags (if (target-hurd64?) + #~'("--enable-targets=i586-pc-gnu,x86_64-pc-gnu") + #~'()) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) @@ -160,6 +163,19 @@ (define-public gdb-14 "0wkprsjyyh204fdjlkaz20k847l88i9y8m9zqsv15vcd3l3dhk9d")))) (properties '()))) +(define-public gdb-15 + (package + (inherit gdb-14) + (version "15.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" + version ".tar.xz")) + (patches (search-patches "gdb-hurd64.patch")) + (sha256 + (base32 + "0k9i8mizg4hby020k53kqmc835pajh9c8d5klv5s1ddm6p6hqdc3")))))) + (define-public gdb ;; The "default" version. gdb-14) @@ -184,6 +200,12 @@ (define-public gdb-minimal (inputs (fold alist-delete (package-inputs gdb) '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) +(define-public gdb-minimal-15 + (package/inherit gdb-15 + (name "gdb-minimal") + (inputs (fold alist-delete (package-inputs gdb-15) + '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) + (define-public avr-gdb (package/inherit gdb-14 (name "avr-gdb") diff --git a/gnu/packages/patches/gdb-hurd64.patch b/gnu/packages/patches/gdb-hurd64.patch new file mode 100644 index 0000000000..50e44b3684 --- /dev/null +++ b/gnu/packages/patches/gdb-hurd64.patch @@ -0,0 +1,923 @@ +Upstream-status: Taken from bug-hurd + + . + +and gdb-patches + + + +mailing lists. + +From 6131a7a8951bc255d6c013de126c46b620434d2f Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 3 Jul 2024 22:45:33 +0100 +Subject: [PATCH 1/2] Port GDB to Hurd x86_64. + +This port extends the existing i686 port to support x86_64 by trying to +reuse existing code whenever it makes sense. + +* gdb/amd64-gnu-tdep.c: Adds logic for handling signal frames and + position of amd64 registers in the different Hurd structs. + The signal code is very similar to i686, except the trampoline code + is adapted. +* gdb/config/i386/nm-i386gnu.h: renamed to gdb/config/i386/nm-x86-gnu.h + and adapt it for x86_64. +* gdb/config/i386/i386gnu.mn: renamed to gdb/config/i386/nm-x86-gnu.mn + and reuse it for x86_64. +* gdb/configure.host: recognize gnu64 as a host. +* gdb/configure.nat: recognize gnu64 host and update existing i386gnu to + reuse the new shared files. +* gdb/configure.tgt: recognize x86_64-*-gnu* triplet and use + amd64-gnu-tdep.c. +* gdb/i386-gnu-tdep.c: added i386_gnu_thread_state_reg_offset that is + copied from i386-gnu-nat.c. This makes it similar to amd64. +* gdb/i386-gnu-nat.c: rename it to x86-gnu-nat.c since we reuse this for + i386 and amd64. Updated REG_ADDR to use one of the structures. Added + VALID_REGISTER to make sure it's a register we can provide at this time + (not all of them are available in amd64). FLAGS_REGISTER is either rfl + or efl depending on the arch. Renamed functions and class from i386 to x86 + whenever they can be reused. + +Tested on Hurd x86_64 and i686. +--- + gdb/Makefile.in | 4 +- + gdb/amd64-gnu-tdep.c | 231 ++++++++++++++++++ + .../i386/{nm-i386gnu.h => nm-x86-gnu.h} | 7 + + gdb/config/i386/{i386gnu.mn => x86-gnu.mn} | 0 + gdb/configure.host | 1 + + gdb/configure.nat | 27 +- + gdb/configure.tgt | 6 +- + gdb/i386-gnu-tdep.c | 13 +- + gdb/{i386-gnu-nat.c => x86-gnu-nat.c} | 171 +++++++++---- + 9 files changed, 403 insertions(+), 57 deletions(-) + create mode 100644 gdb/amd64-gnu-tdep.c + rename gdb/config/i386/{nm-i386gnu.h => nm-x86-gnu.h} (83%) + rename gdb/config/i386/{i386gnu.mn => x86-gnu.mn} (100%) + rename gdb/{i386-gnu-nat.c => x86-gnu-nat.c} (68%) + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index 84bc54b303e..67a15e2cc68 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -737,6 +737,7 @@ ALL_64_TARGET_OBS = \ + amd64-darwin-tdep.o \ + amd64-dicos-tdep.o \ + amd64-fbsd-tdep.o \ ++ amd64-gnu-tdep.o \ + amd64-linux-tdep.o \ + amd64-netbsd-tdep.o \ + amd64-obsd-tdep.o \ +@@ -1688,6 +1689,7 @@ ALLDEPFILES = \ + amd64-dicos-tdep.c \ + amd64-fbsd-nat.c \ + amd64-fbsd-tdep.c \ ++ amd64-gnu-tdep.c \ + amd64-linux-nat.c \ + amd64-linux-tdep.c \ + amd64-nat.c \ +@@ -1743,7 +1745,6 @@ ALLDEPFILES = \ + i386-dicos-tdep.c \ + i386-fbsd-nat.c \ + i386-fbsd-tdep.c \ +- i386-gnu-nat.c \ + i386-gnu-tdep.c \ + i386-linux-nat.c \ + i386-linux-tdep.c \ +@@ -1872,6 +1873,7 @@ ALLDEPFILES = \ + vax-tdep.c \ + windows-nat.c \ + windows-tdep.c \ ++ x86-gnu-nat.c \ + x86-nat.c \ + x86-tdep.c \ + xcoffread.c \ +diff --git a/gdb/amd64-gnu-tdep.c b/gdb/amd64-gnu-tdep.c +new file mode 100644 +index 00000000000..435095e3359 +--- /dev/null ++++ b/gdb/amd64-gnu-tdep.c +@@ -0,0 +1,231 @@ ++/* Target-dependent code for the GNU Hurd. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ ++ This file is part of GDB. ++ ++ 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 ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#include "defs.h" ++#include "extract-store-integer.h" ++#include "gdbcore.h" ++#include "osabi.h" ++#include "solib-svr4.h" ++ ++#include "amd64-tdep.h" ++#include "glibc-tdep.h" ++ ++/* Recognizing signal handler frames. */ ++ ++/* When the GNU/Hurd libc calls a signal handler, the return address points ++ inside the trampoline assembly snippet. ++ ++ If the trampoline function name can not be identified, we resort to reading ++ memory from the process in order to identify it. */ ++ ++static const gdb_byte gnu_sigtramp_code[] = ++{ ++/* rpc_wait_trampoline: */ ++ 0x48, 0xc7, 0xc0, 0xe7, 0xff, 0xff, 0xff, /* mov $-25,%rax */ ++ 0x0f, 0x05, /* syscall */ ++ 0x49, 0x89, 0x04, 0x24, /* mov %rax,(%r12) */ ++ 0x48, 0x89, 0xdc, /* mov %rbx,%rsp */ ++ ++/* trampoline: */ ++ 0x5f, /* pop %rdi */ ++ 0x5e, /* pop %rsi */ ++ 0x5a, /* pop %rdx */ ++ 0x48, 0x83, 0xc4, 0x08, /* add $0x8,%rsp */ ++ 0x41, 0xff, 0xd5, /* call *%r13 */ ++ ++/* RA HERE */ ++ 0x48, 0x8b, 0x7c, 0x24, 0x10, /* mov 0x10(%rsp),%rdi */ ++ 0xc3, /* ret */ ++ ++/* firewall: */ ++ 0xf4, /* hlt */ ++}; ++ ++#define GNU_SIGTRAMP_LEN (sizeof gnu_sigtramp_code) ++#define GNU_SIGTRAMP_TAIL 7 /* length of tail after RA */ ++ ++/* If THIS_FRAME is a sigtramp routine, return the address of the ++ start of the routine. Otherwise, return 0. */ ++ ++static CORE_ADDR ++amd64_gnu_sigtramp_start (frame_info_ptr this_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (this_frame); ++ gdb_byte buf[GNU_SIGTRAMP_LEN]; ++ ++ if (!safe_frame_unwind_memory (this_frame, ++ pc + GNU_SIGTRAMP_TAIL - GNU_SIGTRAMP_LEN, ++ buf)) ++ return 0; ++ ++ if (memcmp (buf, gnu_sigtramp_code, GNU_SIGTRAMP_LEN) != 0) ++ return 0; ++ ++ return pc; ++} ++ ++/* Return whether THIS_FRAME corresponds to a Hurd sigtramp routine. */ ++ ++static int ++amd64_gnu_sigtramp_p (const frame_info_ptr &this_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (this_frame); ++ const char *name; ++ ++ find_pc_partial_function (pc, &name, NULL, NULL); ++ ++ /* If we have a NAME, we can check for the trampoline function */ ++ if (name != NULL && strcmp (name, "trampoline") == 0) ++ return 1; ++ ++ return amd64_gnu_sigtramp_start (this_frame) != 0; ++} ++ ++/* Offset to sc_i386_thread_state in sigcontext, from . */ ++#define AMD64_GNU_SIGCONTEXT_THREAD_STATE_OFFSET 32 ++ ++/* Assuming THIS_FRAME is a Hurd sigtramp routine, return the ++ address of the associated sigcontext structure. */ ++ ++static CORE_ADDR ++amd64_gnu_sigcontext_addr (const frame_info_ptr &this_frame) ++{ ++ struct gdbarch *gdbarch = get_frame_arch (this_frame); ++ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); ++ CORE_ADDR pc; ++ CORE_ADDR sp; ++ gdb_byte buf[8]; ++ ++ get_frame_register (this_frame, AMD64_RSP_REGNUM, buf); ++ sp = extract_unsigned_integer (buf, 8, byte_order); ++ ++ pc = amd64_gnu_sigtramp_start (this_frame); ++ if (pc) ++ { ++ CORE_ADDR sigcontext_addr; ++ ++ /* The sigcontext structure address is passed as the third argument ++ * of the signal handler but %RDX is not saved across calls. Luckily, ++ * the structured is saved underneath the &__sigreturn and a dummy word ++ * to fill the slot for the address for __sigreturn to return to. ++ */ ++ read_memory (sp + 16, buf, 8); ++ sigcontext_addr = extract_unsigned_integer (buf, 8, byte_order); ++ return sigcontext_addr + AMD64_GNU_SIGCONTEXT_THREAD_STATE_OFFSET; ++ } ++ ++ error (_("Couldn't recognize signal trampoline.")); ++ return 0; ++} ++ ++/* Mapping between the general-purpose registers in `struct ++ sigcontext' format (starting at sc_i386_thread_state) ++ and GDB's register cache layout. */ ++ ++/* From . */ ++static int amd64_gnu_sc_reg_offset[] = ++{ ++ 15 * 8, /* %rax */ ++ 12 * 8, /* %rbx */ ++ 14 * 8, /* %rcx */ ++ 13 * 8, /* %rdx */ ++ 10 * 8, /* %rsi */ ++ 9 * 8, /* %rdi */ ++ 10 * 8, /* %rbp */ ++ 11 * 8, /* %rsp */ ++ 0 * 8, /* %r8 ... */ ++ 8 * 8, ++ 7 * 8, ++ 6 * 8, ++ 3 * 8, ++ 2 * 8, ++ 1 * 8, ++ 0 * 8, /* ... %r15 */ ++ 16 * 8, /* %rip */ ++ 18 * 8, /* %eflags */ ++ 17 * 8, /* %cs */ ++}; ++ ++/* From . */ ++static int amd64_gnu_gregset_reg_offset[] = ++{ ++ 10 * 8, /* %rax */ ++ 5 * 8, /* %rbx */ ++ 11 * 8, /* %rcx */ ++ 12 * 8, /* %rdx */ ++ 13 * 8, /* %rsi */ ++ 14 * 8, /* %rdi */ ++ 4 * 8, /* %rbp */ ++ 19 * 8, /* %rsp */ ++ 9 * 8, /* %r8 ... */ ++ 8 * 8, ++ 7 * 8, ++ 6 * 8, ++ 3 * 8, ++ 2 * 8, ++ 1 * 8, ++ 0 * 8, /* ... %r15 */ ++ 16 * 8, /* %rip */ ++ 18 * 8, /* %eflags */ ++ 17 * 8, /* %cs */ ++ -1, /* %ss */ ++ -1, /* %ds */ ++ -1, /* %es */ ++ -1, /* %fs */ ++ -1, /* %gs */ ++}; ++ ++static void ++amd64_gnu_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) ++{ ++ i386_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); ++ ++ amd64_init_abi (info, gdbarch, ++ amd64_target_description (X86_XSTATE_SSE_MASK, true)); ++ ++ /* Enable TLS support. */ ++ set_gdbarch_fetch_tls_load_module_address (gdbarch, ++ svr4_fetch_objfile_link_map); ++ ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); ++ ++ /* Hurd uses the dynamic linker included in the GNU C Library. */ ++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver); ++ ++ tdep->gregset_reg_offset = amd64_gnu_gregset_reg_offset; ++ tdep->gregset_num_regs = ARRAY_SIZE (amd64_gnu_gregset_reg_offset); ++ tdep->sizeof_gregset = 21 * 8; /* sizeof (struct i386_thread_state); */ ++ ++ tdep->sigtramp_p = amd64_gnu_sigtramp_p; ++ tdep->sigcontext_addr = amd64_gnu_sigcontext_addr; ++ tdep->sc_reg_offset = amd64_gnu_sc_reg_offset; ++ tdep->sc_num_regs = ARRAY_SIZE (amd64_gnu_sc_reg_offset); ++ ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_solib_svr4_fetch_link_map_offsets ++ (gdbarch, svr4_lp64_fetch_link_map_offsets); ++} ++ ++void _initialize_amd64_gnu_tdep (); ++void ++_initialize_amd64_gnu_tdep () ++{ ++ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, ++ GDB_OSABI_HURD, amd64_gnu_init_abi); ++} +diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-x86-gnu.h +similarity index 83% +rename from gdb/config/i386/nm-i386gnu.h +rename to gdb/config/i386/nm-x86-gnu.h +index d2d5de83948..ed4d1729227 100644 +--- a/gdb/config/i386/nm-i386gnu.h ++++ b/gdb/config/i386/nm-x86-gnu.h +@@ -22,9 +22,16 @@ + /* Thread flavors used in re-setting the T bit. */ + #define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE + #define THREAD_STATE_SIZE i386_THREAD_STATE_COUNT ++#ifdef __x86_64__ ++#define THREAD_STATE_SET_TRACED(state) \ ++ ((struct i386_thread_state *) (state))->rfl |= 0x100 ++#define THREAD_STATE_CLEAR_TRACED(state) \ ++ ((((struct i386_thread_state *) (state))->rfl &= ~0x100), 1) ++#else + #define THREAD_STATE_SET_TRACED(state) \ + ((struct i386_thread_state *) (state))->efl |= 0x100 + #define THREAD_STATE_CLEAR_TRACED(state) \ + ((((struct i386_thread_state *) (state))->efl &= ~0x100), 1) ++#endif /* __x86_64__ */ + + #endif /* CONFIG_I386_NM_I386GNU_H */ +diff --git a/gdb/config/i386/i386gnu.mn b/gdb/config/i386/x86-gnu.mn +similarity index 100% +rename from gdb/config/i386/i386gnu.mn +rename to gdb/config/i386/x86-gnu.mn +diff --git a/gdb/configure.host b/gdb/configure.host +index da71675b201..999af8e59ae 100644 +--- a/gdb/configure.host ++++ b/gdb/configure.host +@@ -184,6 +184,7 @@ x86_64-*-mingw*) gdb_host=mingw64 + gdb_host_obs=mingw-hdep.o + ;; + x86_64-*-cygwin*) gdb_host=cygwin64 ;; ++x86_64-*-gnu*) gdb_host=gnu64 ;; + m32r*-*-linux*) gdb_host=linux ;; + + xtensa*-*-linux*) gdb_host=linux ;; +diff --git a/gdb/configure.nat b/gdb/configure.nat +index 8b98511cef7..00402f888a9 100644 +--- a/gdb/configure.nat ++++ b/gdb/configure.nat +@@ -211,23 +211,44 @@ case ${gdb_host} in + ;; + esac + ;; ++ gnu64) ++ case ${gdb_host_cpu} in ++ i386) ++ # Host: x86_64 running the GNU Hurd ++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \ ++ x86-nat.o nat/x86-dregs.o \ ++ amd64-nat.o fork-child.o \ ++ nat/fork-inferior.o \ ++ notify_S.o process_reply_S.o msg_reply_S.o \ ++ msg_U.o exc_request_U.o exc_request_S.o' ++ HAVE_NATIVE_GCORE_HOST=1 ++ ++ NAT_FILE='nm-x86-gnu.h' ++ MH_CFLAGS='-D_GNU_SOURCE' ++ ++ XM_CLIBS='-lshouldbeinlibc' ++ ++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn" ++ ;; ++ esac ++ ;; + i386gnu) + case ${gdb_host_cpu} in + i386) + # Host: Intel 386 running the GNU Hurd +- NATDEPFILES='i386-gnu-nat.o gnu-nat.o \ ++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \ + x86-nat.o nat/x86-dregs.o fork-child.o \ + nat/fork-inferior.o \ + notify_S.o process_reply_S.o msg_reply_S.o \ + msg_U.o exc_request_U.o exc_request_S.o' + HAVE_NATIVE_GCORE_HOST=1 + +- NAT_FILE='nm-i386gnu.h' ++ NAT_FILE='nm-x86-gnu.h' + MH_CFLAGS='-D_GNU_SOURCE' + + XM_CLIBS='-lshouldbeinlibc' + +- nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn" ++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn" + ;; + esac + ;; +diff --git a/gdb/configure.tgt b/gdb/configure.tgt +index 47a674201f9..df9e9917ad1 100644 +--- a/gdb/configure.tgt ++++ b/gdb/configure.tgt +@@ -328,7 +328,7 @@ i[34567]86-*-linux*) + ;; + i[34567]86-*-gnu*) + # Target: Intel 386 running the GNU Hurd +- gdb_target_obs="i386-gnu-tdep.o solib-svr4.o" ++ gdb_target_obs="i386-gnu-tdep.o glibc-tdep.o solib-svr4.o" + ;; + i[34567]86-*-cygwin*) + # Target: Intel 386 running win32 +@@ -744,6 +744,10 @@ x86_64-*-openbsd*) + x86_64-*-rtems*) + gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o" + ;; ++x86_64-*-gnu*) ++ # Target: x86_64 running the GNU Hurd ++ gdb_target_obs="amd64-gnu-tdep.o glibc-tdep.o solib-svr4.o" ++ ;; + xtensa*-*-*linux*) + # Target: GNU/Linux Xtensa + gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o" +diff --git a/gdb/i386-gnu-tdep.c b/gdb/i386-gnu-tdep.c +index 98e11518a91..5ffc1388ec0 100644 +--- a/gdb/i386-gnu-tdep.c ++++ b/gdb/i386-gnu-tdep.c +@@ -21,6 +21,7 @@ + #include "osabi.h" + #include "solib-svr4.h" + ++#include "glibc-tdep.h" + #include "i386-tdep.h" + + /* Recognizing signal handler frames. */ +@@ -72,8 +73,7 @@ i386_gnu_sigtramp_start (const frame_info_ptr &this_frame) + return pc; + } + +-/* Return whether THIS_FRAME corresponds to a GNU/Linux sigtramp +- routine. */ ++/* Return whether THIS_FRAME corresponds to a Hurd sigtramp routine. */ + + static int + i386_gnu_sigtramp_p (const frame_info_ptr &this_frame) +@@ -178,9 +178,18 @@ i386gnu_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) + /* GNU uses ELF. */ + i386_elf_init_abi (info, gdbarch); + ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_ilp32_fetch_link_map_offsets); + ++ /* Hurd uses the dynamic linker included in the GNU C Library. */ ++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver); ++ ++ /* Enable TLS support. */ ++ set_gdbarch_fetch_tls_load_module_address (gdbarch, ++ svr4_fetch_objfile_link_map); ++ + tdep->gregset_reg_offset = i386gnu_gregset_reg_offset; + tdep->gregset_num_regs = ARRAY_SIZE (i386gnu_gregset_reg_offset); + tdep->sizeof_gregset = 19 * 4; +diff --git a/gdb/i386-gnu-nat.c b/gdb/x86-gnu-nat.c +similarity index 68% +rename from gdb/i386-gnu-nat.c +rename to gdb/x86-gnu-nat.c +index 52d4a4b7cec..da3b7e923dd 100644 +--- a/gdb/i386-gnu-nat.c ++++ b/gdb/x86-gnu-nat.c +@@ -34,7 +34,13 @@ extern "C" + #include "floatformat.h" + #include "regcache.h" + ++ ++#ifdef __x86_64__ ++#include "amd64-tdep.h" ++#include "amd64-nat.h" ++#else + #include "i386-tdep.h" ++#endif + + #include "inf-child.h" + #include "i387-tdep.h" +@@ -42,21 +48,82 @@ extern "C" + /* Offset to the thread_state_t location where REG is stored. */ + #define REG_OFFSET(reg) offsetof (struct i386_thread_state, reg) + ++#ifdef __x86_64__ ++ + /* At REG_OFFSET[N] is the offset to the thread_state_t location where + the GDB register N is stored. */ +-static int reg_offset[] = ++static int amd64_gnu_thread_state_reg_offset[] = + { +- REG_OFFSET (eax), REG_OFFSET (ecx), REG_OFFSET (edx), REG_OFFSET (ebx), +- REG_OFFSET (uesp), REG_OFFSET (ebp), REG_OFFSET (esi), REG_OFFSET (edi), +- REG_OFFSET (eip), REG_OFFSET (efl), REG_OFFSET (cs), REG_OFFSET (ss), +- REG_OFFSET (ds), REG_OFFSET (es), REG_OFFSET (fs), REG_OFFSET (gs) ++ REG_OFFSET (rax), /* %rax */ ++ REG_OFFSET (rbx), /* %rbx */ ++ REG_OFFSET (rcx), /* %rcx */ ++ REG_OFFSET (rdx), /* %rdx */ ++ REG_OFFSET (rsi), /* %rsi */ ++ REG_OFFSET (rdi), /* %rdi */ ++ REG_OFFSET (rbp), /* %rbp */ ++ REG_OFFSET (ursp), /* %rsp */ ++ REG_OFFSET (r8), /* %r8 ... */ ++ REG_OFFSET (r9), ++ REG_OFFSET (r10), ++ REG_OFFSET (r11), ++ REG_OFFSET (r12), ++ REG_OFFSET (r13), ++ REG_OFFSET (r14), ++ REG_OFFSET (r15), /* ... %r15 */ ++ REG_OFFSET (rip), /* %rip */ ++ REG_OFFSET (rfl), /* %rflags */ ++ REG_OFFSET (cs) /* %cs */ + }; + +-#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum]) ++static const int amd64_gnu_thread_state_num_regs = ++ ARRAY_SIZE (amd64_gnu_thread_state_reg_offset); ++ ++#define REG_ADDR(state, regnum) \ ++ ((char *)(state) + amd64_gnu_thread_state_reg_offset[regnum]) ++#define VALID_REGISTER(regnum) \ ++ ((regnum) >= 0 && (regnum) < amd64_gnu_thread_state_num_regs) ++#define NUM_GREGS amd64_gnu_thread_state_num_regs ++#define FLAGS_REGISTER rfl ++ ++#else ++ ++/* At REG_OFFSET[N] is the offset to the thread_state_t location where ++ the GDB register N is stored. */ ++static int i386_gnu_thread_state_reg_offset[] = ++{ ++ REG_OFFSET (eax), /* %eax */ ++ REG_OFFSET (ecx), /* %ecx */ ++ REG_OFFSET (edx), /* %edx */ ++ REG_OFFSET (ebx), /* %ebx */ ++ REG_OFFSET (uesp), /* %esp */ ++ REG_OFFSET (ebp), /* %ebp */ ++ REG_OFFSET (esi), /* %esi */ ++ REG_OFFSET (edi), /* %edi */ ++ REG_OFFSET (eip), /* %eip */ ++ REG_OFFSET (efl), /* %efl */ ++ REG_OFFSET (cs), /* %cs */ ++ REG_OFFSET (ss), /* %ss */ ++ REG_OFFSET (ds), /* %ds */ ++ REG_OFFSET (es), /* %es */ ++ REG_OFFSET (fs), /* %fs */ ++ REG_OFFSET (gs) /* gs */ ++}; ++ ++static const int i386_gnu_thread_state_num_regs = ++ ARRAY_SIZE (i386_gnu_thread_state_reg_offset); ++ ++#define REG_ADDR(state, regnum) \ ++ ((char *)(state) + i386_gnu_thread_state_reg_offset[regnum]) ++#define VALID_REGISTER(regnum) \ ++ ((regnum) >= 0 && (regnum) < i386_gnu_thread_state_num_regs) ++#define NUM_GREGS i386_gnu_thread_state_num_regs ++#define FLAGS_REGISTER efl ++ ++#endif /* __x86_64__ */ + + + +-/* The i386 GNU Hurd target. */ ++/* The x86 GNU Hurd target. */ + + #ifdef i386_DEBUG_STATE + using gnu_base_target = x86_nat_target; +@@ -64,13 +131,13 @@ using gnu_base_target = x86_nat_target; + using gnu_base_target = gnu_nat_target; + #endif + +-struct i386_gnu_nat_target final : public gnu_base_target ++struct x86_gnu_nat_target final : public gnu_base_target + { + void fetch_registers (struct regcache *, int) override; + void store_registers (struct regcache *, int) override; + }; + +-static i386_gnu_nat_target the_i386_gnu_nat_target; ++static x86_gnu_nat_target the_x86_gnu_nat_target; + + /* Get the whole floating-point state of THREAD and record the values + of the corresponding (pseudo) registers. */ +@@ -105,7 +172,7 @@ fetch_fpregs (struct regcache *regcache, struct proc *thread) + + /* Fetch register REGNO, or all regs if REGNO is -1. */ + void +-i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) ++x86_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + { + struct proc *thread; + ptid_t ptid = regcache->ptid (); +@@ -118,7 +185,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + error (_("Can't fetch registers from thread %s: No such thread"), + target_pid_to_str (ptid).c_str ()); + +- if (regno < I386_NUM_GREGS || regno == -1) ++ if (VALID_REGISTER (regno) || regno == -1) + { + thread_state_t state; + +@@ -137,7 +204,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + + proc_debug (thread, "fetching all register"); + +- for (i = 0; i < I386_NUM_GREGS; i++) ++ for (i = 0; i < NUM_GREGS; i++) + regcache->raw_supply (i, REG_ADDR (state, i)); + thread->fetched_regs = ~0; + } +@@ -152,7 +219,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + } + } + +- if (regno >= I386_NUM_GREGS || regno == -1) ++ if (!VALID_REGISTER(regno) || regno == -1) + { + proc_debug (thread, "fetching floating-point registers"); + +@@ -195,7 +262,7 @@ store_fpregs (const struct regcache *regcache, struct proc *thread, int regno) + + /* Store at least register REGNO, or all regs if REGNO == -1. */ + void +-i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) ++x86_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + { + struct proc *thread; + struct gdbarch *gdbarch = regcache->arch (); +@@ -209,7 +276,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + error (_("Couldn't store registers into thread %s: No such thread"), + target_pid_to_str (ptid).c_str ()); + +- if (regno < I386_NUM_GREGS || regno == -1) ++ if (VALID_REGISTER (regno) || regno == -1) + { + thread_state_t state; + thread_state_data_t old_state; +@@ -230,14 +297,14 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + + /* Save the T bit. We might try to restore the %eflags register + below, but changing the T bit would seriously confuse GDB. */ +- trace = ((struct i386_thread_state *)state)->efl & 0x100; ++ trace = ((struct i386_thread_state *)state)->FLAGS_REGISTER & 0x100; + + if (!was_aborted && was_valid) + /* See which registers have changed after aborting the thread. */ + { + int check_regno; + +- for (check_regno = 0; check_regno < I386_NUM_GREGS; check_regno++) ++ for (check_regno = 0; check_regno < NUM_GREGS; check_regno++) + if ((thread->fetched_regs & (1 << check_regno)) + && memcpy (REG_ADDR (&old_state, check_regno), + REG_ADDR (state, check_regno), +@@ -262,7 +329,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + + proc_debug (thread, "storing all registers"); + +- for (i = 0; i < I386_NUM_GREGS; i++) ++ for (i = 0; i < NUM_GREGS; i++) + if (REG_VALID == regcache->get_register_status (i)) + regcache->raw_collect (i, REG_ADDR (state, i)); + } +@@ -276,11 +343,11 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + } + + /* Restore the T bit. */ +- ((struct i386_thread_state *)state)->efl &= ~0x100; +- ((struct i386_thread_state *)state)->efl |= trace; ++ ((struct i386_thread_state *)state)->FLAGS_REGISTER &= ~0x100; ++ ((struct i386_thread_state *)state)->FLAGS_REGISTER |= trace; + } + +- if (regno >= I386_NUM_GREGS || regno == -1) ++ if (!VALID_REGISTER (regno) || regno == -1) + { + proc_debug (thread, "storing floating-point registers"); + +@@ -295,7 +362,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + /* Get debug registers for thread THREAD. */ + + static void +-i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) ++x86_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) + { + mach_msg_type_number_t count = i386_DEBUG_STATE_COUNT; + kern_return_t err; +@@ -310,7 +377,7 @@ i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) + /* Set debug registers for thread THREAD. */ + + static void +-i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) ++x86_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) + { + kern_return_t err; + +@@ -324,23 +391,23 @@ i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) + /* Set DR_CONTROL in THREAD. */ + + static void +-i386_gnu_dr_set_control_one (struct proc *thread, void *arg) ++x86_gnu_dr_set_control_one (struct proc *thread, void *arg) + { + unsigned long *control = (unsigned long *) arg; + struct i386_debug_state regs; + +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + regs.dr[DR_CONTROL] = *control; +- i386_gnu_dr_set (®s, thread); ++ x86_gnu_dr_set (®s, thread); + } + + /* Set DR_CONTROL to CONTROL in all threads. */ + + static void +-i386_gnu_dr_set_control (unsigned long control) ++x86_gnu_dr_set_control (unsigned long control) + { + inf_update_procs (gnu_current_inf); +- inf_threads (gnu_current_inf, i386_gnu_dr_set_control_one, &control); ++ inf_threads (gnu_current_inf, x86_gnu_dr_set_control_one, &control); + } + + /* Parameters to set a debugging address. */ +@@ -354,20 +421,20 @@ struct reg_addr + /* Set address REGNUM (zero based) to ADDR in THREAD. */ + + static void +-i386_gnu_dr_set_addr_one (struct proc *thread, void *arg) ++x86_gnu_dr_set_addr_one (struct proc *thread, void *arg) + { + struct reg_addr *reg_addr = (struct reg_addr *) arg; + struct i386_debug_state regs; + +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + regs.dr[reg_addr->regnum] = reg_addr->addr; +- i386_gnu_dr_set (®s, thread); ++ x86_gnu_dr_set (®s, thread); + } + + /* Set address REGNUM (zero based) to ADDR in all threads. */ + + static void +-i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr) ++x86_gnu_dr_set_addr (int regnum, CORE_ADDR addr) + { + struct reg_addr reg_addr; + +@@ -377,13 +444,13 @@ i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr) + reg_addr.addr = addr; + + inf_update_procs (gnu_current_inf); +- inf_threads (gnu_current_inf, i386_gnu_dr_set_addr_one, ®_addr); ++ inf_threads (gnu_current_inf, x86_gnu_dr_set_addr_one, ®_addr); + } + + /* Get debug register REGNUM value from only the one LWP of PTID. */ + + static unsigned long +-i386_gnu_dr_get_reg (ptid_t ptid, int regnum) ++x86_gnu_dr_get_reg (ptid_t ptid, int regnum) + { + struct i386_debug_state regs; + struct proc *thread; +@@ -392,7 +459,7 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum) + inf_update_procs (gnu_current_inf); + + thread = inf_tid_to_thread (gnu_current_inf, ptid.lwp ()); +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + + return regs.dr[regnum]; + } +@@ -400,46 +467,50 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum) + /* Return the inferior's debug register REGNUM. */ + + static CORE_ADDR +-i386_gnu_dr_get_addr (int regnum) ++x86_gnu_dr_get_addr (int regnum) + { + gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); + +- return i386_gnu_dr_get_reg (inferior_ptid, regnum); ++ return x86_gnu_dr_get_reg (inferior_ptid, regnum); + } + + /* Get DR_STATUS from only the one thread of INFERIOR_PTID. */ + + static unsigned long +-i386_gnu_dr_get_status (void) ++x86_gnu_dr_get_status (void) + { +- return i386_gnu_dr_get_reg (inferior_ptid, DR_STATUS); ++ return x86_gnu_dr_get_reg (inferior_ptid, DR_STATUS); + } + + /* Return the inferior's DR7 debug control register. */ + + static unsigned long +-i386_gnu_dr_get_control (void) ++x86_gnu_dr_get_control (void) + { +- return i386_gnu_dr_get_reg (inferior_ptid, DR_CONTROL); ++ return x86_gnu_dr_get_reg (inferior_ptid, DR_CONTROL); + } + #endif /* i386_DEBUG_STATE */ + +-void _initialize_i386gnu_nat (); ++void _initialize_x86_gnu_nat (); + void +-_initialize_i386gnu_nat () ++_initialize_x86_gnu_nat () + { + #ifdef i386_DEBUG_STATE +- x86_dr_low.set_control = i386_gnu_dr_set_control; ++ x86_dr_low.set_control = x86_gnu_dr_set_control; + gdb_assert (DR_FIRSTADDR == 0 && DR_LASTADDR < i386_DEBUG_STATE_COUNT); +- x86_dr_low.set_addr = i386_gnu_dr_set_addr; +- x86_dr_low.get_addr = i386_gnu_dr_get_addr; +- x86_dr_low.get_status = i386_gnu_dr_get_status; +- x86_dr_low.get_control = i386_gnu_dr_get_control; ++ x86_dr_low.set_addr = x86_gnu_dr_set_addr; ++ x86_dr_low.get_addr = x86_gnu_dr_get_addr; ++ x86_dr_low.get_status = x86_gnu_dr_get_status; ++ x86_dr_low.get_control = x86_gnu_dr_get_control; ++#ifdef __x86_64__ ++ x86_set_debug_register_length (8); ++#else + x86_set_debug_register_length (4); ++#endif + #endif /* i386_DEBUG_STATE */ + +- gnu_target = &the_i386_gnu_nat_target; ++ gnu_target = &the_x86_gnu_nat_target; + + /* Register the target. */ +- add_inf_child_target (&the_i386_gnu_nat_target); ++ add_inf_child_target (&the_x86_gnu_nat_target); + } +-- +2.46.0 + +From 7cfe6f639e601d6cca567342360ecbd3cdca128c Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 3 Jul 2024 23:05:06 +0100 +Subject: [PATCH 2/2] Hurd: do not include defs.h when compiling MiG stubs + since they are compiled as C files + +Otherwise, GDB will fail to compile for Hurd. +--- + gdb/Makefile.in | 3 ++- + gdb/config/i386/x86-gnu.mn | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index 67a15e2cc68..d847a8bad72 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -603,11 +603,12 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) + # your system doesn't have fcntl.h in /usr/include (which is where it + # should be according to Posix). + DEFS = @DEFS@ ++GDB_INCLUDED_HEADER = -include $(srcdir)/defs.h + GDB_CFLAGS = \ + -I. \ + -I$(srcdir) \ + -I$(srcdir)/config \ +- -include $(srcdir)/defs.h \ ++ $(GDB_INCLUDED_HEADER) \ + -DLOCALEDIR="\"$(localedir)\"" \ + $(DEFS) + +diff --git a/gdb/config/i386/x86-gnu.mn b/gdb/config/i386/x86-gnu.mn +index b7414e3bcb4..24c58b02e98 100644 +--- a/gdb/config/i386/x86-gnu.mn ++++ b/gdb/config/i386/x86-gnu.mn +@@ -21,7 +21,9 @@ MIGCOM = $(MIG) -cc cat - /dev/null + | $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h + + # MIG stubs are not yet ready for C++ compilation. +-%_S.o %_U.o : COMPILE.post += -x c -include gnu-nat-mig.h ++%_S.o %_U.o : COMPILE.post += -x c ++# Do not include defs.h since it requires C++. Rather include our own gnu-nat-mig.h ++%_S.o %_U.o : GDB_INCLUDED_HEADER = -include gnu-nat-mig.h + + NAT_GENERATED_FILES = notify_S.h notify_S.c \ + process_reply_S.h process_reply_S.c \ +-- +2.46.0 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 48/51] gnu: findutils: Disable tests on 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, 19 Nov 2024 07:00: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959520629 (code B ref 74290); Tue, 19 Nov 2024 07:00:09 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:55 +0000 Received: from localhost ([127.0.0.1]:40671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDK-0005MZ-Eh for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICS-0005Cf-Bb for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:00 -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 1tDIAG-00047C-EJ; Tue, 19 Nov 2024 01:56:44 -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=ezW0rERuk6ldu7lsHdMjsI/DcJ64a6PRWpi+zqGnKoY=; b=Lo180jJz8OY2huU3dNoM N7N/l20IXu0U7oQ2oAUhRHJLywaPtmtZEJKbJGAaaY0JPmeXDZn5HexFVnpt8v9bFH+CCEfD68MWl RB1oq4W651NU1MJXlP9+jiHItqpj6TLggwb93RkALzmm0YmjLHCNL0CYU8C1QD0HBgnnn+gsJ3t5y Fb6JQtm3rxLBjQHzwpQTqMi/ukF95TyyK9QiA3HlJvP2IyWVwPXcyeb75flcor6rX2PxtleAm2vrX uM04r+ipjTbYz1WJUpeRV3B+PuHIybwPFo/+0z+18Cz5sj3VS+UIc8nGC7ijhAd0DmM44g7hECS6R wo1TAN+6z5Uhrw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:18 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/base.scm (findutils)[arguments]: When building on the 64bit Hurd, set #:tests? #f. Change-Id: I63b84cc1a45de7e9ce1aa2c3e812ffc845e1db19 --- gnu/packages/base.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index bab1f258c6..692721acc6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -425,7 +425,9 @@ (define-public findutils (patches (search-patches "findutils-localstatedir.patch")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list + `(#:tests? ,(and (not (%current-target-system)) + (not (system-hurd64?))) + #:configure-flags (list ;; Tell 'updatedb' to write to /var. "--localstatedir=/var") #:phases (modify-phases %standard-phases -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 50/51] system: examples: Add devel-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:00: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.173199959520637 (code B ref 74290); Tue, 19 Nov 2024 07:00:09 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:55 +0000 Received: from localhost ([127.0.0.1]:40673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDK-0005Ml-Ul for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICU-0005Co-DE for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:59: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 1tDIAJ-00047t-EZ; Tue, 19 Nov 2024 01:56:47 -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=7gbNsATbjXb2kpk7BHDgk2nAhT3t7Z4uLWUboY9VNLs=; b=RfgdwJgvGeg0rQm/wQUY faVz8/LuY3kzwoy8TB1aqirMnkJOgY38mTf1DRxbk1eUxrwus5LjJ0vTza2vn26tf473jBFWjO9yJ vrtNwdeBH1cUP2mKZnigvQMZpDK1DUsTwX3cZe2w0x+povmTWfEAzp9NCw6kx5fqj5dxt7zy/qGn8 6zjWn1cEhqdKpNDQFjS1V6aBUzTVL/9UFK61Q1y7QB6uHrqrNz9aBKhxXhUK41AWBeCVUGpHW3SZj 4UEg5W41uHIRt5jKa+c/IgsUYcXnOVLo32L0qhl+CdEKe3TqMXYCrrnmK1XIi2+LZxfCHXTcKYinM geKP3DpIzfey1g==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:20 +0100 Message-ID: <2555c1df98288dd6e4e391eb179f6649c9cdf53d.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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..146a35adcf --- /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-15 + git-minimal + gnu-make + m4 + openssh-sans-x + (append + guix-packages + hurd-packages + %base-packages/hurd))))) + +%hurd64-devel-os -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 49/51] system: examples: Add bare-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:00: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959620646 (code B ref 74290); Tue, 19 Nov 2024 07:00:10 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:56 +0000 Received: from localhost ([127.0.0.1]:40675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDL-0005Mo-Hy for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICU-0005Cn-DG for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:04 -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 1tDIAI-00047Y-32; Tue, 19 Nov 2024 01:56: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=9JPDnrOqlmB6em+KLsZAHXaG8wxrH5HaNjiSGZjLXG4=; b=oNAmV9GAPRGU31zfGj/G bh2HdkJnuAq5ZglJLwPTbMBMd4G6moqpdt5wjJBZ7G5WIe52dPK7OX2p6oUFOY5xnEBWMhvoRLZe0 2ibQUkApTNkZqD4iK5ugVg85xsiGuXdzUD8gz6Z6DOsAIxwTSjJViDO9PaEULCTgsFK3e1PLN4vEY ddbGFdEAdisGcuHBcmykfXKKyTBreRh+4VJUDUuWGBbD6rLDDZdmmqn3oxrdMIsyIAYm64Nq9+FfO x9ImRwrVO1OhL5P3dBTYTg3ssec4F47k9Ed1cp6Q2F2ZNIb0qeTIq+89AlenF/ABbhIr75GDak6GG 8136QYFJbHogaw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:19 +0100 Message-ID: <4d02e4ec4161b1a85150e942f2d8ee260b3961da.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 51/51] gnu: Use gcc-14, gcc-toolchain-14 on the 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, 19 Nov 2024 07:00: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 , 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.173199959620652 (code B ref 74290); Tue, 19 Nov 2024 07:00:10 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:56 +0000 Received: from localhost ([127.0.0.1]:40677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDM-0005Mx-2g for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICW-0005Cw-Eq for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:05 -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 1tDIAK-000489-JB; Tue, 19 Nov 2024 01:56:48 -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=n2zeQ74bZT117koaVVOAAoirQd37l0W78U9EgvDYWH0=; b=psti/Yd5zlzla4hhXRYJ 6XPZjWDx0uK4GJhzA4p0n18AsTaFHo9gsehASwADRE+5kAw7FiHxQjTS0Ym2arWV9g/l6+s8Q+x+8 pnHXl0E2x9RkuklgVawpGQFZXLYTGosDORd62B4OydofkG9xPJ+B9UVbnBYrvsGTW1AadGM3zM+FW YBGnXPS6jnzXnJSoeFcDjjM6xDgdtx/leKmrq1cYQ9iJ2qJXpd6k3a8ZPBLvGjMbksr1tBAyq1lBW Cd33YrBOJhg/UEPNxRGTuZq0AqFdxk5+utbtNLqQWKsCESKrk6IFUsah7tNpqYlPzcV3QVo/xv7AP Wa9g6Dft4VBWCw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:21 +0100 Message-ID: <97d520ff961ad1712437b48861d6cdee4519c809.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This enables building packages in a 64bit childhurd. It will not enable offloading to a childhurd. * guix/utils.scm (host-hurd?, host-x86-64, host-hurd64?): New procedures. * gnu/packages/commencement.scm (gcc-toolchain): Use them to determine if the host is a 64bit Hurd, and use gcc-toolchain-14. * gnu/packages/gcc.scm (gcc): Likewise, to use gcc-14. Change-Id: I55e43fdc61e3ea5fc13065fc7ca854b951c94930 --- gnu/packages/commencement.scm | 4 +++- gnu/packages/gcc.scm | 5 ++++- guix/utils.scm | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a14de3002f..3f11bb3384 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3642,7 +3642,9 @@ (define-public gcc-toolchain-14 ;; The default GCC (define-public gcc-toolchain - gcc-toolchain-11) + (if (host-hurd64?) + gcc-toolchain-14 + gcc-toolchain-11)) (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 64ba37fd69..070a0965e6 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -857,7 +857,10 @@ (define-public gcc-14 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-11) +(define-public gcc + (if (host-hurd64?) + gcc-14 + gcc-11)) ;;; diff --git a/guix/utils.scm b/guix/utils.scm index e100c03365..7a71919f73 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -96,6 +96,9 @@ (define-module (guix utils) system-hurd? target-hurd64? system-hurd64? + host-hurd? + host-hurd64? + host-x86-64? target-mingw? target-x86-32? target-x86-64? @@ -729,6 +732,23 @@ (define* (system-hurd64?) (and (system-hurd?) (target-64bit? (%current-system)))) +(define (host-hurd?) + "Are we running on a Hurd system? This is almost never the right function, +use target-hurd? or system-hurd? instead." + (equal? (utsname:sysname (uname)) "GNU")) + +(define (host-x86-64?) + "Are we running on a x86_64bit system? This is almost never the right +function, use target-x86-64? or system-x86-64? instead." + (and (host-hurd?) + (equal? (utsname:machine (uname)) "x86_64"))) + +(define (host-hurd64?) + "Are we running on a 64bit Hurd? This is almost never the right +function, use target-hurd64? or system-hurd64? instead." + (and (host-hurd?) + (host-x86-64?))) + (define* (target-mingw? #:optional (target (%current-target-system))) "Is the operating system of TARGET Windows?" (and target -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2024 11:44: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: Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173210300530244 (code B ref 74290); Wed, 20 Nov 2024 11:44:02 +0000 Received: (at 74290) by debbugs.gnu.org; 20 Nov 2024 11:43:25 +0000 Received: from localhost ([127.0.0.1]:45576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDj7F-0007rj-26 for submit@debbugs.gnu.org; Wed, 20 Nov 2024 06:43:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDj7C-0007rS-T8 for 74290@debbugs.gnu.org; Wed, 20 Nov 2024 06:43: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 1tDj75-0007pX-4F; Wed, 20 Nov 2024 06:43:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=6+anC+rQSxm8NDA5pDZKwb4PIbOZQW79PAc9cOln6zc=; b=bf4iCIvrrTzlLtt2Ikb2 hvRvpJ1+GMnTfIzgDHyQSV1Gz4fVTF3YsUaOQu+uBEbE7HFiyqxHglK6t59Pt8b+G37e6PkMvOHjO n1RQmf9/eSvPkSwKpJJAIzFZrcE7oG/sXfDf7kO3fL2WC8iluUxEYaPsmfsw4sDgtE7K0P90vkVsd TOLhkSFkNTQfhsKTvDLsEP81WCSyYbqzoqUhXG0sPKofKxcpeoBEAINR0d5EtVKogxvfQ/Mqgva6V 0HiMWI6K/x62txPK58JKtTI3JGhNbY06zVi1IkpcireIVTohLLUuztrzviG65g6V2PigQ3Ti1kKr6 6Sll34c4Y1oVXQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <87r078hpuy.fsf@gnu.org> (janneke@gnu.org's message of "Mon, 18 Nov 2024 10:07:33 +0100") References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> <87o72dn544.fsf@gnu.org> <87bjydhquw.fsf@gnu.org> <87r078hpuy.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: =?UTF-8?Q?D=C3=A9cadi?= 30 Brumaire an 233 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Rouleau X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 20 Nov 2024 12:43:11 +0100 Message-ID: <878qteyvu8.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, skribis: >> diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.s= cm >> index a14de3002f..2b0b4b07b4 100644 >> --- a/gnu/packages/commencement.scm >> +++ b/gnu/packages/commencement.scm >> @@ -3642,7 +3642,9 @@ (define-public gcc-toolchain-14 >>=20=20 >> ;; The default GCC >> (define-public gcc-toolchain >> - gcc-toolchain-11) >> + (if (system-hurd64?) > > Hmm, no that doesn't work; (%current-system) is #f at toplevel. Right. It would work, but only where %current-system defaults to =E2=80=9Cx86_64-gnu=E2=80=9D. Ludo=E2=80=99. From unknown Wed Jun 25 00:26:10 2025 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2024 11:49: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: Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173210331331137 (code B ref 74290); Wed, 20 Nov 2024 11:49:01 +0000 Received: (at 74290) by debbugs.gnu.org; 20 Nov 2024 11:48:33 +0000 Received: from localhost ([127.0.0.1]:45591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDjCD-000867-2d for submit@debbugs.gnu.org; Wed, 20 Nov 2024 06:48:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDjCA-00085s-MA for 74290@debbugs.gnu.org; Wed, 20 Nov 2024 06:48:31 -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 1tDjC3-0000Q8-FK; Wed, 20 Nov 2024 06:48: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:Date:References:In-Reply-To:Subject:To: From; bh=UjIpWxIQIT996Y3enoeriPk2ZnfVknou0184QeB1JOw=; b=KKzHLd1cxoi00dEQ7KDd Uax5o7HiDedsRsBH/38w/zQi2tmW/dROMiJQy5j6qMSY8z0bdsk9PTRs4aGKWCxnsXI3Vu3netVhm s572RXIYtl9o3t2gluiIzkZJqO+PVitTs9w3SkHzhbDu4jmmCnPqc59zfJvXxumaFXMFD4jCvJV+3 br7jTcbRBONZZwiePp+dMHb77oSDjjWDqo59WniLGL0O/aL+eBvl6omH4Fn1Hemv6nkWbzRJuOTN9 HdhPriDk/OejlI+ZxqCPlU3lpUAepkKz2GUQMwte1FjxhrR5QU20SP/T+lrlGJDgaEey6Spi5e4+h f+6hQlgQxPxHog==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <87o72dn544.fsf@gnu.org> (janneke@gnu.org's message of "Sun, 17 Nov 2024 18:26:51 +0100") References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> <87o72dn544.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: =?UTF-8?Q?D=C3=A9cadi?= 30 Brumaire an 233 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Rouleau X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 20 Nov 2024 12:48:20 +0100 Message-ID: <87v7wixh17.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, skribis: > Ludovic Court=C3=A8s writes: [...] >> how about changing the GCC version used for cross-compilation, and >> only that: >> >> diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm >> index 5781341a87..6120740b3c 100644 >> --- a/gnu/packages/cross-base.scm >> +++ b/gnu/packages/cross-base.scm >> @@ -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 gcc-14)) > > Interesting...I would have thought this would cause a world rebuild, > because of the cross-gcc in commencement. Apparently, it doesn't. > >> That would affect also non-Hurd cross-compilation targets, but if it >> works, it=E2=80=99s simpler. > > Ok, I very much like the simplicity of this. Yay. >> Then, as a second step, we could prepare a =E2=80=98core-packages-team= =E2=80=99 branch >> that upgrades =E2=80=98gcc=E2=80=99 globally, and that way we keep somet= hing consistent >> and simpler, without =E2=80=98current-gcc=E2=80=99. (Though it means we= =E2=80=99d have to wait >> before we can build natively on x86_64-gnu.) >> >> WDYT? > > I've been thinking about this route and decided against it because it > seems to me that upgrading to gcc-14 will cause a lot of trouble/work. True. > However, if that work is shared, and we have the build farm to help, it > may be the best route. Maybe the wait doesn't have to be too long? > Also, in the mean time, upstream support might improve. Well yes, it=E2=80=99s going to take a bit of time, let=E2=80=99s face it. But hopefully quite a few of us would work on it and we=E2=80=99d set up ci= .guix to build the branch. Also, with the reduced scope of =E2=80=98core-packages=E2=80=99, I hope it = can be faster than =E2=80=98core-updates=E2=80=99 was before. And we can choose to have = a cycle that changes very little beside GCC. > Maybe we can decide to go the route you propose and also keep this > current-gcc patch on the hurd-team branch for a bit (we prepend a fat > REMOVEME in front of it). We can keep working on native Hurd builds > that use gcc-14 on hurd-team using this hack, until core-packages-team > is ready to make it obsolete? Yes. At least, we can already merge cross-compilation support. Thanks, Ludo=E2=80=99. From unknown Wed Jun 25 00:26:10 2025 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2024 11:51: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: Cc: 74290@debbugs.gnu.org, Josselin Poiret , Maxim Cournoyer , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173210342331682 (code B ref 74290); Wed, 20 Nov 2024 11:51:02 +0000 Received: (at 74290) by debbugs.gnu.org; 20 Nov 2024 11:50:23 +0000 Received: from localhost ([127.0.0.1]:45600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDjDy-0008Ev-Ml for submit@debbugs.gnu.org; Wed, 20 Nov 2024 06:50:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDjDw-0008Eh-P6 for 74290@debbugs.gnu.org; Wed, 20 Nov 2024 06:50: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 1tDjDr-0000yZ-4l; Wed, 20 Nov 2024 06:50:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=U+GrLAZy/YUtDx5rCMNi3kQGR3H0HX85NzV8v/NVQVw=; b=PFqnpgZfP7uDXY9wwHL9 oFu71dGGubJTlJxKEkyyZpliekoaVnxg3vR0eejb6Oh+0WT8j0Rh6on8jSCDJlAnuOR0SSqND7dhe 6u3WB6ApjMojF9VGBfT6ZP0MCw+w1bVUX08IGXfc85YLiRKtMF2VXYL7oegAsAo+D2tlTmydJe0RS BQnyL2sB5Vo90QKlwUnV6NyuSdiMPcjyaxrypnEi1EfPX85Io5AYNVcDrqxv7F9G0eTVxFwlAS5ej uL9jj1QcXM5SqqHu3qZFri1VTfF8rZXbaqSXfr6N8e2507LhKg+d/hz5DBYu1y8Vo1ee0hvuzRY4X kaW4pe0YMaAiyg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <87frnpn4r2.fsf@gnu.org> (janneke@gnu.org's message of "Sun, 17 Nov 2024 18:34:41 +0100") References: <874j45ls8s.fsf@gnu.org> <87frnpn4r2.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: =?UTF-8?Q?D=C3=A9cadi?= 30 Brumaire an 233 de la =?UTF-8?Q?R=C3=A9volution,?= jour du Rouleau X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 20 Nov 2024 12:50:11 +0100 Message-ID: <87r076xgy4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) skribis: > Ludovic Court=C3=A8s writes: > >> Janneke Nieuwenhuizen skribis: >> >>> +++ 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")= )) >> >> Are the i586-gnu binaries usable on x86_64-gnu? > > No, at least not currently. The mach message format even differs, AFAIK. > > root@guixygnu64 ~# file bash-i586 > bash-i586: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), stat= ically linked, for GNU/Hurd 0.0.0, stripped > > root@guixygnu64 ~# ./bash-i586 --help > -bash: ./bash-i586: cannot execute binary file: Exec format error OK. But yeah, all the Mach messages and RPCs are probably encoded differently anyway. Too bad! Ludo=E2=80=99. From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 00/58] Add support for x86_64-gnu, aka the 64bit Hurd. References: In-Reply-To: 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: Sun, 24 Nov 2024 07:56: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.173243495217214 (code B ref 74290); Sun, 24 Nov 2024 07:56:01 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:52 +0000 Received: from localhost ([127.0.0.1]:60617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TC-0004TO-WC for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TA-0004Sx-Ce for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:49 -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 1tF7T4-0001r5-7x; Sun, 24 Nov 2024 02:55:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=L/VqkXMe0JK4UTZEzR3iR+vgj+DFk9HJuiaW+tjqF+M=; b=pv1k+24Ihs28Ip TCO2jsr8IJFpZL8i6CHf6lnloCT/4OYVz/3OgfLAJKfz5/GI+7N48Y6CLhOMbndL2lMiNTFRr39lY reW9JgCWjeV2b7LHCSMw06FJm5/+gYkG6P1PcMrlrKmOXpX1IM+9EFQzEig23wOT2MngXo6uQ4gDC 8Z2APVIrxgFtmcHOcu3jpmgL/apJ7oA2jDcBMndrrlRvYYpluQDIH+1DjpKIrSYoaepc/zGwqvYhz wNP8c4TnmZ8y8PeQcERAH6v9Fkz7Tfwhq/Mwvf6DbRJ+8nOeF/afOnbEpyfjSC2a9tcoJoatQ5G+h WuDkIb11d1TJ1s0CjDzQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:23 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) New in v4: * Fix %bootstrap-glibc for riscv64/non-hurd -- thanks Efraim! * Fix host-x86-64? to remove Hurd references -- thanks Efraim! * Have %bootstrap-gcc also wrap g++ _only_ for the 64bit Hurd, * Add refcounts-assert patch for the Hurd (32 and 64bit alike) to avoid the dreaded ext2fs: refcounts_ref: Assertion '! (r.hard == 1 && r.weak == 0) || !"refcount detected use-after-free!"' failed. -- thanks Samuel! * libstdc++-boot0: Support the 64bit Hurd, * gcc-boot0: Support the 64bit Hurd, * gcc-final: Support the 64bit Hurd (almost?), * gcc-14: Force libdir /lib instead of /lib64 for the 64bit Hurd, * Adds another Debian glibc patch {get,set,make,swap}-context, for the 64bit Hurd, working around the gnulib-tests/test-sigaction problem -- thanks Sergey! * Removes findutils patch that disabled all tests on the 64bit Hurd. The gcc-problem turned out to be a probable gcc bug, see . I have built commencement up to, but not just yet including, gcc-final. --8<---------------cut here---------------start------------->8--- phase `build' failed after 20698.0 seconds --8<---------------cut here---------------end--------------->8--- just started another round. The biggest question here is: [When] are we ready to push the cross-gcc 14 patch that's needed for the bootstrap seeds. Is there anything we could/ should do? After we have the cross-build gcc 14 patch, rechecking and pushing the bootstrap seeds patch and the subsequent commencement patches should have little or no impact. Greetings, Janneke Janneke Nieuwenhuizen (58): gnu: gnumach: Update to v1.8+git20240714. gnu: mig: Update to 1.8+git20231217. gnu: hurd: Update to 0.9.git20240714. gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. gnu: cross-libc: Support cross-building for the 64bit Hurd. gnu: bash-minimal: Support [cross-]build with gcc-14. gnu: elfutils: Fix build for 64bit Hurd. gnu: grep: Fix build for the 64bit Hurd. gnu: patch: Fix build for the 64bit Hurd. gnu: libxcrypt: Support the 64bit Hurd. gnu: libstdc++: Support the 64bit Hurd. gnu: glibc/hurd: Add patches for the 64bit Hurd. gnu: bash: Avoid hang when cross-built for the Hurd. gnu: git-minimal: Support [cross-]build with gcc-14 and the 64bit Hurd. gnu: flex: Fix [cross-]build with gcc-14. gnu: libffi: Fix [cross-]build with gcc-14. gnu: perl: Support [cross-]build with gcc-14 and the 64bit Hurd. gnu: texinfo-4: Fix [cross-]build with gcc-14 and the 64bit Hurd. gnu: hurd: Fix build with gcc-14. gnu: netdde: Fix build with gcc-14. gnu: libedit: Fix [cross-]build with gcc-14 for 32bit. gnu: libssh: Fix [cross-]build with gcc-14 for 32bit. gnu: guile-lzlib: Support [cross-]build with gcc-14 and the 64bit Hurd. gnu: cross-base: Update %xgcc to gcc-14, to support the 64bit Hurd. gnu: gcc-14: Force libdir /lib instead of /lib64 for the 64bit Hurd. gnu: glibc/hurd: Add patch for the 64bit Hurd, fixing "raise". gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. system: image: Add hurd64 image types. gnu: libgpg-error: Support the 64bit Hurd. gnu: openssl-3.0: Support the 64bit Hurd. gnu: pciutils: Support the 64bit Hurd. gnu: libpciaccess: Support the 64bit Hurd. gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. gnu: netdde: Support the 64bit Hurd. gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. gnu: rumpkernel: Support the 64bit Hurd. gnu: hurd: Build fixes for the 64bit Hurd. gnu: inetutils: Fix build for the 64bit Hurd. gnu: grub: Fix build for the 64bit Hurd. gnu: guile-fibers: Fix build for the 64bit Hurd. gnu: m4: Fix build for the 64bit Hurd. gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20240714. gnu: commencement: mig-boot0: Update to 1.8+git20231217.. gnu: commencement: hurd-headers-boot0: Update to 0.9.git20240714. gnu: commencement: libstdc++-boot0-gcc7: Replace by make-libstdc++-boot0. gnu: gettext: Fix cross-build shebangs. gnu: Add gdb-15.2, with support for the 64bit Hurd. gnu: bootstrap: %bootstrap-glibc: Also fix libm.so. system: examples: Add bare-hurd64.tmpl. system: examples: Add devel-hurd64.tmpl. gnu: Use gcc-14, gcc-toolchain-14 on the 64bit Hurd. gnu: commencement: kernel-headers-boot0: Support the 64bit Hurd. gnu: hurd: Add refcounts-assert patch. gnu: bootstrap: %bootstrap-gcc: Also wrap g++ for the 64bit Hurd. gnu: commencement: libstdc++-boot0: Support the 64bit Hurd. gnu: commencement: gcc-boot0: Support the 64bit Hurd. gnu: commencement: gcc-final: Support the 64bit Hurd. doc/guix.texi | 9 +- gnu/local.mk | 18 + gnu/packages/admin.scm | 14 +- gnu/packages/base.scm | 78 +- gnu/packages/bash.scm | 22 + gnu/packages/bootloaders.scm | 8 + gnu/packages/bootstrap.scm | 88 +- gnu/packages/commencement.scm | 107 +- gnu/packages/cross-base.scm | 18 +- gnu/packages/crypto.scm | 13 + gnu/packages/elf.scm | 6 +- gnu/packages/flex.scm | 8 + gnu/packages/gcc.scm | 18 +- gnu/packages/gdb.scm | 22 + gnu/packages/gettext.scm | 16 +- gnu/packages/gnupg.scm | 22 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/guile.scm | 16 +- gnu/packages/hurd.scm | 198 ++-- gnu/packages/libedit.scm | 8 + gnu/packages/libffi.scm | 8 +- gnu/packages/m4.scm | 9 +- gnu/packages/make-bootstrap.scm | 49 +- gnu/packages/patches/gdb-hurd64.patch | 923 ++++++++++++++++++ .../glibc-hurd-pthread_setcancelstate.patch | 92 ++ gnu/packages/patches/glibc-hurd64-fault.patch | 32 + .../glibc-hurd64-gcc-14.2-tls-bug.patch | 28 + .../glibc-hurd64-intr-msg-clobber.patch | 62 ++ .../patches/glibc-hurd64-sgms-context.patch | 505 ++++++++++ gnu/packages/patches/gnumach-version.patch | 23 + gnu/packages/patches/grub-hurd64.patch | 32 + gnu/packages/patches/guile-lzlib-hurd64.patch | 32 + gnu/packages/patches/hurd-64bit.patch | 56 ++ .../patches/hurd-refcounts-assert.patch | 26 + gnu/packages/patches/inetutils-hurd64.patch | 65 ++ .../patches/libgpg-error-hurd64.patch | 78 ++ .../patches/libpciaccess-hurd64.patch | 58 ++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 + gnu/packages/patches/netdde-csum.patch | 18 + gnu/packages/patches/openssl-hurd64.patch | 99 ++ gnu/packages/patches/pciutils-hurd64.patch | 31 + gnu/packages/pciutils.scm | 25 +- gnu/packages/perl.scm | 18 +- gnu/packages/ssh.scm | 9 +- gnu/packages/texinfo.scm | 50 +- gnu/packages/tls.scm | 9 + gnu/packages/version-control.scm | 7 +- gnu/packages/xorg.scm | 23 +- gnu/system.scm | 1 - gnu/system/examples/bare-hurd.tmpl | 21 +- gnu/system/examples/bare-hurd64.tmpl | 70 ++ gnu/system/examples/devel-hurd.tmpl | 70 +- gnu/system/examples/devel-hurd64.tmpl | 65 ++ gnu/system/hurd.scm | 17 + gnu/system/images/hurd.scm | 72 +- guix/packages.scm | 8 +- guix/platforms/x86.scm | 11 +- guix/utils.scm | 34 +- m4/guix.m4 | 12 +- 59 files changed, 3190 insertions(+), 287 deletions(-) create mode 100644 gnu/packages/patches/gdb-hurd64.patch create mode 100644 gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch create mode 100644 gnu/packages/patches/glibc-hurd64-fault.patch create mode 100644 gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch create mode 100644 gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch create mode 100644 gnu/packages/patches/glibc-hurd64-sgms-context.patch create mode 100644 gnu/packages/patches/gnumach-version.patch create mode 100644 gnu/packages/patches/grub-hurd64.patch create mode 100644 gnu/packages/patches/guile-lzlib-hurd64.patch create mode 100644 gnu/packages/patches/hurd-64bit.patch create mode 100644 gnu/packages/patches/hurd-refcounts-assert.patch create mode 100644 gnu/packages/patches/inetutils-hurd64.patch create mode 100644 gnu/packages/patches/libgpg-error-hurd64.patch create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch create mode 100644 gnu/packages/patches/netdde-csum.patch create mode 100644 gnu/packages/patches/openssl-hurd64.patch create mode 100644 gnu/packages/patches/pciutils-hurd64.patch create mode 100644 gnu/system/examples/bare-hurd64.tmpl create mode 100644 gnu/system/examples/devel-hurd64.tmpl base-commit: 047967c42f237695d5af2af53321c70f157685a3 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 01/58] 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: Sun, 24 Nov 2024 07:56: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.173243495417233 (code B ref 74290); Sun, 24 Nov 2024 07:56:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:54 +0000 Received: from localhost ([127.0.0.1]:60621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TE-0004Tb-1a for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TA-0004Sy-Fa for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:49 -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 1tF7T5-0001rA-2S; Sun, 24 Nov 2024 02:55:43 -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=ysWnOgMW99w6DK+Ivyoq1YsZsef0OievoeJe0IgNnhk=; b=Axk59G5FKCDvawV1cuQ/ MqziUy1vvajd1TJScTyE1FblxRjsjoV81UH41BDe2tYWuCFH8Lko3XNisZ3cI39d8UQ7NZczUq1Vk 3ejCrLzeIkC49jgevCex4UvwlvZy/TRtDYs0JpLRcXjwJ+r+5HnzXWIw0S2n855AGUXBfYLIQjTkv 8oqIQci8qekVAVMsbJcvY7IfgT7OWy49qoDLOMXOk4VtK7FdPti6T5N7aTCWoWZyd3TOljm2+CBMD B6yAd/FgXwS1gjiyWAoN0LGhVOclzuRZ13q8fWQPJ5TztOIyHtsq+LnGfGg7qZK1kS/sKHU8hXlar NJkNTZckGPrfWg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:24 +0100 Message-ID: <666f102f47eacf0209652b6e1f85c7d8905c8438.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 04e9b1c0fd..5e05fc9d10 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1461,6 +1461,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@"; -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 02/58] gnu: mig: Update to 1.8+git20231217. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:56: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.173243495817250 (code B ref 74290); Sun, 24 Nov 2024 07:56:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:58 +0000 Received: from localhost ([127.0.0.1]:60625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TJ-0004U7-Ml for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TC-0004T1-O3 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55: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 1tF7T5-0001rI-Ti; Sun, 24 Nov 2024 02:55: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=Gg6wzNu/TMW/O95Mhzp+nneTviaAYIw85n06FjlS5l8=; b=lCDB+g2ySHjyNfvOKqU0 Yf+s19WfTxdmtoQ/+TWEX/4gfHrjboSdfegECRJ+sGFUa8bkLifT/+71H3iq8Hc2PABmCf45td1SP rhdC4HAFaRZVgNu53eJt9ZMDJj4TLyQCSawOBmeTMFk03T1o8xQ6wLSbuJs/vsy7TwitOVvHH0/vi XICyux+h4OCZEka1fD9n2LhQr+OK5ai36DpFgu5Rk+H0ZBjGgqTi8dMOfVVPwxYgJX2V486iJJUq4 3xDgITNA4DJTtbtw9FQC/kjExFl9JnS2dXfsfiz78h/p2D/2EzOEdcaOr+W5ffv0fBjstsPME3dXL yB+nmu2Ix4vP8w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:25 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 03/58] gnu: hurd: Update to 0.9.git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:56: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.173243495817265 (code B ref 74290); Sun, 24 Nov 2024 07:56:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:58 +0000 Received: from localhost ([127.0.0.1]:60627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TK-0004UB-47 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TC-0004T2-O4 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55: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 1tF7T6-0001rL-QC; Sun, 24 Nov 2024 02:55: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=grLRanCPY6hYm6LxiiZKsNhPOiLXPCYg/f3rpP4Ieq4=; b=R5eVza9HmS1q1xHyc6I9 xc5FSb5IiTS0tnWAyFdRSrnE/rJ5NgYtCszCJn4Lnlkap1SsCMJTihSykT5BlzSFgY/y86pErHq7k rx+yKfNbuNyw5GhTMIDSkZ8Zc15TsNYzo2rlIIG6RK2b2XL5IOLhwG3Ym2+ctpESobrkTwztdwrjY WNIXHNHx02CU8oQfVc10Xn3Oqha7xnagTHaaQdDikTM++YkArq8gE2IF4nG8NpqFB4Z5QJOUt+uCQ d6H5eaAIP4M8ZMmlUNuOeh+vhtYMqJ+sjxeS68XIF7l4ITZJFWMcYAGTEoQzK2KHa5Ikbh3Bmyvf1 +kELgf49i8hX/g==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:26 +0100 Message-ID: <7e43931a12f914136fba84bc38b0eea97cdded79.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 04/58] 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, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:56: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 , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Andreas Enge , Christopher Baines , 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.173243495917271 (code B ref 74290); Sun, 24 Nov 2024 07:56:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:59 +0000 Received: from localhost ([127.0.0.1]:60629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TK-0004UQ-On for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TD-0004T4-NJ for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:52 -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 1tF7T8-0001rW-HE; Sun, 24 Nov 2024 02:55: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=Pa6Y9FF7/lLK4NUbc/ksHzZkdmPZ4YxoB3qlTOOJwww=; b=d8+SwVxv/eFQ7coTpRmd LsoYzoGQFVqbE1N8IDHLBP7uMUkK7lQM+3WRxmMO0I0ilR8myOB6ye/C4o4Jp6dGuMohBEGN9C646 1ImKEiczO7TXtenV1HsBPH7B7KqJoKY3f8WbSKrUC+qiur+WBn3rF8H4udNO83wOmMUeT/oVuDY9Z BDcxc9qSeMZo6uYB++UIb8zjCFv5VhO7AYoLegVgfKGdZ7INJi84nZTg6P1LxYMSGxVeaNikyu/iv etuDy1fVzdo2eEGKTE+JjNw5inEO8ppCdy99JyurTcfkFjklo9TWuDY8eIqd+1ta9aKi75X+bohjP qNbaRHJGuPEhIA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:27 +0100 Message-ID: <7b759ee67a38204e7bb3f0f81009637456a5d6b7.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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. * gnu/packages/cross-base.scm (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) [native-inputs]: Move final-inputs before cross-packages. (%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. (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. * guix/platforms/x86.scm (x86_64-gnu): New exported variable. * guix/utils.scm (target-hurd64? system-hurd64?): New procedures. --- gnu/packages/bootstrap.scm | 3 ++- gnu/packages/cross-base.scm | 6 +++--- gnu/packages/make-bootstrap.scm | 24 +++++++++++++++++------- guix/platforms/x86.scm | 11 ++++++++++- guix/utils.scm | 15 ++++++++++++++- 5 files changed, 46 insertions(+), 13 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 3743abf9fe..33cbaa30ae 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/cross-base.scm b/gnu/packages/cross-base.scm index 5781341a87..83672ab383 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/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index edc536bff4..689d48d342 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -145,7 +145,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 +157,7 @@ (define (package-with-relocatable-glibc p) (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) (package-search-paths 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 +397,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 @@ -642,6 +649,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 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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 05/58] 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: Sun, 24 Nov 2024 07:57: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497117418 (code B ref 74290); Sun, 24 Nov 2024 07:57:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:11 +0000 Received: from localhost ([127.0.0.1]:60665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TW-0004Wq-GT for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TJ-0004Th-Kf for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:58 -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 1tF7TE-0001sM-9p; Sun, 24 Nov 2024 02:55:52 -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=c8onV7OhuF9SSTXP9WNCS6hOWvgt/CoTjai2PjzC0k0=; b=UCNwWsfHQ5FwIyh7UYLQ fRQDzVZJXqe4K+nMADimaosAF4KT0rg+NdDUsMkSnglSjMG5SlJrn8ERHSNC3kioVJC7iAA6cNxtz JvWae1q9vROyH3pENZNMjK+BsGWnfs7OT9a3sskDRXV+8v6ryun0t/jSaDozRqRCnLe1EikCGMyBL Ka+uJw+Lx7PXmFFwshyfrn5enwJ5VuZgrTRVjZwHB5P9NXz9xjeJbiR6YZ6cOF8G443nyhMJTt3ij ryd6QOqUwN7eyt2p+BLFrNGEuQxJtPk21Fbh94MFaq8asQoh3TyhW4EfgV0x/WGqJuivVb9QjoLuV vZuSIu5wkHozqg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:28 +0100 Message-ID: <1f12ffca4c4a35a169686b44412d2d377177a76e.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 | 9 +++++++-- gnu/packages/bootstrap.scm | 2 +- gnu/packages/cross-base.scm | 8 ++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 90c25b54e1..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") @@ -1089,7 +1089,12 @@ (define-public glibc (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (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) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 33cbaa30ae..27798fe278 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -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/cross-base.scm b/gnu/packages/cross-base.scm index 83672ab383..4961b3b4c0 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") @@ -748,7 +748,11 @@ (define* (cross-libc* target (add-after 'install 'create-machine-symlink (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (cpu "i386") + (cpu ,(match target + ((? target-x86-32?) + "i386") + ((? target-x86-64?) + "x86_64"))) (machine (string-append out "/include/mach/machine"))) (unless (file-exists? machine) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 06/58] gnu: bash-minimal: Support [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243497117429 (code B ref 74290); Sun, 24 Nov 2024 07:57:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:11 +0000 Received: from localhost ([127.0.0.1]:60667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TW-0004Wy-Ur for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TM-0004U1-85 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:00 -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 1tF7TH-0001tn-27; Sun, 24 Nov 2024 02:55: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=Qt95m4uKHM+54AY3ttIyfuvxneu8yjJgxxbpcdIZ4Bs=; b=MHNVkA6Rb518Kpvbs8yz lIHWnJNxXiBx+lDTfNQ0StYEA9a9o234PQl4uItNIPg+oKOlUx2SAIL1v5ER18Em/kjfra4uEwG3M 3X6/gxHJqP/QPoyOInrm19teUrSmDu+o2tS69BiInqNVyb+2xwc+DsWM91yWHjjEe2PCJPhlr/2HM gETHFK4SJmq1HphZ/S1z2Mf1sf0xrMarKzGArGAwSKaSZl/fTDisIE5W+LkVVuiAtv0aTg8s7Zp0L R2IdUzb0WAg3BnARNsD2XA1qs2X/pa9zC7Kvchl0G+XtPmaWSdYwqKawVEyilyqxzhQhrFSkXtchl qgplOqi1DZh3NA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:29 +0100 Message-ID: <36e7173c950cda9f0e4e2c2e207cb2cc92abc8c0.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/bash-minimal.scm (bash)[arguments]: When building for the 64bit hurd, or cross-building, use "CFLAGS=-g -O2 -Wno-implicit-function-declaration". Change-Id: I1356c0aeac303bdf0254c28815716c83884008a0 --- gnu/packages/bash.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 93641a78d5..56918d79bd 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. ;;; @@ -251,6 +252,13 @@ (define-public bash-minimal ;; modules and related code. "ac_cv_func_dlopen=no" + ,@(if (or (target-hurd64?) (%current-target-system)) + ;; gcc-14 implictly uses -Wimplicit-function-declaration + ;; which together with -Werror causes: + ;; ./enable.def:492:11: error: implicit declaration of function ‘dlclose’; + '("CFLAGS=-g -O2 -Wno-implicit-function-declaration") + '()) + ,@(if (%current-target-system) '("bash_cv_job_control_missing=no" "bash_cv_getcwd_malloc=yes") -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 07/58] gnu: elfutils: Fix build for 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243497117437 (code B ref 74290); Sun, 24 Nov 2024 07:57:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:11 +0000 Received: from localhost ([127.0.0.1]:60671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TX-0004X4-A8 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TO-0004U6-Ja for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7TJ-0001uc-DV; Sun, 24 Nov 2024 02:55: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=u7ZcwCvfIo4RA0wyM8D7UsyTx3DsVj1L+LGAlaX8E4Y=; b=PWezY+0lZt6O7HHHe0Jw p0ZBu/Ls6ZkLUkVOoz2H51mmeJWXD8C84+B2lVR9iONZDVZ9T9zjSisqeMCCR/sc9gOnFS/UvOmZc uV3KD3SYu+O74l+PKlhcRPMZ3T7UJy6i97+RB9ovqAE1pRgAePbFZkMtqEbEXn9XPU8Q2JDju7hct /x970WcBQpHq94LpEbjfzMQ3zuhqO0JzGMyt6liZExhB0VxLyFpQbx5U27juOtEVs9YygIJ7jlWL1 GeTC539KmjCcMHPlpU8hK3KJVfQxhlmBxjpBpm/echfBi4TQEe4dfHvgwa0FphBqm+L9zu6BiNFsR SABKI9YXlpMhEw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:30 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 08/58] 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: Sun, 24 Nov 2024 07:57: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497217445 (code B ref 74290); Sun, 24 Nov 2024 07:57:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:12 +0000 Received: from localhost ([127.0.0.1]:60673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TX-0004XC-MN for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TP-0004UO-KE for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:04 -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 1tF7TK-0001uj-Dg; Sun, 24 Nov 2024 02:55: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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=hlnrBJI0O5Mc82RQm0i1 eC5rL2W5Tu1Cue1nPX25O8n4Af/YRT31Q7U/28zeVrbj+2XRbO53uSIBjcY6kxq1aq9AVfkQOsE20 EVbv4fqBmtJ7EtmdgNJqjRn4M1p1d0jIhaY7RMeDeOWOTscUoZlI2WGQb8pHjDGsu7TmK11PXJz0B +HJMW6h6NHOhaYeFTiFUjIKjtM+Qlk3cayQ++FP7lj/pMJ+TvyE4PzjyFMc8XUVpeubkfyqyIxrfS cRTADOWsxd9BQXpn2nmWAeQr6JjpC56SLW5NI2SUllTvHqkIDBdXCCVOAgzYrEopVIonh0bVIp3of v2DzK7UZ/9pTUg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:31 +0100 Message-ID: <28e3737472cbdbe6cd9d3771706568ee62fc0501.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 _ -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 09/58] 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: Sun, 24 Nov 2024 07:57: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497317454 (code B ref 74290); Sun, 24 Nov 2024 07:57:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:13 +0000 Received: from localhost ([127.0.0.1]:60675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TY-0004XK-1a for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TQ-0004Ud-L5 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:05 -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 1tF7TL-0001uq-Ec; Sun, 24 Nov 2024 02:55: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=uzE792OzozLBDOeZLY9UG0h9+GGvGGGvinw9jeHBrz4=; b=St8+xdROngfpQe9VCBNw xqnp/FyF8ruMeV0we7K24LK0Ephf/iZwojPxgm591iIy9+F02pM87uGhqWCykk1u0MSKISHzC0SFx rjCsND6VJv4lSj75zVxT/ezN17uX35Vke97k/IRLxp18jNrLtdoiiZts7sPGdaVG19yjN2vYmwB/0 CFFrUQ6XKvcO6zTVr74amXS5pQ0fDMPTq9kGHGXzzcozBpbFiyETP70S7YYlHl/GF1tmRHaH2Dh4Q 9ymS7rgXQk8hdYazBBYKz1PZx8IOYxng35GZnHJtjwdv6eQ3FRb0wRqelGgaIwzcC0rAQ7FsQug3L z9GMHwBsCz0bWw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:32 +0100 Message-ID: <782e6888544ea859719fdb5cfa9e5a0e16b8adb4.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 '())))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 10/58] gnu: libxcrypt: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497417463 (code B ref 74290); Sun, 24 Nov 2024 07:57:05 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:14 +0000 Received: from localhost ([127.0.0.1]:60677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TY-0004XT-WF for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TR-0004Ue-EY for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:06 -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 1tF7TM-0001ux-8F; Sun, 24 Nov 2024 02:56: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=Umy2vP7LX8xbEzRUFrHWzJKLrx1O3ko1tosisY6YVGc=; b=qxAX2ySeyrXLy/7JuP8v d2WNtQ6QQm82Meb5rhOQNlEdmhDa9enP8XV3t8/6xFcOUtQZLxQlzSCA4a08cdww89T+5q84rUw2n THt8dKRe8Ej7XQBvpE0FV+uAWlC1uNz2DERdQ5jutFsyy95kPGKXmNV1c7ySBebkJR/u8tQCBC2tk Is7eSEU8ZQOovwgo9H5SG8X5jR5rlrYjTwo6z3T3Yn5DPujlh8gasIdhglyvfZcwux1Sfv5K0Pbll Z+lncMy+bN6MazgFl4Pjwkqxhs/HzrMCri08w+g97SNrDzJQIzYwaYiBBtxi5cbHdsav0do1ulktM Eh1CiwLRQfn9sA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:33 +0100 Message-ID: <14b9d24dbbdbdaa7683c299ef3aaeb4d89588a25.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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-hurd64-patch'. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 13 +++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 +++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5e05fc9d10..0753002f75 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1726,6 +1726,7 @@ dist_patch_DATA = \ %D%/packages/patches/libutils-remove-damaging-includes.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.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..9ef1a53fa6 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,18 @@ (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-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch "libxcrypt-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))))) + '())) (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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 11/58] 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: Sun, 24 Nov 2024 07:57: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497417476 (code B ref 74290); Sun, 24 Nov 2024 07:57:06 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:14 +0000 Received: from localhost ([127.0.0.1]:60681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TZ-0004Xb-P8 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TS-0004Ur-93 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:06 -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 1tF7TN-0001v6-2X; Sun, 24 Nov 2024 02:56: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=a7NmOy2KfV6cY0d2ca/CXJoA0Tsq6JjKypPbOUHOUhw=; b=IDPQp/ckNmHado+R6ZI7 pX9rm5FdCHs7kaEunE32nkQ85lkmyVeJILBD8m8MiPp1IeG9/DeodpHwwawnz/OVKWA6Eu0DVGoVD spq0Owrpw8htoKWQuLlI08m5NbVtesv8XQKQg3qg7NU6F6iLgcqGhJMdeNpITcuc0089GYx54TbyR xCTrzw3E0bcRyNEo+130ymH23FI9FEzRttxSggXpAwePONPvmDRVG20gE0W5aNIr+3tMWyI4/T5uH yCiiH34xzLhrGc71LpxpGK/xzHXUcNRMjOjEsHAKeLhE5JPom0dde/QVlez3d3xC4aYBVXbE4UVOX f5wWksLtw6z+jQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:34 +0100 Message-ID: <7747b95f6a663fee3fa27e2c2188b48abf466077.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 c9e475b676..64ba37fd69 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1024,7 +1024,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=" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 13/58] gnu: bash: Avoid hang when cross-built for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497517484 (code B ref 74290); Sun, 24 Nov 2024 07:57:06 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:15 +0000 Received: from localhost ([127.0.0.1]:60685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ta-0004Xu-C7 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TU-0004VP-Ag for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:08 -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 1tF7TP-0001wF-0g; Sun, 24 Nov 2024 02:56: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=O2paMw05P4xg8gLY+nDmUoHYGnjWMhlOcVokJPZ7WCA=; b=nxOxjJSjoWZz9QrImWik hxv6Gfst1HhI2d5o4oIN/z5oY6RtYSCv2eA+jI7iAvmMBqlE7rZx6xgO+Yy7kaINgnZZlXYZXZjKy 6V7NYvVYRvASXKtv4CArQIV6znA/9q/p9HFP4PDGFs44Nb4fpNwdiD8i80uFfMzh94NBAhMd2ucZ5 Nhtgzx4i5yNnrjoeRG/37mj3dujBQ8PbccFb9ZPyHHKD+vv0PLVSANMLx/6E/6gQglPw1qL6YycKt FYwtdz03ogIEjrX4uvopcQlw9rwFKILVSyIUAipKthG1PxejB+k5nlR4untf74uFalQh4nZq0QTGg SBuke7eJAPutoA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:36 +0100 Message-ID: <7235d52720e15f740207edb5a02a7b3e0d907f53.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) For example, without this patch bash hangs while configuring diffutils. Reproducer: cat >x.awk < `bash' link. -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 12/58] gnu: glibc/hurd: Add patches 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: Sun, 24 Nov 2024 07:57: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497717521 (code B ref 74290); Sun, 24 Nov 2024 07:57:07 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:17 +0000 Received: from localhost ([127.0.0.1]:60687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ta-0004Xx-Vf for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TT-0004V5-BI for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:09 -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 1tF7TO-0001vr-4X; Sun, 24 Nov 2024 02:56: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=/7669s/vPl4u/i/CZrXyROJfSDNJk9YoFJcrZnxakcY=; b=BhWOGhdJVzaOcoUgUqr3 B01ZgEqu6HbpZv6NaEEQYbXL7AiI7vvtbeBbspdNH7ZSbYkvZNgwXv4YS3PbxYAiLM8Tqws27iXqz nWabcLyOHy3yildVmVdjnO9GvmuMgEUJtdS8Y+9tj3ys39a9wY2urcKpwsnET8PgAWtwZ2a+NcboU YD5pnBe7r7V2JU6j9TAydXC5+RUBiLuuX4YsUhFLVls882IaWopQwRHuYCWCKTmaZM1vxlFV66HH8 VeFF7MRrOprhosG4do438nzUWXuROqkYhRbnfQUAIZHyS1MHj/70F+jbwl0Te1B70PQ7Qh1rhUx3c oIREuHA6SRWZ/g==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:35 +0100 Message-ID: <7c8d9bb229538bd21e91c0beb562d26bd4fabf98.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) These patches fix: * Statically linked tar to hang/segfault upon issuing the "--mtime=@1" warning; this is also applicable for the 32bit Hurd using glibc-2.39! See . * Shell replacement problems for the 64bit Hurd. See . * Findutil's gnulib-tests/test-sigaction failure. * gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch, gnu/packages/patches/glibc-hurd64-fault.patch, gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch, gnu/packages/patches/glibc-hurd64-sgms-context.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/base.scm (glibc/hurd): Use them. Change-Id: I9ee65983876cd22ad1dc01aabb41a34074631599 --- gnu/local.mk | 4 + gnu/packages/base.scm | 12 +- .../glibc-hurd-pthread_setcancelstate.patch | 92 ++++ gnu/packages/patches/glibc-hurd64-fault.patch | 32 ++ .../glibc-hurd64-intr-msg-clobber.patch | 62 +++ .../patches/glibc-hurd64-sgms-context.patch | 505 ++++++++++++++++++ 6 files changed, 706 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch create mode 100644 gnu/packages/patches/glibc-hurd64-fault.patch create mode 100644 gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch create mode 100644 gnu/packages/patches/glibc-hurd64-sgms-context.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0753002f75..f15272f25c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1437,7 +1437,11 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-getauxval.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \ %D%/packages/patches/glibc-hurd-mach-print.patch \ + %D%/packages/patches/glibc-hurd-pthread_setcancelstate.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-hurd64-fault.patch \ + %D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch \ + %D%/packages/patches/glibc-hurd64-sgms-context.patch \ %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 83f8c0d9e9..80e53c2e52 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1588,7 +1588,17 @@ (define-public which command.") (license gpl3+))) ; some files are under GPLv2+ -(define-public glibc/hurd glibc) +(define-public glibc/hurd + (package/inherit glibc + (source + (origin + (inherit (package-source glibc)) + (patches + (append (origin-patches (package-source glibc)) + (search-patches "glibc-hurd-pthread_setcancelstate.patch" + "glibc-hurd64-fault.patch" + "glibc-hurd64-intr-msg-clobber.patch" + "glibc-hurd64-sgms-context.patch"))))))) (define-public glibc/hurd-headers (package/inherit glibc/hurd diff --git a/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch b/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch new file mode 100644 index 0000000000..1d7c81b98e --- /dev/null +++ b/gnu/packages/patches/glibc-hurd-pthread_setcancelstate.patch @@ -0,0 +1,92 @@ +Upstream-status: Taken from . + +This is needed for the 64bit Hurd statically linked tar non to hang when +issuing a warning. + +since the move of libpthread functions to libc, glibc dropped the use +of __libc_ptf_call. But htl hasn't made the move yet, so we have to use +__libc_ptf_call there for now. + +Index: glibc-2.36/misc/error.c +=================================================================== +--- glibc-2.36.orig/misc/error.c ++++ glibc-2.36/misc/error.c +@@ -240,7 +240,8 @@ __error_internal (int status, int errnum + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + #endif + + flush_stdout (); +@@ -262,7 +263,7 @@ __error_internal (int status, int errnum + + #ifdef _LIBC + _IO_funlockfile (stderr); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + #endif + } + +@@ -306,7 +307,9 @@ __error_at_line_internal (int status, in + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), ++ 0); + #endif + + flush_stdout (); +@@ -336,7 +339,7 @@ __error_at_line_internal (int status, in + + #ifdef _LIBC + _IO_funlockfile (stderr); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + #endif + } + +Index: glibc-2.36/libio/iopopen.c +=================================================================== +--- glibc-2.36.orig/libio/iopopen.c ++++ glibc-2.36/libio/iopopen.c +@@ -281,9 +281,10 @@ _IO_new_proc_close (FILE *fp) + do + { + int state; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + wait_pid = __waitpid (((_IO_proc_file *) fp)->pid, &wstatus, 0); +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + } + while (wait_pid == -1 && errno == EINTR); + if (wait_pid == -1) +Index: glibc-2.36/stdlib/fmtmsg.c +=================================================================== +--- glibc-2.36.orig/stdlib/fmtmsg.c ++++ glibc-2.36/stdlib/fmtmsg.c +@@ -124,7 +124,8 @@ fmtmsg (long int classification, const c + /* We do not want this call to be cut short by a thread + cancellation. Therefore disable cancellation for now. */ + int state = PTHREAD_CANCEL_ENABLE; +- __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state); ++ __libc_ptf_call (__pthread_setcancelstate, ++ (PTHREAD_CANCEL_DISABLE, &state), 0); + + __libc_lock_lock (lock); + +@@ -193,7 +194,7 @@ fmtmsg (long int classification, const c + + __libc_lock_unlock (lock); + +- __pthread_setcancelstate (state, NULL); ++ __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0); + + return result; + } diff --git a/gnu/packages/patches/glibc-hurd64-fault.patch b/gnu/packages/patches/glibc-hurd64-fault.patch new file mode 100644 index 0000000000..24980e8c2a --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-fault.patch @@ -0,0 +1,32 @@ +Upstream-status: Taken from: . + +See . + +commit 11ad033e1c09c8b8e7bbaa72420f41ab8bcf0f63 +Author: Flavio Cruz +Date: Tue Jul 30 00:51:20 2024 -0400 + + x86_64 hurd: ensure we have a large enough buffer to receive exception_raise requests. + + Message-ID: + +diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c +index 5110c6030f..1fe973f54d 100644 +--- a/hurd/hurdfault.c ++++ b/hurd/hurdfault.c +@@ -121,7 +121,14 @@ faulted (void) + struct + { + mach_msg_header_t head; +- char buf[64]; ++ /* This is the size of the exception_raise request ++ * including mach_msg_header_t. ++ * See generated code in faultexc_server.c. */ ++#ifdef __LP64__ ++ char buf[112]; ++#else ++ char buf[64]; ++#endif + } request; + mig_reply_header_t reply; + extern int _hurdsig_fault_exc_server (mach_msg_header_t *, diff --git a/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch b/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch new file mode 100644 index 0000000000..600f89a711 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-intr-msg-clobber.patch @@ -0,0 +1,62 @@ +Upstream-status: Taken from . + +See , +and . + +Commited for 2.40 + +commit c8b4ce0b368115714bd4cce131e1683759471099 +Author: Samuel Thibault +Date: Sat Jul 13 17:00:55 2024 +0200 + + hurd: Fix restoring message to be retried + + save_data stores the start of the original message to be retried, + overwritten by the EINTR reply. In 64b builds the overwrite is however + rounded up to the 64b pointer size, so we have to save more than just + the 32b err. + + Thanks a lot to Luca Dariz for the investigation! + +diff --git a/hurd/intr-msg.c b/hurd/intr-msg.c +index 2c2e7dc463..424c1fc700 100644 +--- a/hurd/intr-msg.c ++++ b/hurd/intr-msg.c +@@ -42,7 +42,10 @@ _hurd_intr_rpc_mach_msg (mach_msg_header_t *msg, + struct clobber + { + mach_msg_type_t type; +- error_t err; ++ union { ++ error_t err; ++ uintptr_t align; ++ }; + }; + union msg + { + +Taken from: + +Force putting save_data on the stack rather than in SSE register + +The signal management does not yet properly save SSE state, so that save_data +would get overwritten by signal handlers, notably leading to `` shell +replacement getting empty content because then the io_read RPC retry gets an +MIG_BAD_ARGUMENTS error. + +XXX: This is only temporary to fix the common shll replacement issue, and is +waiting for proper SSE state restoration. + +Index: glibc-2.38/hurd/intr-msg.c +=================================================================== +--- glibc-2.38.orig/hurd/intr-msg.c ++++ glibc-2.38/hurd/intr-msg.c +@@ -79,7 +79,7 @@ _hurd_intr_rpc_mach_msg (mach_msg_header + mach_msg_bits_t msgh_bits; + mach_port_t remote_port; + mach_msg_id_t msgid; +- struct clobber save_data; ++ volatile struct clobber save_data; + + if ((option & (MACH_SEND_MSG|MACH_RCV_MSG)) != (MACH_SEND_MSG|MACH_RCV_MSG) + || _hurd_msgport_thread == MACH_PORT_NULL) diff --git a/gnu/packages/patches/glibc-hurd64-sgms-context.patch b/gnu/packages/patches/glibc-hurd64-sgms-context.patch new file mode 100644 index 0000000000..7ae45542c1 --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-sgms-context.patch @@ -0,0 +1,505 @@ +Upstream-status: Taken from . + +commit 88b771ab5e1169e746dbf4a990d90cffc5fa54ea +Author: Flavio Cruz +Date: Sat Feb 17 15:25:35 2024 -0500 + + Implement setcontext/getcontext/makecontext/swapcontext for Hurd x86_64 + + Tested with the tests provided by glibc plus some other toy examples. + Message-ID: <20240217202535.1860803-1-flaviocruz@gmail.com> + +diff --git a/sysdeps/mach/hurd/x86_64/Makefile b/sysdeps/mach/hurd/x86_64/Makefile +index 80cf2eb6dc..2b43f5d625 100644 +--- a/sysdeps/mach/hurd/x86_64/Makefile ++++ b/sysdeps/mach/hurd/x86_64/Makefile +@@ -3,3 +3,7 @@ ifeq ($(subdir),conform) + # (missing SA_NOCLDWAIT) + conformtest-xfail-conds += x86_64-gnu + endif ++ ++ifeq ($(subdir),stdlib) ++sysdep_routines += __start_context ++endif +diff --git a/sysdeps/mach/hurd/x86_64/__start_context.S b/sysdeps/mach/hurd/x86_64/__start_context.S +new file mode 100644 +index 0000000000..3cb4c6b5a9 +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/__start_context.S +@@ -0,0 +1,49 @@ ++/* Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++/* This is the helper code which gets called if a function which is ++ registered with 'makecontext' returns. In this case we have to ++ install the context listed in the uc_link element of the context ++ 'makecontext' manipulated at the time of the 'makecontext' call. ++ If the pointer is NULL the process must terminate. */ ++ ++ ++ENTRY(__start_context) ++ /* This removes the parameters passed to the function given to ++ 'makecontext' from the stack. RBX contains the address ++ on the stack pointer for the next context. */ ++ movq %rbx, %rsp ++ ++ /* Don't use pop here so that stack is aligned to 16 bytes. */ ++ movq (%rsp), %rdi /* This is the next context. */ ++ testq %rdi, %rdi ++ je 2f /* If it is zero exit. */ ++ ++ call __setcontext ++ /* If this returns (which can happen if __sigprocmask fails) we'll ++ exit the program with the return error value (-1). */ ++ movq %rax,%rdi ++ ++2: ++ call HIDDEN_JUMPTARGET(exit) ++ /* The 'exit' call should never return. In case it does cause ++ the process to terminate. */ ++L(hlt): ++ hlt ++END(__start_context) +diff --git a/sysdeps/mach/hurd/x86_64/getcontext.S b/sysdeps/mach/hurd/x86_64/getcontext.S +new file mode 100644 +index 0000000000..ef431be1a3 +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/getcontext.S +@@ -0,0 +1,68 @@ ++/* Save current context. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#include "ucontext_i.h" ++ ++ ++ENTRY(__getcontext) ++ /* Save the preserved registers, the registers used for passing ++ args, and the return address. */ ++ movq %rbx, oRBX(%rdi) ++ movq %rbp, oRBP(%rdi) ++ movq %r12, oR12(%rdi) ++ movq %r13, oR13(%rdi) ++ movq %r14, oR14(%rdi) ++ movq %r15, oR15(%rdi) ++ ++ movq %rdi, oRDI(%rdi) ++ movq %rsi, oRSI(%rdi) ++ movq %rdx, oRDX(%rdi) ++ movq %rcx, oRCX(%rdi) ++ movq %r8, oR8(%rdi) ++ movq %r9, oR9(%rdi) ++ ++ movq (%rsp), %rcx ++ movq %rcx, oRIP(%rdi) ++ leaq 8(%rsp), %rcx /* Exclude the return address. */ ++ movq %rcx, oRSP(%rdi) ++ ++ /* We have separate floating-point register content memory on the ++ stack. We use the __fpregs_mem block in the context. Set the ++ links up correctly. */ ++ ++ leaq oFPREGSMEM(%rdi), %rcx ++ movq %rcx, oFPREGS(%rdi) ++ /* Save the floating-point environment. */ ++ fnstenv (%rcx) ++ fldenv (%rcx) ++ stmxcsr oMXCSR(%rdi) ++ ++ /* Save the current signal mask with ++ * __sigprocmask(SIG_BLOCK, NULL, oSIGMASK(%rdi)); */ ++ leaq oSIGMASK(%rdi), %rdx ++ movq $0, %rsi ++ movl $SIG_BLOCK, %edi ++ call HIDDEN_JUMPTARGET (__sigprocmask) ++ ++ /* Propagate %rax (and errno, in case). */ ++ ret ++PSEUDO_END(__getcontext) ++ ++weak_alias (__getcontext, getcontext) +diff --git a/sysdeps/mach/hurd/x86_64/makecontext.c b/sysdeps/mach/hurd/x86_64/makecontext.c +new file mode 100644 +index 0000000000..6990a7775c +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/makecontext.c +@@ -0,0 +1,119 @@ ++/* Create new context. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++#include ++#include ++#include ++ ++#include "ucontext_i.h" ++ ++/* This implementation can handle any ARGC value but only ++ normal integer parameters. ++ makecontext sets up a stack and the registers for the ++ user context. The stack looks like this: ++ +-----------------------+ ++ | next context | ++ +-----------------------+ ++ | parameter 7-n | ++ +-----------------------+ ++ | trampoline address | ++ %rsp -> +-----------------------+ ++ ++ The registers are set up like this: ++ %rdi,%rsi,%rdx,%rcx,%r8,%r9: parameter 1 to 6 ++ %rbx : address of next context ++ %rsp : stack pointer. ++*/ ++ ++/* XXX: This implementation currently only handles integer arguments. ++ To handle long int and pointer arguments the va_arg arguments needs ++ to be changed to long and also the stdlib/tst-setcontext.c file needs ++ to be changed to pass long arguments to makecontext. */ ++ ++ ++void ++__makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...) ++{ ++ extern void __start_context (void) attribute_hidden; ++ greg_t *sp; ++ unsigned int idx_uc_link; ++ va_list ap; ++ int i; ++ ++ /* Generate room on stack for parameter if needed and uc_link. */ ++ sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp ++ + ucp->uc_stack.ss_size); ++ sp -= (argc > 6 ? argc - 6 : 0) + 1; ++ /* Align stack and make space for trampoline address. */ ++ sp = (greg_t *) ((((uintptr_t) sp) & -16L) - 8); ++ ++ idx_uc_link = (argc > 6 ? argc - 6 : 0) + 1; ++ ++ /* Setup context ucp. */ ++ /* Address to jump to. */ ++ ucp->uc_mcontext.gregs[REG_RIP] = (uintptr_t) func; ++ /* Setup rbx.*/ ++ ucp->uc_mcontext.gregs[REG_RBX] = (uintptr_t) &sp[idx_uc_link]; ++ ucp->uc_mcontext.gregs[REG_RSP] = (uintptr_t) sp; ++ ++ /* Setup stack. */ ++ sp[0] = (uintptr_t) &__start_context; ++ sp[idx_uc_link] = (uintptr_t) ucp->uc_link; ++ ++ va_start (ap, argc); ++ /* Handle arguments. ++ ++ The standard says the parameters must all be int values. This is ++ an historic accident and would be done differently today. For ++ x86-64 all integer values are passed as 64-bit values and ++ therefore extending the API to copy 64-bit values instead of ++ 32-bit ints makes sense. It does not break existing ++ functionality and it does not violate the standard which says ++ that passing non-int values means undefined behavior. */ ++ for (i = 0; i < argc; ++i) ++ switch (i) ++ { ++ case 0: ++ ucp->uc_mcontext.gregs[REG_RDI] = va_arg (ap, greg_t); ++ break; ++ case 1: ++ ucp->uc_mcontext.gregs[REG_RSI] = va_arg (ap, greg_t); ++ break; ++ case 2: ++ ucp->uc_mcontext.gregs[REG_RDX] = va_arg (ap, greg_t); ++ break; ++ case 3: ++ ucp->uc_mcontext.gregs[REG_RCX] = va_arg (ap, greg_t); ++ break; ++ case 4: ++ ucp->uc_mcontext.gregs[REG_R8] = va_arg (ap, greg_t); ++ break; ++ case 5: ++ ucp->uc_mcontext.gregs[REG_R9] = va_arg (ap, greg_t); ++ break; ++ default: ++ /* Put value on stack. */ ++ sp[i - 5] = va_arg (ap, greg_t); ++ break; ++ } ++ va_end (ap); ++} ++ ++ ++weak_alias (__makecontext, makecontext) +diff --git a/sysdeps/mach/hurd/x86_64/setcontext.S b/sysdeps/mach/hurd/x86_64/setcontext.S +new file mode 100644 +index 0000000000..99919ee2a8 +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/setcontext.S +@@ -0,0 +1,96 @@ ++/* Install given context. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#include "ucontext_i.h" ++ ++ ++ENTRY(__setcontext) ++ /* Save argument since call will destroy it. */ ++ pushq %rdi ++ cfi_adjust_cfa_offset(8) ++ ++ /* Set the signal mask with ++ __sigprocmask (SIG_SETMASK, mask, NULL). */ ++ xorl %edx, %edx ++ leaq oSIGMASK(%rdi), %rsi ++ movl $SIG_SETMASK, %edi ++ call HIDDEN_JUMPTARGET (__sigprocmask) ++ /* Pop the pointer into RDX. The choice is arbitrary, but ++ leaving RDI and RSI available for use later can avoid ++ shuffling values. */ ++ popq %rdx ++ ++ test %rax, %rax ++ jne L(pseudo_end) ++ ++ /* Restore the floating-point context. Not the registers, only the ++ rest. */ ++ movq oFPREGS(%rdx), %rcx ++ fldenv (%rcx) ++ ldmxcsr oMXCSR(%rdx) ++ ++ /* Load the new stack pointer, the preserved registers and ++ registers used for passing args. */ ++ cfi_def_cfa(%rdx, 0) ++ cfi_offset(%rbx,oRBX) ++ cfi_offset(%rbp,oRBP) ++ cfi_offset(%r12,oR12) ++ cfi_offset(%r13,oR13) ++ cfi_offset(%r14,oR14) ++ cfi_offset(%r15,oR15) ++ cfi_offset(%rsp,oRSP) ++ cfi_offset(%rip,oRIP) ++ ++ movq oRSP(%rdx), %rsp ++ movq oRBX(%rdx), %rbx ++ movq oRBP(%rdx), %rbp ++ movq oR12(%rdx), %r12 ++ movq oR13(%rdx), %r13 ++ movq oR14(%rdx), %r14 ++ movq oR15(%rdx), %r15 ++ ++ /* The following ret should return to the address set with ++ getcontext. Therefore push the address on the stack. */ ++ movq oRIP(%rdx), %rcx ++ pushq %rcx ++ ++ movq oRSI(%rdx), %rsi ++ movq oRDI(%rdx), %rdi ++ movq oRCX(%rdx), %rcx ++ movq oR8(%rdx), %r8 ++ movq oR9(%rdx), %r9 ++ ++ /* Setup finally %rdx. */ ++ movq oRDX(%rdx), %rdx ++ ++ /* End FDE here, we fall into another context. */ ++ cfi_endproc ++ cfi_startproc ++ ++ /* Clear rax to indicate success. */ ++ xorl %eax, %eax ++L(pseudo_end): ++ /* The following 'ret' will pop the address of the code and jump ++ to it. */ ++ ret ++PSEUDO_END(__setcontext) ++libc_hidden_def (__setcontext) ++ ++weak_alias (__setcontext, setcontext) +diff --git a/sysdeps/mach/hurd/x86_64/swapcontext.S b/sysdeps/mach/hurd/x86_64/swapcontext.S +new file mode 100644 +index 0000000000..79718a1fdd +--- /dev/null ++++ b/sysdeps/mach/hurd/x86_64/swapcontext.S +@@ -0,0 +1,120 @@ ++/* Save current context and install the given one. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ . */ ++ ++#include ++ ++#include "ucontext_i.h" ++ ++ ++/* int __swapcontext (ucontext_t *oucp, const ucontext_t *ucp); ++ ++ Saves the machine context in oucp such that when it is activated, ++ it appears as if __swapcontextt() returned again, restores the ++ machine context in ucp and thereby resumes execution in that ++ context. ++ ++ This implementation is intended to be used for *synchronous* context ++ switches only. Therefore, it does not have to save anything ++ other than the PRESERVED state. */ ++ ++ENTRY(__swapcontext) ++ /* Save the preserved registers, the registers used for passing args, ++ and the return address. */ ++ movq %rbx, oRBX(%rdi) ++ movq %rbp, oRBP(%rdi) ++ movq %r12, oR12(%rdi) ++ movq %r13, oR13(%rdi) ++ movq %r14, oR14(%rdi) ++ movq %r15, oR15(%rdi) ++ ++ movq %rdi, oRDI(%rdi) ++ movq %rsi, oRSI(%rdi) ++ movq %rdx, oRDX(%rdi) ++ movq %rcx, oRCX(%rdi) ++ movq %r8, oR8(%rdi) ++ movq %r9, oR9(%rdi) ++ ++ movq (%rsp), %rcx ++ movq %rcx, oRIP(%rdi) ++ leaq 8(%rsp), %rcx /* Exclude the return address. */ ++ movq %rcx, oRSP(%rdi) ++ ++ /* We have separate floating-point register content memory on the ++ stack. We use the __fpregs_mem block in the context. Set the ++ links up correctly. */ ++ leaq oFPREGSMEM(%rdi), %rcx ++ movq %rcx, oFPREGS(%rdi) ++ /* Save the floating-point environment. */ ++ fnstenv (%rcx) ++ stmxcsr oMXCSR(%rdi) ++ ++ ++ /* The function call destroys some registers, save ucp. */ ++ movq %rsi, %r12 ++ ++ /* Save the current signal mask and install the new one with ++ __sigprocmask (SIG_BLOCK, newset, oldset). */ ++ leaq oSIGMASK(%rdi), %rdx ++ leaq oSIGMASK(%rsi), %rsi ++ movl $SIG_SETMASK, %edi ++ call HIDDEN_JUMPTARGET (__sigprocmask) ++ test %rax, %rax ++ jne L(pseudo_end) ++ ++ /* Restore destroyed register into RDX. The choice is arbitrary, ++ but leaving RDI and RSI available for use later can avoid ++ shuffling values. */ ++ movq %r12, %rdx ++ ++ /* Restore the floating-point context. Not the registers, only the ++ rest. */ ++ movq oFPREGS(%rdx), %rcx ++ fldenv (%rcx) ++ ldmxcsr oMXCSR(%rdx) ++ ++ /* Load the new stack pointer and the preserved registers. */ ++ movq oRSP(%rdx), %rsp ++ movq oRBX(%rdx), %rbx ++ movq oRBP(%rdx), %rbp ++ movq oR12(%rdx), %r12 ++ movq oR13(%rdx), %r13 ++ movq oR14(%rdx), %r14 ++ movq oR15(%rdx), %r15 ++ ++ /* The following ret should return to the address set with ++ getcontext. Therefore push the address on the stack. */ ++ movq oRIP(%rdx), %rcx ++ pushq %rcx ++ ++ /* Setup registers used for passing args. */ ++ movq oRDI(%rdx), %rdi ++ movq oRSI(%rdx), %rsi ++ movq oRCX(%rdx), %rcx ++ movq oR8(%rdx), %r8 ++ movq oR9(%rdx), %r9 ++ ++ /* Setup finally %rdx. */ ++ movq oRDX(%rdx), %rdx ++ ++ /* Clear rax to indicate success. */ ++ xorl %eax, %eax ++L(pseudo_end): ++ ret ++PSEUDO_END(__swapcontext) ++ ++weak_alias (__swapcontext, swapcontext) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 14/58] gnu: git-minimal: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497817528 (code B ref 74290); Sun, 24 Nov 2024 07:57:08 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:18 +0000 Received: from localhost ([127.0.0.1]:60695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Td-0004YU-Jg for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TV-0004Vg-6q for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:09 -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 1tF7TQ-0001wm-0T; Sun, 24 Nov 2024 02:56: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=cCAl94rsMNTlvu6NprBvKee9APP2XEpDFhvQ0GdiLAg=; b=J+uoFIPNvQaBXIErmGgZ hJqIXzFAHn6S/5XX6J843qVCY5CbrP49Q9yJlHNCBaHbTPyclMbR9GJrKd9Tytf9tbaRioLNO2iAL YT8X7P6kxI3nWc8K/DvR+0a3ukqZvG5THLeB1BpecToUUepTDYOfqe+xO/fZV3DY3uMHOGrm7dRwH ldzbH59M+3wf3l7UhteNRjQibyCtxYqSpWZ+3H2Se8pzmF9X/sHRLkRXiyMsqHnw2dxFTw6mhIKIi Phu4xPCEFSb0aRfpI2O4xEbTGqPZ7BC6Uip/m1jAEnNBclS0mQmYqSMlwuj/sWEcnJ5grAWF6nIK8 8dvGWiqzHHQk5Q==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:37 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/version-control.scm (git-minimal)[arguments]: When building for the 64bit Hurd, or cross-compiling, 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c892a83a98..ca77b485ad 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -296,7 +296,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 (or (target-hurd64?) (%current-target-system)) + #~("-Wno-implicit-function-declaration") + #~())) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -305,7 +308,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. -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 16/58] gnu: libffi: Fix [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500417716 (code B ref 74290); Sun, 24 Nov 2024 07:57:08 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:44 +0000 Received: from localhost ([127.0.0.1]:60745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U4-0004bZ-6n for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ta-0004Wc-6B for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7TU-00022c-W8; Sun, 24 Nov 2024 02:56: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=lqpisiRgmw43Cx2rzKtRJIYjy0xr1729dZT+hDGieYc=; b=YMQoN3OPqUaVdXYjgMCT XgAFpRRxDXc+jeafKUVuObE98G/CdkPxYjfTm9bKQj+Re40Xp9xsYa48xEUr+jAK7laLi6V4M38e/ 4oY1/k0i/2Fhvy8nj6n5ysMQS1aoFjoMtr4EKHG7h1V4CcrZUJwKrCFj9UKRubJhMoq5nSskj8tSr VVs/rEgLX85tB/jUpZKPre4jVgl8Xhl1XE3Sa/3fPKkjmlQx/GZeYPJip8ZcLHMqJu2AWbj9ubh1S ImcG2i4ttlZQpkSIDAllkoOp3fjoQzfxpExRYvoQbAglm+slCu9doYwOFXexMhOmqZxtMXwjcxdJU lfXAzUdYte3R6Q==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:39 +0100 Message-ID: <59f0acb9eeb06db0050064945f58cc68320dbd92.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/libffi.scm (libffi)[arguments]: When building for the 64bit Hurd, or cross-building, add "CFLAGS" to #:configure-flags to disable breaking warning. Change-Id: I05bf3f460f3e292626de1894b7a3cf381cb07702 --- gnu/packages/libffi.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index ba3fc6bc79..62be8f0c4a 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2021 Maxim Cournoyer ;;; Copyright © 2020 John Doe +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,7 +61,12 @@ (define-public libffi `(;; Prevent the build system from passing -march and -mtune to the ;; compiler. See "ax_cc_maxopt.m4" and "ax_gcc_archflag.m4". #:configure-flags '("--enable-portable-binary" - "--without-gcc-arch"))) + "--without-gcc-arch" + ,@(if (or (target-hurd64?) (%current-target-system)) + (list (string-append + "CFLAGS=-g -O2" + " -Wno-implicit-function-declaration")) + '())))) (outputs '("out" "debug")) (synopsis "Foreign function call interface library") (description -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 17/58] gnu: perl: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243500517723 (code B ref 74290); Sun, 24 Nov 2024 07:57:09 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:45 +0000 Received: from localhost ([127.0.0.1]:60747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U4-0004bh-LV for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tb-0004Wo-6v for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7TV-00022l-W4; Sun, 24 Nov 2024 02:56: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=UIwR6zWpgjQu9Ditvecz9ZJh7DyV0oKKw+QUwHm+1Vs=; b=LZKxVsGeEa3xnCBBp9KE b2haTVV4L0UourfbkXHbqgeJ8uQnj2WIMpa3Lz8FhhUgbSHJgm2nl4SdENyrGa+RvmGfB5XG8mBl+ twbw4DWqpdtEpxTHzZd1i9UatRrEcNMOFUE8pAfYRrTfZsGQIMv7TrIDBaWzEUYkqdbUs3L4TBgnK NTGnuUwe3UR0C45XHT3h2OxryBgjmD32MYcL56/rGDI+R8/hA2y+4H1GOj3KuWSa8XvrxxTRTfvhZ IdiHtiKl/YBPpai8nauHBAZH+hDbsRPahZ9QqnG0l5LQg2Fc+YDH3KEvkDWSvvz+OqpI0q8nNFGpk d1V4Y7hsOWRBOg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:40 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cross-base.scm (perl)[native-inputs]: Update perl-cross to 1.6. Change-Id: I4a77f51a6757ad4aed9bcca8f9bbbf2cbd162e15 --- gnu/packages/perl.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index faaac13bf1..3941ad4831 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -248,14 +248,16 @@ (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 "1.6")) + (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 + "0s06lkx5b79r9cn6pm5p6d4jbdjq7wg7rjr75nw5xdhw1z3wnl2d")))))) '())) (native-search-paths (list (search-path-specification (variable "PERL5LIB") -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 18/58] gnu: texinfo-4: Fix [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500517737 (code B ref 74290); Sun, 24 Nov 2024 07:57:10 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:45 +0000 Received: from localhost ([127.0.0.1]:60751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U5-0004bq-0n for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60282) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tc-0004X0-0p for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7TW-00023G-QM; Sun, 24 Nov 2024 02:56: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=4B7O21e4Ya9ExhiXsAGVMXRIEvNrT7qik/64Z91abLc=; b=JeE0k6wDad6BajQKTvpa RqOV2Rc2rtx/AxtgBq59PN9R/nkaaro5kDzH3RUemzkgxrLOBJkUiRB9uGYFDaEAoVpNPPfzwl267 vwad6AnjZToxXdN7gy0dQd/i3At1iYSOYz3VycAjmw6V9NlpjcG4zOgihbvPQcxmp/dPS0zknjlI/ JDQu8GArfEQjYGpNWNuipv3MJN38POjqJzv4oWWe4d6r72ieSiEctb+MWuf1vjnZIzP0aQWqz0SOU zTXbLGK1bh71LGY6RuGHGv5+HMFnWCet7Wu4wJlv87GYlWCe5JW/mUk8hx3aM++8NqwSYvK9RThwX 61OV98/5tJWLrg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:41 +0100 Message-ID: <0df7f97acfd57a4c72d50058213c2af0a05ea8f8.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/texinfo.scm (texinfo-4): When building for the 64bit Hurd, or cross-compiling, 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 98429cb059..13c780897e 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 ( ;;; @@ -169,31 +169,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 (or (target-hurd64?) (%current-target-system)) + (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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 19/58] gnu: hurd: Fix build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500617744 (code B ref 74290); Sun, 24 Nov 2024 07:57:10 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:46 +0000 Received: from localhost ([127.0.0.1]:60753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U5-0004c2-O4 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Td-0004XP-3w for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7TX-00023m-TV; Sun, 24 Nov 2024 02:56: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=GYJYDWvcaLLc+ShZiUmXRy2h4jwaJDQffy5hjWiHZEI=; b=TAvOJaqSViE9H2+44MLV dLfxCQkUIGrzFrwK3t7/aRM/jpmqFB3CHGUCm3qlB2XO9YAd4ZPaQqZ9pxdvIrMBIKy18iiDrIgfX /UmMWTBOGY+onDyegbsJBQKgjwlCjea7MeJpb/VCs2uOgrlyklHLP4t3jfO+qrJbj3AqEkf6NRo8O MzwmZsJz31rHKfsRqs8ORkCfUs9Fzjg8bsCtBjrp2UdJTOyHgfsIAkZRq7ChXQNZx47OfzfY89JfI 32AzcDq0ooMK0ABMRyzjEPt8MA5xrdp8OWGLmpFn2lLspu5IKEEGitqjTEJvUUplI8wYrZHuIYpWu tIAqXcISNkE6JA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:42 +0100 Message-ID: <3abc1600e1c1610e5b9e64edcbe83ddf805b7dcd.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (hurd)[arguments]: In phase "build-libdde-linux", disable some warnings breaking the build, using "WARNINGS=...". Change-Id: Ib70926a90e1d37080c5b9dd333f19636cdae3013 --- gnu/packages/hurd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 06fae1bd3b..5a60d8ac13 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -478,6 +478,12 @@ (define-public hurd "/bin/bash") (string-append "CC=" ,(cc-for-target)) + (string-append "WARNINGS=" + " -Wno-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -Wno-int-conversion" + " -Wno-strict-prototypes") "ARCH=x86"))) (add-after 'install 'install-goodies (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 20/58] gnu: netdde: Fix build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243500617758 (code B ref 74290); Sun, 24 Nov 2024 07:57:11 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:46 +0000 Received: from localhost ([127.0.0.1]:60755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U6-0004c9-3I for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Te-0004XZ-5D for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7TY-000250-VR; Sun, 24 Nov 2024 02:56: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=xEF0ll7dUIqVcV6ikDQ7f4MB3hi/jMUESKOS+d4IpDk=; b=YoSgglIuWphngw3rBEoc bsJthnALkn9W8AhNKRuwqk8wwBUUwR+x7GCnO+XLT1sYmx8Wh3LiKVR3v9+0aEjjLudoAp5pTwe9q YKO1Z2sHqgSDhEegm0hs6fr45zsxAxAzkjfKIdI2RZU7wpN8GjwgYagjFJJM8Qzrgfx+/SlHEUaBj pG7srhsUMpz7vTftAJ5gzOvyzhYIv1eu9knE9Isd0+sQ1AuubajZFP4o6kC5G12xjfFoqLXGsJMnp W+aAIlx3IZySkQusDtDZoUBIK/pE+mImZbPFQR1OAhM7Dn/y06UqiZutwYYuCr4Pn976VCz637ce3 NpnQVrpnNLvbBw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:43 +0100 Message-ID: <6728e032b55db76586c30bbeeb87f59c71e0def0.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/hurd.scm (netdde)[arguments]: Disable some warnings breaking the build, using "WARNINGS=..." in #:make-flags. Change-Id: I39f577c51eaa3d86abf80a54f7c172324cf56749 --- gnu/packages/hurd.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 5a60d8ac13..5fdb6359d1 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -592,6 +592,12 @@ (define-public netdde (search-input-file %build-inputs "/bin/bash")) "PKGDIR=libdde_linux26" (string-append "CC=" ,(cc-for-target)) + (string-append "WARNINGS=" + " -Wno-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -Wno-int-conversion" + " -Wno-strict-prototypes") "ARCH=x86") #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 21/58] gnu: libedit: Fix [cross-]build with gcc-14 for 32bit. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:12 +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.173243500717766 (code B ref 74290); Sun, 24 Nov 2024 07:57:12 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:47 +0000 Received: from localhost ([127.0.0.1]:60759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U6-0004cN-HB for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tf-0004Xo-7n for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:20 -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 1tF7Ta-00025Q-12; Sun, 24 Nov 2024 02:56: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=iZ7gvj8TZhmo++vO5wvgaIjArhnfvdAxNWoJeaXJfSU=; b=B8FXbAfUq4z1yM9UDITM DuMfY3NtnKaQObM5jkYw6xJG5sofichjDOn3UydXtTtHpMIKZJtDgX+IIVP//QxN7umVum5FaPOOZ 8mzWw0+0guPQ5q4dEJNgP8tZwDwrkhKnjZq0aWp027Owp903zCFrWk/WhpvR+4yIcIljBj0/f9HMs fxklHb9cuK6z6kaFlQswxSFZe20QaIO/2KrL9hff8P0V5gr37WgAfeCSqYHSR9rnFzH4BXMWwtrj9 680lPkqWriQ5s5cawK+3702dvLgsxKrXsPEiZBCdk+NphLLa58VaMvJX8WnNyc40B9LR5kTBuSb35 pqLiln5Hv90NTw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:44 +0100 Message-ID: <8a26c747401226b6e942ab890fe2e605b6bd8680.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/libedit.scm (libedit)[arguments]: When cross-compiling to a 32bit host, add CFLAGS to #:configure-flags to disable a breaking warning. Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922 --- gnu/packages/libedit.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/libedit.scm b/gnu/packages/libedit.scm index f04d3aafe4..252f8a4966 100644 --- a/gnu/packages/libedit.scm +++ b/gnu/packages/libedit.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,8 +22,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libedit) + #:use-module (guix gexp) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages ncurses)) @@ -39,6 +42,11 @@ (define-public libedit (sha256 (base32 "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v")))) (build-system gnu-build-system) + (arguments + (if (and (%current-target-system) (target-x86-32?)) + (list #:configure-flags + #~(list "CFLAGS=-g -O2 -Wno-incompatible-pointer-types")) + '())) (inputs (list ncurses)) (home-page "https://thrysoee.dk/editline/") -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 22/58] gnu: libssh: Fix [cross-]build with gcc-14 for 32bit. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500717774 (code B ref 74290); Sun, 24 Nov 2024 07:57:13 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:47 +0000 Received: from localhost ([127.0.0.1]:60761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U7-0004cV-56 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tg-0004Y4-6A for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Ta-000279-SH; Sun, 24 Nov 2024 02:56: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=Tzx7sfpF6zPexd9qQ5YlxNXlGGlqiXkutTcT8A/yEyU=; b=NZfELuWkamhIxOk3wu98 vdOvdSdPDX1u5+pLBOE805s6NBAy9vN752UReEgP3KOq27w3+ffgamOhdh/e29AIXRavqu4W/DpU4 DJYc8I5Dq8oNg4SiYeIjIflV0N8PFiXGIHiE8UkCCWliznxO4IEH8DAfWHZNG6lR9ijbwD85031O3 SxyCGmWkJ+/gdsqjNjRRqOcll79gdLHs7zz4WTnyh6GNp4Ikj2YS/IPLmJbUFxvskvYl5+gT6P6e6 05XI3u8QIoPOkERi69PV7iLnOJ901D2M2//PeUy0u6AKVfKwHl7khfjWne+tjvmQ9Xzy/JaWLothP chw1qxCACpRSUg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:45 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ssh.scm (libssh)[arguments]: When cross-compiling to a 32bit host, add CFLAGS to #:configure-flags to disable a breaking warning. Change-Id: Ibab7332af162aed38158a50e9b4fc288b4286922 --- gnu/packages/ssh.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a29a10e954..1f33259246 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019, 2020 Mathieu Othacehe -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire @@ -156,7 +156,12 @@ (define-public libssh (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - '(#:configure-flags '("-DWITH_GCRYPT=ON") + `(#:configure-flags '("-DWITH_GCRYPT=ON" + ,@(if (and (%current-target-system) (target-x86-32?)) + (list (string-append + "-DCMAKE_C_FLAGS=-g -O2" + " -Wno-incompatible-pointer-types")) + '())) ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. #:tests? #f)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 24/58] gnu: cross-base: Update %xgcc to gcc-14, to 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: Sun, 24 Nov 2024 07:57: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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500817782 (code B ref 74290); Sun, 24 Nov 2024 07:57:13 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:48 +0000 Received: from localhost ([127.0.0.1]:60763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U7-0004cc-Hg for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Th-0004YK-Q8 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tc-00028E-Jl; Sun, 24 Nov 2024 02:56: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=Y7bvj7bLCTrW/89zMFH39GYUzblPVrQRZUmycBA/1Do=; b=UzCaIM6Be/rosVHsM3zX O9CcM6yo4+sV63zQDj3ijfiNtQzmc5iikGFsS7argNWwhrwtCGTyIJeI1rOggE5DAqFLIBmtXX3Bp zpTDwibY1CD6GWPdlIcCAz/5hymSwztXwNle5CyprBg4v792r37RRGsZNGOv8y6r2PeHSKyBkG4b/ GCRwWIXsrn7X/UNokQH+X3ykVSodz5OxxM3xyVc8TVgu8gd1CK/o9LUcYQMTHaGEfLGNvEeZtL0a8 95AYSgezB8MvJCFDQK3jPO9h2Q6rS7rJDB1gi3yEHiIVVDZobtbmaUd3q7SrhSPrtBakMb52WAVIc l3B450XxWJeb3w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:47 +0100 Message-ID: <48c6f9f4ee43695e8d7fddf846c98a866dfc8def.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Gcc-14 adds support for the 64bit Hurd. * gnu/packages/cross-base.scm (%xgcc): Bump to gcc-14. Change-Id: Idf7696c50532aa4def2b2d37cdb5c70715125123 --- gnu/packages/cross-base.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 4961b3b4c0..ad3616eaba 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 gcc-14)) (define %gcc-include-paths ;; Environment variables for header search paths. -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 25/58] gnu: gcc-14: Force libdir /lib instead of /lib64 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: Sun, 24 Nov 2024 07:57: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500817789 (code B ref 74290); Sun, 24 Nov 2024 07:57:14 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:48 +0000 Received: from localhost ([127.0.0.1]:60765 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U7-0004cl-US for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ti-0004Yd-Mv for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Td-00028N-GI; Sun, 24 Nov 2024 02:56:17 -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=o16PcGBBIDH33qhom8xsBinAoQX9bS+xb+wYH7j+BUc=; b=caNlTXm7tST3cvu++t1t YdfYVAozU+nSqfFepcZML/Kfev9R2S2lEPudLu0nHGKTyIXjlue4q7NKPhEO7YCWS7ThPQWna6Lq+ oI9oUgtNjPO+dT3TDiMDH01OftqKgbhl75KKwEKqWPZ0Ogc7GuF0wr7K52OVlpQfqUsytHCJsAGtl j1DjqNx5ko3HSWBSa3D8hj78dO/eHPCJCgpqlkAHgNr19Q7+sJGIPpp/4ZiTmy5I2Y0SZLcBli9nG rOsKuVoZCiw84JFuCbToj544+BM4fwpnl8heqRR1iqQRfvxsCuNEK1i/okBuFd9ncYyTROhKnVQZC CfYrQQP8j2knLA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:48 +0100 Message-ID: <07b8a9d99607011e815e015d92aa161aebe4b722.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/gcc.scm (gcc-14)[arguments]: In stage "pre-x86-configure", also patch "gcc/config/i386/t-gnu64". Change-Id: Ib2607c5f315c49696596fdcbcbbcc2895b6a9775 --- gnu/packages/gcc.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 64ba37fd69..e437bf5826 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -843,7 +843,8 @@ (define-public gcc-14 #~(modify-phases #$phases (add-before 'configure 'pre-x86-configure (lambda _ - (substitute* "gcc/config/i386/t-linux64" + (substitute* '("gcc/config/i386/t-linux64" + "gcc/config/i386/t-gnu64") (("\\.\\./lib64") "../lib")))))))) (properties `((compiler-cpu-architectures -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 23/58] gnu: guile-lzlib: Support [cross-]build with gcc-14 and 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: Sun, 24 Nov 2024 07:57: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500917803 (code B ref 74290); Sun, 24 Nov 2024 07:57:15 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:49 +0000 Received: from localhost ([127.0.0.1]:60767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U8-0004cs-9h for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tg-0004YH-VQ for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tb-000283-Oh; Sun, 24 Nov 2024 02:56:15 -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=8M4Se2G0z5j9rnEsYXphTkJWt/+tkYJEhC0ET8Pjbfk=; b=T1YQoHn52nMu98k0VZJg Rwjy/8y59QasbBcreSnX/sZ76lx+JcPcMg5UiqbbPcBwYjj7/34IPGymmeIySaXi5Gg1GvgEY56XP 2SHrsUVqrcW4BhiV5P7Bz+QX/AINHPtEQJ0AmOljDkwdYC+2ALo3RfRHgztjTHYzke4xFtyLNFe7V feOT3xHvlyitveuyG4mz+nREeSFQqSDrLF0emobd9oYxBwa12rwmP0x3c/20uCmGDRHI3hx9n+Nsz WP7FPdWrj8B4nycKS+AW5hu/HNEdis2dGEWuCeSfDkOKJUfSAAgCbdp5qfUCxow320lsXBsK6D0TO /7GIXyHk18PhGA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:46 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/guile-lzlib-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/guile.scm (guile-lzlib)[arguments]: Use G-expressions. When building for the 64bit Hurd, or cross-compiling, use it in new "apply-hurd64-patch" stage. Change-Id: Id03f71baa80e2f4f967f54037ce7d9f1c5dc4bb6 --- gnu/local.mk | 1 + gnu/packages/guile.scm | 16 ++++++++-- gnu/packages/patches/guile-lzlib-hurd64.patch | 32 +++++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/guile-lzlib-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index f15272f25c..3df0d4effa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,6 +1515,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-hurd-posix-spawn.patch \ + %D%/packages/patches/guile-lzlib-hurd64.patch \ %D%/packages/patches/guile-present-coding.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-ssh-rename-bool.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8dabbb2c5e..69dff9211f 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver ;;; Copyright © 2015, 2017 Christine Lemmer-Webber -;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Andy Wingo @@ -962,8 +962,18 @@ (define-public guile-lzlib "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (list + #:make-flags #~'("GUILE_AUTO_COMPILE=0") ;prevent guild warnings + #:phases (if (or (%current-target-system) (target-hurd64?)) + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "guile-lzlib-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~%standard-phases))) (native-inputs (list autoconf automake pkg-config guile-3.0)) (inputs (list guile-3.0 lzlib)) (synopsis "Guile bindings to lzlib") diff --git a/gnu/packages/patches/guile-lzlib-hurd64.patch b/gnu/packages/patches/guile-lzlib-hurd64.patch new file mode 100644 index 0000000000..12e8c3617d --- /dev/null +++ b/gnu/packages/patches/guile-lzlib-hurd64.patch @@ -0,0 +1,32 @@ +Upstream-status: Presented upstream. + +From 80dcd31562827f4b6d085affe9d9f22164f7ed34 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 15 Nov 2024 16:18:29 +0100 +Subject: [PATCH] build: Support the 64bit Hurd. + +* configure.ac: When cross-compiling declare LZ_decompress_open before +using it in conftest.c. +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 50dc5ac..4c56768 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,10 @@ AC_DEFUN([GUILE_LIBLZ_FILE_NAME], [ + [if test "$cross_compiling" = yes; then + # When cross-compiling, we cannot rely on 'ldd'. Instead, look + # the output of 'ld --verbose', assuming we're using GNU ld. +- echo 'int main () { return LZ_decompress_open(); }' > conftest.c ++ cat > conftest.c < Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243500917810 (code B ref 74290); Sun, 24 Nov 2024 07:57:15 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:49 +0000 Received: from localhost ([127.0.0.1]:60771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U9-0004d6-34 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tj-0004Yn-GM for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Te-00029q-9X; Sun, 24 Nov 2024 02:56: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=BVm5Zb7pzY+EdGpPmReBiK5VXpxD069JAF12x72F+ig=; b=WsHGP4aBzY0E2WGmcXen cz7D8TDwUab8vzf7jtmk0196dRxKJ40bQJHvHB0QH4Fs/RbJf/ruV9mbbwft6XcYTYt0GjJ9EpyUP mfhQKpO9XhdVKcbWUHYciUQErGsCjAlq+SHE49mWcG28L7UojUu68AB3GbCVeATwXcImpPXfreYAG 9S0oRkyhalEEP4hlmMM1XqZhmkxfRSyrhfyyqeCclXZ0T4BxHEh8x2eLFuDOPXwllcVp3iXd9JQEb XxlchX42hqaCg2i4v9SSUF3w+DMk+1P4RNFwrRY+62eDOqDvJk1qrEBUBCRlhNq/JYCwJEmlSLf/G thUBg/OrPTs99w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:49 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This fixes findutil's gnulib-tests's test-sigaction's raise call, by working around an alleged gcc-14.2 optimization bug. See . * gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (glibc/hurd): Use it. Change-Id: I11e683f521f34dedeb7f739a2545f5d1d866922a --- gnu/local.mk | 1 + gnu/packages/base.scm | 3 +- .../glibc-hurd64-gcc-14.2-tls-bug.patch | 28 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3df0d4effa..6164ee45c7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1439,6 +1439,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-pthread_setcancelstate.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch \ %D%/packages/patches/glibc-hurd64-fault.patch \ %D%/packages/patches/glibc-hurd64-intr-msg-clobber.patch \ %D%/packages/patches/glibc-hurd64-sgms-context.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 80e53c2e52..cbce8bd634 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1598,7 +1598,8 @@ (define-public glibc/hurd (search-patches "glibc-hurd-pthread_setcancelstate.patch" "glibc-hurd64-fault.patch" "glibc-hurd64-intr-msg-clobber.patch" - "glibc-hurd64-sgms-context.patch"))))))) + "glibc-hurd64-sgms-context.patch" + "glibc-hurd64-gcc-14.2-tls-bug.patch"))))))) (define-public glibc/hurd-headers (package/inherit glibc/hurd diff --git a/gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch b/gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch new file mode 100644 index 0000000000..5823a230fd --- /dev/null +++ b/gnu/packages/patches/glibc-hurd64-gcc-14.2-tls-bug.patch @@ -0,0 +1,28 @@ +From 0b23ab98d25d880ee602af91e62aa39564510cac Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen +Date: Fri, 22 Nov 2024 16:26:08 +0100 +Subject: [PATCH] x86_64-hurd: sigreturn: Hack around gcc-14.2 optimization + bug. + +See: . + +* sysdeps/mach/hurd/x86_64/sigreturn.c (__sigreturn2): Add nop. +--- + sysdeps/mach/hurd/x86_64/sigreturn.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sysdeps/mach/hurd/x86_64/sigreturn.c b/sysdeps/mach/hurd/x86_64/sigreturn.c +index 7a0193497d..256cc1268a 100644 +--- a/sysdeps/mach/hurd/x86_64/sigreturn.c ++++ b/sysdeps/mach/hurd/x86_64/sigreturn.c +@@ -45,6 +45,7 @@ __sigreturn2 (struct hurd_sigstate *ss, uintptr_t *usp, + (void) __mach_port_mod_refs (__mach_task_self (), reply_port, + MACH_PORT_RIGHT_RECEIVE, -1); + THREAD_SETMEM (THREAD_SELF, reply_port, sc_reply_port); ++ asm ("nop"); // See . + + asm volatile ( + /* Point the stack to the register dump. */ +-- +2.46.0 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 15/58] gnu: flex: Fix [cross-]build with gcc-14. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243502517951 (code B ref 74290); Sun, 24 Nov 2024 07:57:16 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:05 +0000 Received: from localhost ([127.0.0.1]:60803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UO-0004fL-Kt for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TZ-0004WU-CT for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7TU-00022I-69; Sun, 24 Nov 2024 02:56: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=9l4KVSOnda24IMPFgajqnKj4x3vM9NTeG2XRYAyA4Hg=; b=frhJZb7s3+SJ991Bjki4 HRUjnvm3qskS+wVVGguLdDe37c8q0daUSoG5Bk+pCHM3uSRF8lQCIxMqMJ81gKzlzvVqu/b+jjcIG uy/Io+e70HE0FrGplr+jryIECY5FlgfY0AgqGp6P5Nn87jSvmyXTkAulzEVmYbi3iKVgOyYSQmfUx Phwn6SxajqrjeGK80weOQ2ZSenQJMPXK4kRzOXeui1xTmXeCOHgDPS276h6QjciiUEbvmAfY6vXTX a71QmOBUcghGTqyGD6DQXHxeJ+s313LDnx8UhZzjEc/bu5oEHxTxDEaXa4+bIbllG5zFRMgAgRY8A EvTWAAaRXqJvbg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:38 +0100 Message-ID: <465ee53122e00749ced0cfa940b789bfa2af4fca.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/flex.scm (flex): When building for the 64bit Hurd, or cross-compiling, 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..4ad1e1382a 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 (or (target-hurd64?) (%current-target-system)) + (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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 27/58] gnu: make-bootstrap: Update gcc-static to gcc-14, 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: Sun, 24 Nov 2024 07:57: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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243502517961 (code B ref 74290); Sun, 24 Nov 2024 07:57:17 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:05 +0000 Received: from localhost ([127.0.0.1]:60807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UP-0004fU-3K for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tk-0004Yt-Fr for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tf-0002BU-6l; Sun, 24 Nov 2024 02:56: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=1B8MPLM0v1P1/vnvx5RLM/LODq+I1B3+M3XWeOkGel4=; b=MBZG11nn1YLCzs5N+4FT ieGo6Rulk1dYKKIiUdkk5Rnor99wBYjPTr9dHH+6DZz3BIR8W5hPjBA59LF6+uptOeXG66pBTWyu0 exn63zSMYLzIwt1l0h7UUFDzy05e3CMqj84SlbhDdzYaldNcLmkGXEycu4qAqP+TZ5afl3xPIk23g kIP5DZKpHgzoamZkcOo24w2FxgfwzpcoIMbgvyohHq9sKBCJBSVlbeI+yXWB5Hl/hCkteimvWzhl8 wPpNBUtReYzlg/iinqYXFwGO/Nk2kilVI9gpZ9hdEt9cVksPTp4iWWJkR5m/k+Y5m4q94p500jgZI 6KBrD8vQJ1BRtQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:50 +0100 Message-ID: <417cc042f45d6107ca5014cf099e2cb5a3869051.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/make-bootstrap.scm (%gcc-static): Use gcc-14. Update to use G-Expressions. [inputs]: Remove libstdc++ and libstdc++-headers. (%gcc-stripped): Use gcc-14. [inputs, native-inputs]: Clear fields. Change-Id: I4e6d779cb457b256d80d1882f182b72a6f7d2be2 --- gnu/packages/make-bootstrap.scm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 689d48d342..e0dcca7b33 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -488,11 +488,11 @@ (define (%glibc-stripped) (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc) + (package (inherit gcc-14) (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments (package-arguments gcc-14) ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) @@ -501,7 +501,7 @@ (define %gcc-static ((#:guile _) #f) ((#:implicit-inputs? _) #t) ((#:configure-flags flags) - `(append (list + #~(append (list ;; We don't need a full bootstrap here. "--disable-bootstrap" @@ -526,9 +526,9 @@ (define %gcc-static "--disable-libssp" "--disable-libquadmath") (remove (cut string-match "--(.*plugin|enable-languages)" <>) - ,flags))) + #$flags))) ((#:phases phases) - `(modify-phases ,phases + #~(modify-phases #$phases (add-after 'pre-configure 'remove-lgcc_s (lambda _ ;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in @@ -538,12 +538,12 @@ (define %gcc-static (substitute* (cons "gcc/config/rs6000/sysv4.h" (find-files "gcc/config" "^gnu-user.*\\.h$")) - ((" -lgcc_s}}") "}}")) - #t)))))) + ((" -lgcc_s}}") "}}")))))))) (inputs `(("zlib:static" ,zlib "static") ("isl:static" ,isl "static") - ,@(package-inputs gcc))) + ,@(fold alist-delete (package-inputs gcc-14) + '("libstdc++" "libstdc++-headers")))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -556,17 +556,19 @@ (define %gcc-static ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc)) - (package-native-inputs gcc)))))) + ,@(package-native-inputs gcc-14)) + (package-native-inputs gcc-14)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. (package - (inherit gcc) + (inherit gcc-14) (name "gcc-stripped") (build-system trivial-build-system) (source #f) (outputs '("out")) ;only one output + (inputs '()) + (native-inputs '()) (arguments (list #:modules '((guix build utils)) #:builder @@ -632,6 +634,7 @@ (define* (make-guile-static guile patches) (propagated-inputs (modify-inputs (package-propagated-inputs guile) (replace "libgc" libgc/static-libs))) + (arguments (substitute-keyword-arguments (package-arguments guile) ((#:configure-flags flags #~'()) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 28/58] 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: Sun, 24 Nov 2024 07:57: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 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.173243502717989 (code B ref 74290); Sun, 24 Nov 2024 07:57:18 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:07 +0000 Received: from localhost ([127.0.0.1]:60809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UP-0004fn-Ps for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tl-0004Z0-Jh for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tg-0002Bd-6E; Sun, 24 Nov 2024 02:56: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=pJOnriogFqUmWVWBEECU2E1NMVtAsSCsZ4+v81K9wj0=; b=fBY/zVBRE9dpS6a03Mqc bnqcC01M9xoqWttVTRA26PBRGftnZqRi3/Xo+NfPfEUyIwIzh3xGvLsBDyJoFAwAOSNwuqEIubQyj 2/wEiJfBMThPGdk25rIim7Qp3n7Su4cpApXq4WNtoUH6AYZF8YyI/a6fxaZtn/ggrU6XdhBQbVppA OBGVhmHgtcuvUsc7jmJy1uIXewsp6tCe08xfzztzDracSD98egPO6BLJ6zeCvhIlZLYQPF4HFzQBW AjCskgSftLSOk/8AMmVVe3WC+gm02ZrFj9oGi0NI4bH5UIOgPq/8RM0Elz0HbKUH2X4if3QwVgd9f tvpwNU1gQldQFw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:51 +0100 Message-ID: <767111b9284fbd2980452205459f446cbc75a5cc.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) XXX TODO: v Boot a 64bit hurd, and v Guix shell --bootstrap -D -e '(@@ (gnu packages commencement) gnu-make-boot0)' v Guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' o Guix build hello, o Guix shell --bootstrap -D guix, 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 Write hurd64 blog post! On commit: cdf94aaceabe243a128e404585f4795391b12eb5 gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd. Run: ./pre-inst-env guix build --target=x86_64-gnu bootstrap-tarballs Producing: /gnu/store/w1n7bdpn88plcc49h7n0jriaj41sgwx8-bootstrap-tarballs-0/ With guix hash -r: 15cb1xh7s2hhp8s0d81bjnw1759w9sh7ckc9n5jq2f3rqw6z76by * 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: I828159aedb3f66caba98e935083cc3682429f219 --- doc/guix.texi | 9 ++++++++- gnu/packages/bootstrap.scm | 36 +++++++++++++++++++++++++++++++++++- guix/packages.scm | 8 +++++--- m4/guix.m4 | 12 +++++++++--- 4 files changed, 57 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5953fcfa26..08665ff4e0 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 27798fe278..8027918323 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 "1xvhwyvamlcva01zv6pz7br7d2lgq5qd14misi8wffxc78c4lndk")) + ("mkdir" + ,(base32 "1c5irkgxaxpwlxzf68xg47j7m6ibd9xqvxznlml42nhfnrka447s")) + ("tar" + ,(base32 "0ak7sri6294y1g3ia1yrf7facxc7dij02mlxi4xg6k5yszv1jd3w")) + ("xz" + ,(base32 "0zz9pgw0pyadqsq9nvvpiryk1gpmm89754m6xlqh4ssbbvzpk3y6"))) ("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 "/20241122/" 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" + "/20241122/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" @@ -387,9 +399,11 @@ (define (bootstrap-guile-hash system) ("powerpc64le-linux" (base32 "1rnyfz5q38jyvxddj617443bnnzql4vw0mxzqpj8wz48wx4bhbq0")) ("aarch64-linux" - (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) + (base32 "1ymp3lck1l5fybsa542ny2fdkfydfcfvqbgr3qh03yvq4fwfn6mc")) ("i586-gnu" (base32 "0wgqpsmvg25rnqn49ap7kwd2qxccd8dr4lllzp7i3rjvgav27vac")) + ("x86_64-gnu" + (base32 "109p34v8fgxznxdyb90y74qj6ppwgb5qj0c2pa3gxba7x1r0p4k1")) ("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" + "/20241122/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 + "04zksa2457h1vcl5ry2hyzhhsg8fckvfdgadp0viba3anwms2463")) ("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" + "/20241122/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 + "1fasv76rppnqlshjqc7dbzngic9cqswi5ydzg6w9rc075daqk8kb")) ("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" + "/20241122/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 + "1w4h91kxl64a62l646966i73zp2cj6w4dmyc64fh0c1hhdykxass")) ("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" + "/20241122/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 + "1cgbhc76hlccx6v2z7kk7z173lryyq3la5mmbwivl6hbl1zcqg3m")) ("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]) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 29/58] system: image: Add hurd64 image types. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243502718006 (code B ref 74290); Sun, 24 Nov 2024 07:57:18 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:07 +0000 Received: from localhost ([127.0.0.1]:60815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UQ-0004g6-VN for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tm-0004Z8-Uh for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:27 -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 1tF7Th-0002CI-Nr; Sun, 24 Nov 2024 02:56: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=PyhNVzNTCBqNggG0y5zxgIrF7PsKideagxLANCne5eQ=; b=Z3A9xmpvRhg6gQI27hO+ KAFmL2pOuxsp5ltvT5Sf3IL1i7RFwd5Kg9oYzLq3Qhs+u9+2I4oopygVi2J6clDnvRJZ2yEmj+54z XX3kAzAGMYL6pZpipFsjErY/IncVrvjST5W4u43vmKvDHvAvxeJkxx+Uy33YqKxC5mCWIYa3gx3o+ r+aIHZcSWp/4ZhSWqdEptwE1r/vIKHEGEqy0juPOkZkjw7YlqcFpGNstnWtSCZ00F65/8aedFWEI2 bEQnhFaCLytGtnPySp7wbe2/7EO3B3Any0MJRmxElPG8tndNXSreUgdFXRl6Se6pRBgxQhb1Bf+rk N1R+XrCOePxWkQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:52 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 30/58] gnu: libgpg-error: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243502818021 (code B ref 74290); Sun, 24 Nov 2024 07:57:19 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:08 +0000 Received: from localhost ([127.0.0.1]:60817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UR-0004gI-LX for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tn-0004ZE-Sh for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:29 -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 1tF7Ti-0002CQ-MG; Sun, 24 Nov 2024 02:56: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=CeIObxsqShvSjynZmD7Je9VEBGX3z5DA81ADCJXWCKg=; b=opZx3pnwwN+denBBs5qz 2GNx96XuOq5jGb4yr4t5ihfgdBqIWnX+yGoYomBwpXsN0f/bzosdteimbC9GEXZWmpo7spL7pigc2 bi6TNVSc2hjag0YCnZYGqfQPOQ8UQ4RVWfbq56VRQbgtEYujeYpOuw0InDNeca9xesPQ25zLpZv4i 3x7D7NGLKJUSbi5A6NJeeyBP/LlgZz+HPavqutcUEAJaKSDUVxdflqZMvFvwuKsblDDzCwZ3xgqvz Dt97QUEs4vp7ABwSaT+c3aExkJ/o6k6b9uUSGWW5LOW+aLhD0iXEQ5f2ef19NW9pdZBisl4U5kbq1 t0Omh6AKDUK5ug==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:53 +0100 Message-ID: <8f4776c2f9dd03aa65b234b54b91c8edcdebf16e.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/libgpg-error-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnupg.scm (libgpg-error)[arguments]: Use it when building for the 64bit Hurd. Change-Id: Icabb7cd7bb5bcc771ccee5b8a7f57f52b9b58183 --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 22 +++++- .../patches/libgpg-error-hurd64.patch | 78 +++++++++++++++++++ 3 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/libgpg-error-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6164ee45c7..52239fb0e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1625,6 +1625,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ + %D%/packages/patches/libgpg-error-hurd64.patch \ %D%/packages/patches/libguestfs-syms.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2e97c2244a..6535f94cb8 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. @@ -144,9 +144,25 @@ (define-public libgpg-error ;; configuration, as this is not correct for ;; all architectures. (_ #t))) - (#t #t))))))) + (#t #t))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "libgpg-error-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch))))) + #~()))) ((system-hurd?) - #~((add-after 'unpack 'skip-tests + #~((add-after 'unpack 'apply-hurd64-patch + (lambda _ + (let ((patch + #$(local-file + (search-patch + "libgpg-error-hurd64.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch)))) + (add-after 'unpack 'skip-tests (lambda _ (substitute* "tests/t-syserror.c" (("(^| )main *\\(.*" all) diff --git a/gnu/packages/patches/libgpg-error-hurd64.patch b/gnu/packages/patches/libgpg-error-hurd64.patch new file mode 100644 index 0000000000..aac8ce61f1 --- /dev/null +++ b/gnu/packages/patches/libgpg-error-hurd64.patch @@ -0,0 +1,78 @@ +Upstream-status: Taken from upstream (1.48 series). + +From c62157c615a6379677c8f106bf9413d2611fd95e Mon Sep 17 00:00:00 2001 +From: Samuel Thibault +Date: Sat, 6 May 2023 16:10:55 +0200 +Subject: [PATCH] core: Add hurd-amd64 support + +-- +This supports the x86_64-pc-gnu triplet + +Signed-off-by: Samuel Thibault +--- + src/Makefile.am | 1 + + src/mkheader.c | 2 ++ + src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h | 24 ++++++++++++++++++++ + 3 files changed, 27 insertions(+) + create mode 100644 src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h + +diff --git a/src/Makefile.am b/src/Makefile.am +index c61adde..9389e99 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -67,6 +67,7 @@ lock_obj_pub = \ + syscfg/lock-obj-pub.sparc-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.sparc64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-apple-darwin.h \ ++ syscfg/lock-obj-pub.x86_64-unknown-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-kfreebsd-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-linux-gnu.h \ + syscfg/lock-obj-pub.x86_64-unknown-linux-gnux32.h \ +diff --git a/src/mkheader.c b/src/mkheader.c +index 8fbfbd6..cc0eaa3 100644 +--- a/src/mkheader.c ++++ b/src/mkheader.c +@@ -108,6 +108,8 @@ canon_host_triplet (const char *triplet, int no_vendor_hack, char **r_os) + {"x86_64-pc-linux-gnuhardened1", "x86_64-unknown-linux-gnu" }, + {"x86_64-pc-linux-gnu" }, + ++ {"x86_64-pc-gnu"}, ++ + {"powerpc-unknown-linux-gnuspe", "powerpc-unknown-linux-gnu" }, + + {"arm-unknown-linux-gnueabihf", "arm-unknown-linux-gnueabi" }, +diff --git a/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h +new file mode 100644 +index 0000000..7c7e6f1 +--- /dev/null ++++ b/src/syscfg/lock-obj-pub.x86_64-unknown-gnu.h +@@ -0,0 +1,24 @@ ++## lock-obj-pub.x86_64-pc-gnu.h ++## File created by gen-posix-lock-obj - DO NOT EDIT ++## To be included by mkheader into gpg-error.h ++ ++typedef struct ++{ ++ long _vers; ++ union { ++ volatile char _priv[32]; ++ long _x_align; ++ long *_xp_align; ++ } u; ++} gpgrt_lock_t; ++ ++#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0, \ ++ 0,0,0,0,0,0,0,0}}} ++## ++## Local Variables: ++## mode: c ++## buffer-read-only: t ++## End: ++## + +base-commit: 7a42ff0ec971f4f2add28b0edad6cf381b5b8acc +-- +2.46.0 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 31/58] gnu: openssl-3.0: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243502918036 (code B ref 74290); Sun, 24 Nov 2024 07:57:20 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:09 +0000 Received: from localhost ([127.0.0.1]:60822 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7US-0004gc-KK for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7To-0004ZN-PH for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:29 -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 1tF7Tj-0002Ca-HB; Sun, 24 Nov 2024 02:56: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=oe2B747ttuSurmcjFSNch9CnaI/kPuvPp9LdxFzcWGM=; b=YP9chkuKg21N965vMPFo U0KuLp+ZR1+p1CDldd5gKfk1KC+CIpylXgzemjxUBjpcT4V4VfZ40Ez5eFV49cTRcTJoUEg2SI7cd IiAJCmWfPSVNVfLClR/3XOBpdHfUgOobOWfEprlLzXiDigpHm43Mvq44E/R/4oAWLNx4Sd3XX54ZG ZNkXCsTA5N3X/pkA/xWOSjGenvFQssSuaLFHciWjE6a7xfK5Dqu93ZEne4LE+S1dw8llWrAih4yjk FI+e3emi4kSD5cbVmw7CNiF1NIQhA3CjQgoMzkRshM4Fl+peRWNo2DrAw0I0GdrS7QS3GY5JELmxc RNGxb4aQaBRtJQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:54 +0100 Message-ID: <663e3d1a6a8465ad8aa4a78c79b532a77f558abf.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 52239fb0e0..c1eca1f940 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1899,6 +1899,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?) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 32/58] gnu: pciutils: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243503018057 (code B ref 74290); Sun, 24 Nov 2024 07:57:21 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:10 +0000 Received: from localhost ([127.0.0.1]:60825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UT-0004gr-Dh for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tp-0004ZZ-Rq for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tk-0002Cj-DT; Sun, 24 Nov 2024 02:56: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=CtDxwkfCK0lMk/yLSdXxzULvI6ltbSWECqTDdS9lKHM=; b=IvSbZJh7v1PdcDIcuegU wQJkTjPKePhUEzepCzx2yquCiWJMDcjvFbV2MZg0LQrK78K2pJ5zogeRar3Px9aWDayy7u40upTjt tX4my1nppztub7K4Qb3yKGTJMrM3EV4HTwGps2NcBvE8+O7wA7KVFIIeTBiqmmA6gXJhse3+j7rFj Q9tLXe5cCDaiMIADcDFn4fhJv33V38++qZ39a+TyNGUGu7BTN52q8cuCR9HRFZUhc1r7kSAK/wCZr g3+oHprQOUQLp2NENj1tLB0El0FbrRA7RJ3RWkZ7JmRjapTu18a95nPeq/01AJRJX2EeD6Z8fagAc NNkeEZ5j1ItSGg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:55 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 c1eca1f940..ceddce8f78 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1914,6 +1914,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")) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 33/58] gnu: libpciaccess: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503118074 (code B ref 74290); Sun, 24 Nov 2024 07:57:22 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:11 +0000 Received: from localhost ([127.0.0.1]:60829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UU-0004hC-9J for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tq-0004Zh-I9 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:31 -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 1tF7Tl-0002Cs-7E; Sun, 24 Nov 2024 02:56: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=r2afZGbeLEV1GthGz9FwvavZU+BqDHFqDhIeAwA4brk=; b=VPZxhDALCW+hbL8KHFv7 bDt7Uye3Ku8VeozpTwVVsiAIdPpzEBmrkYAwHqUv0rXhnAdBfgFVUvSnutnEj86Y8BtOFwzkGyd2f I0Fup1wjz5hyBL7wRA5QJVMYlrWy2ykgzniaSwUXmh+lrYjUdfDo98r76B0lx+8Kz3qgMlZICKmNl XQBymCrf7E8ROpnrkSnr30uYcaxtsH6yiMyjT1yp7bvECRkw7yy+Hp368zHqwyUWoiEsS5TXhxUd8 7Ah7aSlSznyo4Mj5yrJ7V+OrNGhtpgZZN1+hV3V6Z2rRVviizcpnhuZOKhIRimfdgmhtNB6Ztw8px fZYBsCcIZgECeA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:56 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ceddce8f78..adcbb55847 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1711,6 +1711,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 554dc21ba7..e78264ec6f 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 ;;; @@ -1169,16 +1169,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. @@ -1187,7 +1188,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 34/58] gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243503218088 (code B ref 74290); Sun, 24 Nov 2024 07:57:23 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:12 +0000 Received: from localhost ([127.0.0.1]:60832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UV-0004hT-Ap for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ts-0004Zv-Js for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tn-0002D4-Dd; Sun, 24 Nov 2024 02:56: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=IdcQCyQ/vo8uDTni/SmHls3ywYSMyTuo8J3ltumovBA=; b=XwjcOeNdW+cW5nYdQsnx Y2Otx+V8EjLd8Ld43SH3CnPlCFn4wr0mQQVwcFwtyF9n9sVoA8UYHPCvuzLINysTIs6eagqiYFIkn WnH0tnqUrsrTeTpio6KCORVUsibpPF2tOFZyZoZkR7k21K3gvkLr1bKSz5OjmSSoIgRuHQokhmX5L zYqaGcI9fY+0aiOovI0NiVV5hbY5H0IxjSf7OF4O5225AQDyml39yn0vrlEZ8oVsqt9OettxdvYON hCZUrqQl5/WDIGGhltUy0MXnmwkOGFu3xUGcfJE5LacLDbGWh0VJBOba1YENVgdehxjml4iodW50C aKSB71K+00cWtQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:57 +0100 Message-ID: <3651a6eed7932297fd7a6bf5c5f2a1f34a8ea913.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 5fdb6359d1..2c231425aa 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 @@ -567,8 +567,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 @@ -582,7 +582,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 35/58] gnu: netdde: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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.173243503218103 (code B ref 74290); Sun, 24 Nov 2024 07:57:23 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:12 +0000 Received: from localhost ([127.0.0.1]:60835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UV-0004hh-Vy for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tt-0004Zy-DJ for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:33 -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 1tF7To-0002DC-6r; Sun, 24 Nov 2024 02:56: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=pdafoliq+nvOAg9oyl1+48DQztM0EimTR6FGR0o8AeQ=; b=FZE8Im1rSD2BnLsOkbOM oh2anv7Gu07k58auBrRSQnCFylqflenNfpghynA1A2ZXJNa5CoyhDLbLIpapqBaKWA96meusE6niB hbA67rm7oKpRsSY+q9hZXUW0JHqBvGM4fOkyyPxx2ImcHBliW1e+EDeNE88QKddY1T6+5gwQai36T CB7zNYW5AD5X9juPQ5oa94SJkI1iwpJeXBDutT8SYLb2m3ipZNBLwyzB9MLLfC6JQvUqT/qP7h3HL 91vqwZPUIfdRV99RxMY7fTl/+psmH9sYIvFXt42u1M85vHkiJI2qD3JuCDHzJSmkVv3lXxillU1Tn jLqRQi55Vi/qyg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:58 +0100 Message-ID: <556df9755809509a8ea1529ed93f1078f2da7dd2.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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, and follow upstream's "amd64" symlinking voodoo. Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 19 ++++++++++++++++++- gnu/packages/patches/netdde-csum.patch | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/netdde-csum.patch diff --git a/gnu/local.mk b/gnu/local.mk index adcbb55847..2e18ed7870 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1824,6 +1824,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 2c231425aa..defa3f2689 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -579,7 +579,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")) @@ -599,6 +600,13 @@ (define-public netdde " -Wno-int-conversion" " -Wno-strict-prototypes") "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 @@ -616,6 +624,15 @@ (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" (delete "PKGDIR=libdde_linux26" make-flags))))) 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" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 36/58] gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57: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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503318113 (code B ref 74290); Sun, 24 Nov 2024 07:57:24 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:13 +0000 Received: from localhost ([127.0.0.1]:60838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UW-0004hy-My for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tu-0004a5-F5 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tp-0002DO-8g; Sun, 24 Nov 2024 02:56: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=Ml7qt6m977oIZHOXMwWHbWIc+SYvMnIygOWThmx+pv8=; b=HvYRVoXnVu7xAE93KNwZ beg9IB2Pc18f0tg6b7GLd2KjBnaOR9GeYhIvDMpg/BCSBjZJC4uOtvyegs7TTpY10HzqkOd/cRmfg cL/5yIBW55cUkwa1ogyW/gAk+nU0EKiXPUqGsisIdO4KSKasBAhrOL9uUsYOnT2+j4ukYwVN4mQgs sJKyTp9VP2jblEieOLIVsGdCoriWBf/5I8ZlJgjojOQMGiVaVYcg3bvLjEsBf3ku3pwn7seAXw/m6 nUfKjlhyZm1apdN/8DOz8n2TK8JlH0kiZRQWXNIWvWPhIYytOGtJCCJqAplHcX1zvR8YRhb2DNDM1 Uf5amWp8MbOAXQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:59 +0100 Message-ID: <0ddd330a8eea08ddb63e3fa0efb0476b44efe14b.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 defa3f2689..0df514cc78 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -676,8 +676,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)) @@ -691,7 +691,7 @@ (define-public rumpkernel (commit commit))) (sha256 (base32 - "0fv0k52qqcg3nq9012hibgsamvsd7mnvn2ikdasmzjhsp8qh5q3r")) + "1ygn3ysji06ik3k44sf906fjpdmabznkspw70llldbk2zkrcdw7i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -811,7 +811,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=" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 37/58] gnu: rumpkernel: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:25 +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.173243503318126 (code B ref 74290); Sun, 24 Nov 2024 07:57:25 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:13 +0000 Received: from localhost ([127.0.0.1]:60840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UX-0004i5-47 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55732) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tv-0004aI-R3 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tq-0002DY-B7; Sun, 24 Nov 2024 02:56:30 -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/fc0uQcseXNqhyISel/qHQYVRi4koMAZyjnGE676gI=; b=Pm1yrP5rE4jYzLCJ6mD1 znVg5DM5LIgoEyQhSPk3F+lDiOE0UYXPL1aRlGOn/zQoolETdMIFH1Ni9Z3sBONr6BfX8W6qAnEif qqygvbYIAOAtiRvF1nX8gYJcZ9HFpkLYwIo4rypEgTTQYA3GFPox/V84twP/u2a4R0tiQNhDjK0vG RKo3g3zuJH/I8NXN3OuLWr7RyvbjO10Mgw7LlD4oZHUzPvMa3Q27C3oTRLF9Tts5x3xam8NWK42E6 33LTtfkHMLxlyaUBPLiw6LSvG+gd/5xzfsLU8SV/F/iEjmpjavsmaSbzuHzBngoKZl/a3gCDZig8t jkg9SKRJn2u7KQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:00 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 0df514cc78..6701d00251 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -792,6 +792,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" @@ -802,7 +805,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" -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 38/58] gnu: hurd: Build fixes for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:26 +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.173243503418144 (code B ref 74290); Sun, 24 Nov 2024 07:57:26 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:14 +0000 Received: from localhost ([127.0.0.1]:60843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UX-0004iJ-Jw for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Tw-0004aK-CO for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tr-0002ET-6P; Sun, 24 Nov 2024 02:56:31 -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=AlGqGL75ySyrk8iZymv7a6Z1oJ7DOO8fftgkErDQE0U=; b=IeSA7zJ6ovAcGHwbCISu /0wxxShXyHazQWeVVfWiDKazz5co43SN7MoF6Yq0dTLcKGXA0j4ByaaExQ78s7rX7PvS7TunSqQuc T1an+nSoLYLN3jchhbGU9vBPv8nd8WjyV5siqV+ikXqzwLuxvg7dNPtzA2jb8jI08wJ9Cj3k48/WW fJYTD1eAfcS/s+xLUTGPyiciYJZuhcR/llgjnZaePM2FV/Dmpv4k+3Y0h3xzdiuCgLXODdtrbrDv/ 7xFzL3q08S8+OLReVUPwFxWdxY4MlyRPMZPOB/NjrKtsvNcWOBvIiCBCvHSHe0xWGvriVBBwRwUYg GGTEcvOjDAWKwg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:01 +0100 Message-ID: <6e35b48b7ef3cc93c0f0a9bcd859531ba4fa9cb5.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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, and follow upstream's "amd64" symlinking voodoo. Change-Id: If264a91b2433add13f9121c482f0abe67ae5f1e9 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 126 ++++++++++++++++---------- gnu/packages/patches/hurd-64bit.patch | 56 ++++++++++++ 3 files changed, 135 insertions(+), 48 deletions(-) create mode 100644 gnu/packages/patches/hurd-64bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2e18ed7870..eb1bc43276 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1553,6 +1553,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 6701d00251..63249b4ef7 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,54 +468,84 @@ (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)) - (string-append "WARNINGS=" - " -Wno-declaration-missing-parameter-type" - " -Wno-implicit-function-declaration" - " -Wno-implicit-int" - " -Wno-int-conversion" - " -Wno-strict-prototypes") - "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-declaration-missing-parameter-type" + " -Wno-implicit-function-declaration" + " -Wno-implicit-int" + " -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") @@ -599,7 +630,6 @@ (define-public netdde " -Wno-implicit-int" " -Wno-int-conversion" " -Wno-strict-prototypes") - "ARCH=x86") (let ((arch ,(match (or (%current-target-system) (%current-system)) ((? target-x86-32?) 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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 39/58] gnu: inetutils: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:26 +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: Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503518165 (code B ref 74290); Sun, 24 Nov 2024 07:57:26 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:15 +0000 Received: from localhost ([127.0.0.1]:60847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UY-0004ib-Ki for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ty-0004aX-T8 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:39 -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 1tF7Tt-0002FF-Mc; Sun, 24 Nov 2024 02:56: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=xW+ypXkl5kj3M4z5ruQ2pZCfstkeK+XCraIR6PrrVO4=; b=BnSMrDvCppt5tcFEzfx3 8XwVCacgPA4LCDRP3HGjJjzvxe9/noMQVCbIi2+roVsjqNBNgqsxbIF0Jkh4azJkWr4Fl91FEoMZT voRZutli7jSZX6lI7Wy7jsU+CvpLj2ud6LjgD2VmIPMQEc2C0Y+TfjcXQTP2EEj81jfufuctqVVO7 1NE2OkKrJqc42/PbU14GGV13XUYxmno5M1s2XN96goszZ963a/9S6TtZzupEPecLPkC8MrEX6BUDk XDO1iLfoxkJS2ekbvZIr1DLQ832d12EYRO5k1ylVVK3fH9f0Qib7DdGEnkLcRrjdLPlQjuopLaK8k CaqSEwo/7sToqw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:02 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 eb1bc43276..c8fbae91fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1577,6 +1577,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 46282da67e..fbf3e26a3f 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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 40/58] 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: Sun, 24 Nov 2024 07:57:27 +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.173243503618180 (code B ref 74290); Sun, 24 Nov 2024 07:57:27 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:16 +0000 Received: from localhost ([127.0.0.1]:60853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UZ-0004iw-Ho for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U0-0004al-3B for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tu-0002FR-Sh; Sun, 24 Nov 2024 02:56: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=0r633+B0XmsTRsQM5B7hxULPdUeBnT9mqg/vjV9ck3k=; b=mpU8In7TiBiaVOOct4eL awbpfISh1c0BvWi5GSaZ8Ev9Lzq3tRMt3lVK4a5vqEFA74kpeJcHLA4BEOcwH84eaJFnHfZTXTcAT vNmDnM6c5YS6hd4uFKb7P/6wHlzASPcFp1gGSKJDDLJwc2fC7n6QytUnv85nAGRnYptxce/L9iJJe zRuroW1poZJsxD7SUyaWEohZcc+hvCmgTGNv/VuKw1YVCNdO/r3DxcKIcekyKHOz8ddwrJKqSLqrf uf7NgmdVvP96ySSwCVDnmdfFdkcM0aRQbrpRhmcen3pyPcwXNwq2ueYtvRmOJepHsPS3c2DIA/GkX l3sZ+28aS8D86A==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:03 +0100 Message-ID: <83559b59e4ba686c97349edba97af73f443df071.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 c8fbae91fc..3595c68800 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1494,6 +1494,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 da5abaca55..61ea74b69a 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 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 41/58] 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: Sun, 24 Nov 2024 07:57:27 +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.173243503618189 (code B ref 74290); Sun, 24 Nov 2024 07:57:27 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:16 +0000 Received: from localhost ([127.0.0.1]:60857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ua-0004jB-A4 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U1-0004at-R8 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Tw-0002Fo-L6; Sun, 24 Nov 2024 02:56:36 -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=AGtCbpIid0l9wKezu1kLl0tFfCKP2Yv55BYjeUTXYbs=; b=AkIpCiwonz7riD3qcVQa c4bvhbVOMNkWcAM46Os1PtpnYe+As6EGJfVmndCZdWDgYrHM0tuVFTNnxZN5DAusUJskp8bafeoEK ELRrgrs90lb+/yAt3G8+ElN1YEGZVTAAjlgGrBY3yWfoCbLCXfwqOsztXJAa+UHsXbDzIEAWi+2EV xxCaOG+nBR52f8FqJqg97E3Mb4zgwLBWh1qulmevTUBngs3EE2i4a1Z226TdXnfEBLReTpUTkgDGV KVC5jxctYGiXv9NYnwWu9AnjyxZOs4LhRbkNJSHrzofsYLAXsvh7Im7xSrQnqdXE1+pZtB/IkG68B yf62HoW51k0xtw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:04 +0100 Message-ID: <2b5741e05746a60fe2b50dcb44c5f5553d70077b.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 a21289d368..bd5878d229 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -856,7 +856,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 42/58] gnu: m4: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:28 +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.173243503718205 (code B ref 74290); Sun, 24 Nov 2024 07:57:28 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:17 +0000 Received: from localhost ([127.0.0.1]:60859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ua-0004jK-PX for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U2-0004b2-Oa for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:43 -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 1tF7Tx-0002G2-IO; Sun, 24 Nov 2024 02:56:37 -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=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; b=gcTC9v2EbMq8Tswx/2uN 4MLZ+ATn3c8QbXkpz+MDBjhzX/adgr4+vNSFmtmpftLEirn+tWNAJKbaWswZ0oeWauTbh/3z13G4/ sk/7OkgWCpy7DV2ev44oQhqtTFTR2DU9O2tJn9ZB+hqnUitz2jsSt2CtYLmFXXqqtC/L9dauQFeV5 bL76zz0rJXyUvEPc625Dlf1NpR+pI3B9FQ+DD813Z3NYkMrZ3raHxNppdLToEPhT2qyrKo5U1JiEx EwQxyAGl+m22P1cTJvKsYSI+Gig/VkoQw5UVO5jpBA997kigtWS4wyfGJSVLQaUDsBI6fdm49Hu0A 9E4pzgrQnTsPdA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:05 +0100 Message-ID: <4c8ab0e1115b295761e5fe5ec4b9a3a1c06d6d00.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 43/58] 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: Sun, 24 Nov 2024 07:57:28 +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.173243503818219 (code B ref 74290); Sun, 24 Nov 2024 07:57:28 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:18 +0000 Received: from localhost ([127.0.0.1]:60862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ub-0004jZ-Fa for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55792) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U3-0004b4-UG for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7Ty-0002GE-Nu; Sun, 24 Nov 2024 02:56:38 -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=WUZeir+Y0D5Fntp393hj0+/RZuqCHnBVhXweLV0Sl2A=; b=okqxDF96jXvBGDy0uHvR ygNRglceeEscKzMGzMLE+upOZ2Ss5K/PKwruAGXRhvC8xmAhTJ9qZuli9Hy1mpC/hO6BHtZpuz/8k W4rspLv8uPdwUzXOWJPKVFVb/xhFOTFelYGfZ3bLRlVzfAE2U8qewmrmwOgyzOXSaOpeUoS/w2hDY vbNfG43PckPCuOZR5v6JSC+Q3vYZAiGijNHomySZKt4I3o3a/OMcCp3r14zRUGYqteuTkZ0ganlU5 YRdC4AxemTgrmWSjizMZ3Hs7z8vRIb2EYKDuEHmHX7gA7hjQ9sJwpNLbbRlf7mSwXO9g2ngUVSxAx A1kWMAWCc+Ifcw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:06 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 1cfaaae1e7..2f805b3e63 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2635,7 +2635,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)) @@ -2649,7 +2649,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) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 44/58] 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: Sun, 24 Nov 2024 07:57:29 +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.173243503818233 (code B ref 74290); Sun, 24 Nov 2024 07:57:29 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:18 +0000 Received: from localhost ([127.0.0.1]:60866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ub-0004jo-VI for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U4-0004bB-Uf for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:45 -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 1tF7Tz-0002GN-Nz; Sun, 24 Nov 2024 02:56:39 -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=zJbKGkWlYd1swF4O5NU/WcKrUZufd6Str9cF0iYKHiQ=; b=PLb41dg0X1ifLdkPtyr0 t2XWtDZndClBjj3TAKvQD6JT104BhT1VFiMdaK8KSjYo5jsZsEKxqs2xgZNkI45XRdLMG6S1ZFpW3 zLljRudM4flh6o0xfI7ysiXUihUoOfmzqTjMMcH6+1jfxIh76FX1ZWOwQfZ9Ub0OPljeIHtFliXyD m1s9d+f1zkmYS5ke8zDInMTLG7SUveFNvwd3cRQGN0Fj3A4q4f4QvzZfshm+QU8M39fyeosOacEri 94MEwlbl7NlPk8Z12tU2RXqlle0qlVlXrlrrbe+phT3CdBdfKsu7MyBFajUo46G3B23iy/j8RO73R Pwxhw/v2wG/HCA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:07 +0100 Message-ID: <272cc3af194a8fecc855518ebb04912e85c0ac1a.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 2f805b3e63..742ccbc63b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2670,7 +2670,7 @@ (define mig-boot0 (package (inherit mig) (name "mig-boot0") - (version "1.8+git20230520") + (version "1.8+git20231217") (source (origin (inherit (package-source mig)) @@ -2683,7 +2683,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)) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 45/58] 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: Sun, 24 Nov 2024 07:57:29 +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.173243503918245 (code B ref 74290); Sun, 24 Nov 2024 07:57:29 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:19 +0000 Received: from localhost ([127.0.0.1]:60870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uc-0004k3-FF for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U6-0004bI-1r for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:46 -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 1tF7U0-0002Ga-QS; Sun, 24 Nov 2024 02:56:40 -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=BeOgD0UmX7EVnVKq7bSxcI53DT9PJfVxrIKTnsHKm+c=; b=VdJPfCMgcHLGvPihRsQO VeftCWTJuVKICw8sPJ/5KFYYtmjJxSVHi14EWGVQ2cemiZ2WKprY2Tev8y52oIV972vbUZnRCrbLI CBMCFilVub+4Eb+SDkz4DRcWzVeth61GnshViqRa8APsM1+iE43LoReuERfjY55NFebkcWAVQhDXT 86vF65Oc208PYsqOpNUoxO7EGAjpaxA4yF49Ta+cs7W/WwvvHL4+hUMbKV1hOwJWAEf4wU+Crp7Zk SfEJHuNjP/OlBovUwR5wVJ98gGqC88P51RsMsECR1q4GGYUrx/NviKN3CdzbQU8lbEe6me4xwm0R+ wpVDQuvkXK5pwQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:08 +0100 Message-ID: <8ea163ca02c34172cb1a3302abf665413f2941e2.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 742ccbc63b..ad70bae501 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2699,7 +2699,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)) @@ -2712,7 +2712,7 @@ (define hurd-headers-boot0 "hurd-v" version ".tar.gz")) (sha256 (base32 - "0ybmx7bhy21zv1if2hfdspn13zn68vki1na72sw2jj87gj8przna"))))))) + "0wcihffclwijjamx4cjbr8i92yg780538ipg2z208ahg96jjrmgq"))))))) (native-inputs (list autoconf-boot0 automake-boot0 mig-boot0)) (inputs '())))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 46/58] 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: Sun, 24 Nov 2024 07:57:30 +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.173243503918259 (code B ref 74290); Sun, 24 Nov 2024 07:57:30 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:19 +0000 Received: from localhost ([127.0.0.1]:60872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ud-0004kD-0j for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7U8-0004bX-FA for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7U3-0002Hf-1p; Sun, 24 Nov 2024 02:56:43 -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=ky+GJJGJFtznNJRtG6GW2bFtbqqwxbW12vL8Wj11qN8=; b=YdwBJ96Ulj5MS/REdVVE 7+YPn8Kdv7ejLEsZNNYcwoUroVX97o5V4M00SshhnLAFFHs5lW629qmBdlNBoPomquDPZuGGbiFeV qWa1/6G+41BUh86MxqSIUKNgffqe6C+jCGXICiHk90h4ubljVwcF/RnImDr3Wg+01mAuOI6EvjV4N Yw0Qncra78FwpaQ6g/ektrSrN2/dwudyjuBdDP2eYDzWwdQNpaLRuLe5qTg3Dry5UByeLfou91rcr NKFjczqBGNDt6ILFsxtMiup31RwKhB4P9vGhFRCMgaPPuldMd6HFD59BIc8UtoQrDurCnQ8BtYLVB fYvYZoj8M1WLMA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:09 +0100 Message-ID: <0f6acb8bd7ab8198cea709492c792c16c2d4f895.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ad70bae501..a14de3002f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2273,9 +2273,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))) @@ -2446,7 +2446,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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 47/58] gnu: gettext: Fix cross-build shebangs. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:31 +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.173243504018275 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:20 +0000 Received: from localhost ([127.0.0.1]:60878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ud-0004kS-Mc for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UA-0004bv-Cy for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56: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 1tF7U5-0002Hy-75; Sun, 24 Nov 2024 02:56: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=vc6TmPsZt9gRfGUT3TPTCxPOTd6Do/TxOPguHB3OS0M=; b=rl6BI5MjfmlKpOJuM2ak xH+fADZcdYIqlkbeO21ZXq5QJsm80Egx1rt0A1vtC0Hgy+5whpXsgdPNvSHauuT6XPsCqTx31lhZK IAJ2Y7RzbB0AxMF6MAOcZEkQ8Gq0VCDm0VpKnNdAs2xh4bgHLXKPo8WvnkfHuMr+VggF3QmxL/yOO 2KUMK+jKSqsdTa4V7QysLRFytAv65tpDlbZK/pwIpGTg+odTDEmSk0VZpiiyrrduqCAdOERxsIzph 4lnOq4xin31M08tqYpiZO6MPBJM1Y8un4oHe4qr4wBVNfIE4SnJLJF0b4E3G67/Z/bGv1kOZLvuwT xnrUnTeYesGzNw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:10 +0100 Message-ID: <4c0fa7e093727553b20a0e09e582f032667dd566.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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"))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 49/58] gnu: bootstrap: %bootstrap-glibc: Also fix libm.so. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:31 +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?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504018288 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:20 +0000 Received: from localhost ([127.0.0.1]:60882 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ue-0004ki-8X for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UC-0004ci-M2 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:53 -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 1tF7U7-0002IM-Fs; Sun, 24 Nov 2024 02:56:47 -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=FXMD9GV/IDot3mzzjW3SK8SDf2NubyYH9wWTmzicXzE=; b=iOmJaO2+fZ4oFUVnOIin b6I9y+vjyISfcBJTLJTDZsDlpEQX3vY5LrI5R1umGCm8wFJ6fg4wOz9TVs3mJUEoyoHB3qOi/gRZI dlaGFXKPDys1Zb6NTz+zASHjzzWdtMCRRmbGnAdwczvbmXGeIUWGxS+Yiyw2QkLzckOjSN1Vk501Q ssZ1vkpmY0gPhlkpK6ZAG/VxTcWDXHIAMfaa+hadkGrQM0UaRe4bfzAOhQZaJJil8KIBdG/RkZvcd lxFPfYqFWq52Fgkr/gnADm8KjfdFUqo44znmBgpZzdI34ATbOYjkdqWv741olZX1IlIlLuXtp7dH6 DA4qOZgnCAXS/w==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:12 +0100 Message-ID: <4d1ee77ec4b095207612b6c62baf0d7396d2f3f8.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) On the 64bit Hurd, glibc-2.39's libm.so is also a linker script. This fixes having it refer to /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libm.so.6 /gnu/store/eee...-glibc-cross-x86_64-pc-gnu-2.39/lib/libmvec.so.1 * gnu/packages/bootstrap.scm (%bootstrap-glibc)[arguments]: When building for the 64bit Hurd, also substitute libm.so linker script. Update the regexp to also cater for libh[urduser] and libm[achuser]. Change-Id: I878e63d18f1012b6e186e90eb68cb97bec5ae94c --- gnu/packages/bootstrap.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 8027918323..a6cdda2122 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -774,12 +774,12 @@ (define %bootstrap-glibc "/binaries.tar")) (chmod "lib" #o755) - ;; Patch libc.so so it refers to the right path. - (substitute* "lib/libc.so" - (("/[^ ]+/lib/(libc|ld)" _ prefix) - (string-append out "/lib/" prefix))) - - #t)))))) + ;; Patch linker scripts so they refer to the right file-names. + (substitute* ,(if (target-hurd64?) + ''("lib/libc.so" "lib/libm.so") + "lib/libc.so") + (("/[^ ]+/lib/(libc|libm|libh|ld)" _ prefix) + (string-append out "/lib/" prefix))))))))) (inputs `(("tar" ,(bootstrap-executable "tar" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 50/58] system: examples: Add bare-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:31 +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.173243504118305 (code B ref 74290); Sun, 24 Nov 2024 07:57:31 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:21 +0000 Received: from localhost ([127.0.0.1]:60886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ue-0004l1-Rz for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UD-0004cy-JY for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:54 -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 1tF7U8-0002IV-9T; Sun, 24 Nov 2024 02:56:48 -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=9JPDnrOqlmB6em+KLsZAHXaG8wxrH5HaNjiSGZjLXG4=; b=HYnQKkpyiAyhFwfEAhEa WqU5jhDgd2gp4JtI9izI7fxXWREC/HvLbxpCxD+QCIj3SPDi+M7aJ5h321cixNHT/62givI0QJCvn I3pC0c6EbGD51fHNjGQHJccMwqgrPaU0WaguImOd5JeWDrVMEZk7tIwVgSGhT67UiJYMETgXgqHSq x4lVD/DP9OKUlZHtbNg5ODMjt2z672boygkgs38FtB7oon7XvhezluKx2d0xnBvZLyLSaaYi0a3Wr 0SZX576OmPM0Hy5/gQTHcaUxSiGJQLDVxj2HnZBVs1MGGR4534BP5wFa0hq8EXagQBqVUF1T6bOB/ xcx3Ziz79LZwIw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:13 +0100 Message-ID: <5dd18b57a31588447d97aa36a286cc0eb8835366.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 48/58] gnu: Add gdb-15.2, with support for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:32 +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.173243504418337 (code B ref 74290); Sun, 24 Nov 2024 07:57:32 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:24 +0000 Received: from localhost ([127.0.0.1]:60889 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uf-0004lH-M0 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UB-0004cS-MD for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:54 -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 1tF7U6-0002I6-7E; Sun, 24 Nov 2024 02:56: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=csLNrX7KglYSn+zXoqxh8/j8zPva+/LTtAkKnxbU/3s=; b=hmPSxQ9Qx41mL3c5CxJb zCfoyUes3vei+EJR9UZwWdhL1NJqL6heDcVJYYZPqbtvqfLNRuEwedNQGL7gxBDZDwTXGmfxph70d fnp7vy4lSaXmtDOtqlTM4q4tW9eQVOpSZg1yd+jhk3F4zO+QOAiXSX0Lc2q7+Dl5udzkbzKVrqsFG qKbM9SJe2eMnaGU0gcPvy896YWoeziI5Dv4m7j54nbM5vqyxyfXhioKvJahXilIVmGH1HRpC4dEYz 1uV8leMyciojftTEBKrDAdLvGYGjKnygz6x+iTxbXv6rjzg8wNHVAGrj6loKUbobOzeiVV4UaT6P7 K2ArhSOv8+zTCg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:11 +0100 Message-ID: <332ac99487986c19265582f445e03f48968b2265.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/patches/gdb-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gdb.scm (gdb-15): Use it in new variable. (gdb-minmal-15): New variable. (gdb/pinned): When building for the 64bit Hurd, set #:configure-flags to "--enable-targets=i586-pc-gnu,x86_64-pc-gnu". Change-Id: I52d28092be6c415b8668bb5a77d41c87df841351 --- gnu/local.mk | 1 + gnu/packages/gdb.scm | 22 + gnu/packages/patches/gdb-hurd64.patch | 923 ++++++++++++++++++++++++++ 3 files changed, 946 insertions(+) create mode 100644 gnu/packages/patches/gdb-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3595c68800..08314ade22 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1372,6 +1372,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ + %D%/packages/patches/gdb-hurd64.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/gdm-elogind-support.patch \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index bf46716047..af5ebde3f6 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -67,6 +67,9 @@ (define-public gdb/pinned #:out-of-source? #t #:modules `((srfi srfi-1) ,@%default-gnu-modules) + #:configure-flags (if (target-hurd64?) + #~'("--enable-targets=i586-pc-gnu,x86_64-pc-gnu") + #~'()) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) @@ -160,6 +163,19 @@ (define-public gdb-14 "0wkprsjyyh204fdjlkaz20k847l88i9y8m9zqsv15vcd3l3dhk9d")))) (properties '()))) +(define-public gdb-15 + (package + (inherit gdb-14) + (version "15.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" + version ".tar.xz")) + (patches (search-patches "gdb-hurd64.patch")) + (sha256 + (base32 + "0k9i8mizg4hby020k53kqmc835pajh9c8d5klv5s1ddm6p6hqdc3")))))) + (define-public gdb ;; The "default" version. gdb-14) @@ -184,6 +200,12 @@ (define-public gdb-minimal (inputs (fold alist-delete (package-inputs gdb) '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) +(define-public gdb-minimal-15 + (package/inherit gdb-15 + (name "gdb-minimal") + (inputs (fold alist-delete (package-inputs gdb-15) + '("libxml2" "ncurses" "python-wrapper" "source-highlight"))))) + (define-public avr-gdb (package/inherit gdb-14 (name "avr-gdb") diff --git a/gnu/packages/patches/gdb-hurd64.patch b/gnu/packages/patches/gdb-hurd64.patch new file mode 100644 index 0000000000..50e44b3684 --- /dev/null +++ b/gnu/packages/patches/gdb-hurd64.patch @@ -0,0 +1,923 @@ +Upstream-status: Taken from bug-hurd + + . + +and gdb-patches + + + +mailing lists. + +From 6131a7a8951bc255d6c013de126c46b620434d2f Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 3 Jul 2024 22:45:33 +0100 +Subject: [PATCH 1/2] Port GDB to Hurd x86_64. + +This port extends the existing i686 port to support x86_64 by trying to +reuse existing code whenever it makes sense. + +* gdb/amd64-gnu-tdep.c: Adds logic for handling signal frames and + position of amd64 registers in the different Hurd structs. + The signal code is very similar to i686, except the trampoline code + is adapted. +* gdb/config/i386/nm-i386gnu.h: renamed to gdb/config/i386/nm-x86-gnu.h + and adapt it for x86_64. +* gdb/config/i386/i386gnu.mn: renamed to gdb/config/i386/nm-x86-gnu.mn + and reuse it for x86_64. +* gdb/configure.host: recognize gnu64 as a host. +* gdb/configure.nat: recognize gnu64 host and update existing i386gnu to + reuse the new shared files. +* gdb/configure.tgt: recognize x86_64-*-gnu* triplet and use + amd64-gnu-tdep.c. +* gdb/i386-gnu-tdep.c: added i386_gnu_thread_state_reg_offset that is + copied from i386-gnu-nat.c. This makes it similar to amd64. +* gdb/i386-gnu-nat.c: rename it to x86-gnu-nat.c since we reuse this for + i386 and amd64. Updated REG_ADDR to use one of the structures. Added + VALID_REGISTER to make sure it's a register we can provide at this time + (not all of them are available in amd64). FLAGS_REGISTER is either rfl + or efl depending on the arch. Renamed functions and class from i386 to x86 + whenever they can be reused. + +Tested on Hurd x86_64 and i686. +--- + gdb/Makefile.in | 4 +- + gdb/amd64-gnu-tdep.c | 231 ++++++++++++++++++ + .../i386/{nm-i386gnu.h => nm-x86-gnu.h} | 7 + + gdb/config/i386/{i386gnu.mn => x86-gnu.mn} | 0 + gdb/configure.host | 1 + + gdb/configure.nat | 27 +- + gdb/configure.tgt | 6 +- + gdb/i386-gnu-tdep.c | 13 +- + gdb/{i386-gnu-nat.c => x86-gnu-nat.c} | 171 +++++++++---- + 9 files changed, 403 insertions(+), 57 deletions(-) + create mode 100644 gdb/amd64-gnu-tdep.c + rename gdb/config/i386/{nm-i386gnu.h => nm-x86-gnu.h} (83%) + rename gdb/config/i386/{i386gnu.mn => x86-gnu.mn} (100%) + rename gdb/{i386-gnu-nat.c => x86-gnu-nat.c} (68%) + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index 84bc54b303e..67a15e2cc68 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -737,6 +737,7 @@ ALL_64_TARGET_OBS = \ + amd64-darwin-tdep.o \ + amd64-dicos-tdep.o \ + amd64-fbsd-tdep.o \ ++ amd64-gnu-tdep.o \ + amd64-linux-tdep.o \ + amd64-netbsd-tdep.o \ + amd64-obsd-tdep.o \ +@@ -1688,6 +1689,7 @@ ALLDEPFILES = \ + amd64-dicos-tdep.c \ + amd64-fbsd-nat.c \ + amd64-fbsd-tdep.c \ ++ amd64-gnu-tdep.c \ + amd64-linux-nat.c \ + amd64-linux-tdep.c \ + amd64-nat.c \ +@@ -1743,7 +1745,6 @@ ALLDEPFILES = \ + i386-dicos-tdep.c \ + i386-fbsd-nat.c \ + i386-fbsd-tdep.c \ +- i386-gnu-nat.c \ + i386-gnu-tdep.c \ + i386-linux-nat.c \ + i386-linux-tdep.c \ +@@ -1872,6 +1873,7 @@ ALLDEPFILES = \ + vax-tdep.c \ + windows-nat.c \ + windows-tdep.c \ ++ x86-gnu-nat.c \ + x86-nat.c \ + x86-tdep.c \ + xcoffread.c \ +diff --git a/gdb/amd64-gnu-tdep.c b/gdb/amd64-gnu-tdep.c +new file mode 100644 +index 00000000000..435095e3359 +--- /dev/null ++++ b/gdb/amd64-gnu-tdep.c +@@ -0,0 +1,231 @@ ++/* Target-dependent code for the GNU Hurd. ++ Copyright (C) 2024 Free Software Foundation, Inc. ++ ++ This file is part of GDB. ++ ++ 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 ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see . */ ++ ++#include "defs.h" ++#include "extract-store-integer.h" ++#include "gdbcore.h" ++#include "osabi.h" ++#include "solib-svr4.h" ++ ++#include "amd64-tdep.h" ++#include "glibc-tdep.h" ++ ++/* Recognizing signal handler frames. */ ++ ++/* When the GNU/Hurd libc calls a signal handler, the return address points ++ inside the trampoline assembly snippet. ++ ++ If the trampoline function name can not be identified, we resort to reading ++ memory from the process in order to identify it. */ ++ ++static const gdb_byte gnu_sigtramp_code[] = ++{ ++/* rpc_wait_trampoline: */ ++ 0x48, 0xc7, 0xc0, 0xe7, 0xff, 0xff, 0xff, /* mov $-25,%rax */ ++ 0x0f, 0x05, /* syscall */ ++ 0x49, 0x89, 0x04, 0x24, /* mov %rax,(%r12) */ ++ 0x48, 0x89, 0xdc, /* mov %rbx,%rsp */ ++ ++/* trampoline: */ ++ 0x5f, /* pop %rdi */ ++ 0x5e, /* pop %rsi */ ++ 0x5a, /* pop %rdx */ ++ 0x48, 0x83, 0xc4, 0x08, /* add $0x8,%rsp */ ++ 0x41, 0xff, 0xd5, /* call *%r13 */ ++ ++/* RA HERE */ ++ 0x48, 0x8b, 0x7c, 0x24, 0x10, /* mov 0x10(%rsp),%rdi */ ++ 0xc3, /* ret */ ++ ++/* firewall: */ ++ 0xf4, /* hlt */ ++}; ++ ++#define GNU_SIGTRAMP_LEN (sizeof gnu_sigtramp_code) ++#define GNU_SIGTRAMP_TAIL 7 /* length of tail after RA */ ++ ++/* If THIS_FRAME is a sigtramp routine, return the address of the ++ start of the routine. Otherwise, return 0. */ ++ ++static CORE_ADDR ++amd64_gnu_sigtramp_start (frame_info_ptr this_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (this_frame); ++ gdb_byte buf[GNU_SIGTRAMP_LEN]; ++ ++ if (!safe_frame_unwind_memory (this_frame, ++ pc + GNU_SIGTRAMP_TAIL - GNU_SIGTRAMP_LEN, ++ buf)) ++ return 0; ++ ++ if (memcmp (buf, gnu_sigtramp_code, GNU_SIGTRAMP_LEN) != 0) ++ return 0; ++ ++ return pc; ++} ++ ++/* Return whether THIS_FRAME corresponds to a Hurd sigtramp routine. */ ++ ++static int ++amd64_gnu_sigtramp_p (const frame_info_ptr &this_frame) ++{ ++ CORE_ADDR pc = get_frame_pc (this_frame); ++ const char *name; ++ ++ find_pc_partial_function (pc, &name, NULL, NULL); ++ ++ /* If we have a NAME, we can check for the trampoline function */ ++ if (name != NULL && strcmp (name, "trampoline") == 0) ++ return 1; ++ ++ return amd64_gnu_sigtramp_start (this_frame) != 0; ++} ++ ++/* Offset to sc_i386_thread_state in sigcontext, from . */ ++#define AMD64_GNU_SIGCONTEXT_THREAD_STATE_OFFSET 32 ++ ++/* Assuming THIS_FRAME is a Hurd sigtramp routine, return the ++ address of the associated sigcontext structure. */ ++ ++static CORE_ADDR ++amd64_gnu_sigcontext_addr (const frame_info_ptr &this_frame) ++{ ++ struct gdbarch *gdbarch = get_frame_arch (this_frame); ++ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); ++ CORE_ADDR pc; ++ CORE_ADDR sp; ++ gdb_byte buf[8]; ++ ++ get_frame_register (this_frame, AMD64_RSP_REGNUM, buf); ++ sp = extract_unsigned_integer (buf, 8, byte_order); ++ ++ pc = amd64_gnu_sigtramp_start (this_frame); ++ if (pc) ++ { ++ CORE_ADDR sigcontext_addr; ++ ++ /* The sigcontext structure address is passed as the third argument ++ * of the signal handler but %RDX is not saved across calls. Luckily, ++ * the structured is saved underneath the &__sigreturn and a dummy word ++ * to fill the slot for the address for __sigreturn to return to. ++ */ ++ read_memory (sp + 16, buf, 8); ++ sigcontext_addr = extract_unsigned_integer (buf, 8, byte_order); ++ return sigcontext_addr + AMD64_GNU_SIGCONTEXT_THREAD_STATE_OFFSET; ++ } ++ ++ error (_("Couldn't recognize signal trampoline.")); ++ return 0; ++} ++ ++/* Mapping between the general-purpose registers in `struct ++ sigcontext' format (starting at sc_i386_thread_state) ++ and GDB's register cache layout. */ ++ ++/* From . */ ++static int amd64_gnu_sc_reg_offset[] = ++{ ++ 15 * 8, /* %rax */ ++ 12 * 8, /* %rbx */ ++ 14 * 8, /* %rcx */ ++ 13 * 8, /* %rdx */ ++ 10 * 8, /* %rsi */ ++ 9 * 8, /* %rdi */ ++ 10 * 8, /* %rbp */ ++ 11 * 8, /* %rsp */ ++ 0 * 8, /* %r8 ... */ ++ 8 * 8, ++ 7 * 8, ++ 6 * 8, ++ 3 * 8, ++ 2 * 8, ++ 1 * 8, ++ 0 * 8, /* ... %r15 */ ++ 16 * 8, /* %rip */ ++ 18 * 8, /* %eflags */ ++ 17 * 8, /* %cs */ ++}; ++ ++/* From . */ ++static int amd64_gnu_gregset_reg_offset[] = ++{ ++ 10 * 8, /* %rax */ ++ 5 * 8, /* %rbx */ ++ 11 * 8, /* %rcx */ ++ 12 * 8, /* %rdx */ ++ 13 * 8, /* %rsi */ ++ 14 * 8, /* %rdi */ ++ 4 * 8, /* %rbp */ ++ 19 * 8, /* %rsp */ ++ 9 * 8, /* %r8 ... */ ++ 8 * 8, ++ 7 * 8, ++ 6 * 8, ++ 3 * 8, ++ 2 * 8, ++ 1 * 8, ++ 0 * 8, /* ... %r15 */ ++ 16 * 8, /* %rip */ ++ 18 * 8, /* %eflags */ ++ 17 * 8, /* %cs */ ++ -1, /* %ss */ ++ -1, /* %ds */ ++ -1, /* %es */ ++ -1, /* %fs */ ++ -1, /* %gs */ ++}; ++ ++static void ++amd64_gnu_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) ++{ ++ i386_gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); ++ ++ amd64_init_abi (info, gdbarch, ++ amd64_target_description (X86_XSTATE_SSE_MASK, true)); ++ ++ /* Enable TLS support. */ ++ set_gdbarch_fetch_tls_load_module_address (gdbarch, ++ svr4_fetch_objfile_link_map); ++ ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); ++ ++ /* Hurd uses the dynamic linker included in the GNU C Library. */ ++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver); ++ ++ tdep->gregset_reg_offset = amd64_gnu_gregset_reg_offset; ++ tdep->gregset_num_regs = ARRAY_SIZE (amd64_gnu_gregset_reg_offset); ++ tdep->sizeof_gregset = 21 * 8; /* sizeof (struct i386_thread_state); */ ++ ++ tdep->sigtramp_p = amd64_gnu_sigtramp_p; ++ tdep->sigcontext_addr = amd64_gnu_sigcontext_addr; ++ tdep->sc_reg_offset = amd64_gnu_sc_reg_offset; ++ tdep->sc_num_regs = ARRAY_SIZE (amd64_gnu_sc_reg_offset); ++ ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_solib_svr4_fetch_link_map_offsets ++ (gdbarch, svr4_lp64_fetch_link_map_offsets); ++} ++ ++void _initialize_amd64_gnu_tdep (); ++void ++_initialize_amd64_gnu_tdep () ++{ ++ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, ++ GDB_OSABI_HURD, amd64_gnu_init_abi); ++} +diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-x86-gnu.h +similarity index 83% +rename from gdb/config/i386/nm-i386gnu.h +rename to gdb/config/i386/nm-x86-gnu.h +index d2d5de83948..ed4d1729227 100644 +--- a/gdb/config/i386/nm-i386gnu.h ++++ b/gdb/config/i386/nm-x86-gnu.h +@@ -22,9 +22,16 @@ + /* Thread flavors used in re-setting the T bit. */ + #define THREAD_STATE_FLAVOR i386_REGS_SEGS_STATE + #define THREAD_STATE_SIZE i386_THREAD_STATE_COUNT ++#ifdef __x86_64__ ++#define THREAD_STATE_SET_TRACED(state) \ ++ ((struct i386_thread_state *) (state))->rfl |= 0x100 ++#define THREAD_STATE_CLEAR_TRACED(state) \ ++ ((((struct i386_thread_state *) (state))->rfl &= ~0x100), 1) ++#else + #define THREAD_STATE_SET_TRACED(state) \ + ((struct i386_thread_state *) (state))->efl |= 0x100 + #define THREAD_STATE_CLEAR_TRACED(state) \ + ((((struct i386_thread_state *) (state))->efl &= ~0x100), 1) ++#endif /* __x86_64__ */ + + #endif /* CONFIG_I386_NM_I386GNU_H */ +diff --git a/gdb/config/i386/i386gnu.mn b/gdb/config/i386/x86-gnu.mn +similarity index 100% +rename from gdb/config/i386/i386gnu.mn +rename to gdb/config/i386/x86-gnu.mn +diff --git a/gdb/configure.host b/gdb/configure.host +index da71675b201..999af8e59ae 100644 +--- a/gdb/configure.host ++++ b/gdb/configure.host +@@ -184,6 +184,7 @@ x86_64-*-mingw*) gdb_host=mingw64 + gdb_host_obs=mingw-hdep.o + ;; + x86_64-*-cygwin*) gdb_host=cygwin64 ;; ++x86_64-*-gnu*) gdb_host=gnu64 ;; + m32r*-*-linux*) gdb_host=linux ;; + + xtensa*-*-linux*) gdb_host=linux ;; +diff --git a/gdb/configure.nat b/gdb/configure.nat +index 8b98511cef7..00402f888a9 100644 +--- a/gdb/configure.nat ++++ b/gdb/configure.nat +@@ -211,23 +211,44 @@ case ${gdb_host} in + ;; + esac + ;; ++ gnu64) ++ case ${gdb_host_cpu} in ++ i386) ++ # Host: x86_64 running the GNU Hurd ++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \ ++ x86-nat.o nat/x86-dregs.o \ ++ amd64-nat.o fork-child.o \ ++ nat/fork-inferior.o \ ++ notify_S.o process_reply_S.o msg_reply_S.o \ ++ msg_U.o exc_request_U.o exc_request_S.o' ++ HAVE_NATIVE_GCORE_HOST=1 ++ ++ NAT_FILE='nm-x86-gnu.h' ++ MH_CFLAGS='-D_GNU_SOURCE' ++ ++ XM_CLIBS='-lshouldbeinlibc' ++ ++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn" ++ ;; ++ esac ++ ;; + i386gnu) + case ${gdb_host_cpu} in + i386) + # Host: Intel 386 running the GNU Hurd +- NATDEPFILES='i386-gnu-nat.o gnu-nat.o \ ++ NATDEPFILES='x86-gnu-nat.o gnu-nat.o \ + x86-nat.o nat/x86-dregs.o fork-child.o \ + nat/fork-inferior.o \ + notify_S.o process_reply_S.o msg_reply_S.o \ + msg_U.o exc_request_U.o exc_request_S.o' + HAVE_NATIVE_GCORE_HOST=1 + +- NAT_FILE='nm-i386gnu.h' ++ NAT_FILE='nm-x86-gnu.h' + MH_CFLAGS='-D_GNU_SOURCE' + + XM_CLIBS='-lshouldbeinlibc' + +- nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/i386gnu.mn" ++ nat_makefile_frag="${srcdir}/config/${gdb_host_cpu}/x86-gnu.mn" + ;; + esac + ;; +diff --git a/gdb/configure.tgt b/gdb/configure.tgt +index 47a674201f9..df9e9917ad1 100644 +--- a/gdb/configure.tgt ++++ b/gdb/configure.tgt +@@ -328,7 +328,7 @@ i[34567]86-*-linux*) + ;; + i[34567]86-*-gnu*) + # Target: Intel 386 running the GNU Hurd +- gdb_target_obs="i386-gnu-tdep.o solib-svr4.o" ++ gdb_target_obs="i386-gnu-tdep.o glibc-tdep.o solib-svr4.o" + ;; + i[34567]86-*-cygwin*) + # Target: Intel 386 running win32 +@@ -744,6 +744,10 @@ x86_64-*-openbsd*) + x86_64-*-rtems*) + gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o" + ;; ++x86_64-*-gnu*) ++ # Target: x86_64 running the GNU Hurd ++ gdb_target_obs="amd64-gnu-tdep.o glibc-tdep.o solib-svr4.o" ++ ;; + xtensa*-*-*linux*) + # Target: GNU/Linux Xtensa + gdb_target_obs="xtensa-linux-tdep.o symfile-mem.o linux-tdep.o" +diff --git a/gdb/i386-gnu-tdep.c b/gdb/i386-gnu-tdep.c +index 98e11518a91..5ffc1388ec0 100644 +--- a/gdb/i386-gnu-tdep.c ++++ b/gdb/i386-gnu-tdep.c +@@ -21,6 +21,7 @@ + #include "osabi.h" + #include "solib-svr4.h" + ++#include "glibc-tdep.h" + #include "i386-tdep.h" + + /* Recognizing signal handler frames. */ +@@ -72,8 +73,7 @@ i386_gnu_sigtramp_start (const frame_info_ptr &this_frame) + return pc; + } + +-/* Return whether THIS_FRAME corresponds to a GNU/Linux sigtramp +- routine. */ ++/* Return whether THIS_FRAME corresponds to a Hurd sigtramp routine. */ + + static int + i386_gnu_sigtramp_p (const frame_info_ptr &this_frame) +@@ -178,9 +178,18 @@ i386gnu_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) + /* GNU uses ELF. */ + i386_elf_init_abi (info, gdbarch); + ++ /* Hurd uses SVR4-style shared libraries. */ ++ set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_ilp32_fetch_link_map_offsets); + ++ /* Hurd uses the dynamic linker included in the GNU C Library. */ ++ set_gdbarch_skip_solib_resolver (gdbarch, glibc_skip_solib_resolver); ++ ++ /* Enable TLS support. */ ++ set_gdbarch_fetch_tls_load_module_address (gdbarch, ++ svr4_fetch_objfile_link_map); ++ + tdep->gregset_reg_offset = i386gnu_gregset_reg_offset; + tdep->gregset_num_regs = ARRAY_SIZE (i386gnu_gregset_reg_offset); + tdep->sizeof_gregset = 19 * 4; +diff --git a/gdb/i386-gnu-nat.c b/gdb/x86-gnu-nat.c +similarity index 68% +rename from gdb/i386-gnu-nat.c +rename to gdb/x86-gnu-nat.c +index 52d4a4b7cec..da3b7e923dd 100644 +--- a/gdb/i386-gnu-nat.c ++++ b/gdb/x86-gnu-nat.c +@@ -34,7 +34,13 @@ extern "C" + #include "floatformat.h" + #include "regcache.h" + ++ ++#ifdef __x86_64__ ++#include "amd64-tdep.h" ++#include "amd64-nat.h" ++#else + #include "i386-tdep.h" ++#endif + + #include "inf-child.h" + #include "i387-tdep.h" +@@ -42,21 +48,82 @@ extern "C" + /* Offset to the thread_state_t location where REG is stored. */ + #define REG_OFFSET(reg) offsetof (struct i386_thread_state, reg) + ++#ifdef __x86_64__ ++ + /* At REG_OFFSET[N] is the offset to the thread_state_t location where + the GDB register N is stored. */ +-static int reg_offset[] = ++static int amd64_gnu_thread_state_reg_offset[] = + { +- REG_OFFSET (eax), REG_OFFSET (ecx), REG_OFFSET (edx), REG_OFFSET (ebx), +- REG_OFFSET (uesp), REG_OFFSET (ebp), REG_OFFSET (esi), REG_OFFSET (edi), +- REG_OFFSET (eip), REG_OFFSET (efl), REG_OFFSET (cs), REG_OFFSET (ss), +- REG_OFFSET (ds), REG_OFFSET (es), REG_OFFSET (fs), REG_OFFSET (gs) ++ REG_OFFSET (rax), /* %rax */ ++ REG_OFFSET (rbx), /* %rbx */ ++ REG_OFFSET (rcx), /* %rcx */ ++ REG_OFFSET (rdx), /* %rdx */ ++ REG_OFFSET (rsi), /* %rsi */ ++ REG_OFFSET (rdi), /* %rdi */ ++ REG_OFFSET (rbp), /* %rbp */ ++ REG_OFFSET (ursp), /* %rsp */ ++ REG_OFFSET (r8), /* %r8 ... */ ++ REG_OFFSET (r9), ++ REG_OFFSET (r10), ++ REG_OFFSET (r11), ++ REG_OFFSET (r12), ++ REG_OFFSET (r13), ++ REG_OFFSET (r14), ++ REG_OFFSET (r15), /* ... %r15 */ ++ REG_OFFSET (rip), /* %rip */ ++ REG_OFFSET (rfl), /* %rflags */ ++ REG_OFFSET (cs) /* %cs */ + }; + +-#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum]) ++static const int amd64_gnu_thread_state_num_regs = ++ ARRAY_SIZE (amd64_gnu_thread_state_reg_offset); ++ ++#define REG_ADDR(state, regnum) \ ++ ((char *)(state) + amd64_gnu_thread_state_reg_offset[regnum]) ++#define VALID_REGISTER(regnum) \ ++ ((regnum) >= 0 && (regnum) < amd64_gnu_thread_state_num_regs) ++#define NUM_GREGS amd64_gnu_thread_state_num_regs ++#define FLAGS_REGISTER rfl ++ ++#else ++ ++/* At REG_OFFSET[N] is the offset to the thread_state_t location where ++ the GDB register N is stored. */ ++static int i386_gnu_thread_state_reg_offset[] = ++{ ++ REG_OFFSET (eax), /* %eax */ ++ REG_OFFSET (ecx), /* %ecx */ ++ REG_OFFSET (edx), /* %edx */ ++ REG_OFFSET (ebx), /* %ebx */ ++ REG_OFFSET (uesp), /* %esp */ ++ REG_OFFSET (ebp), /* %ebp */ ++ REG_OFFSET (esi), /* %esi */ ++ REG_OFFSET (edi), /* %edi */ ++ REG_OFFSET (eip), /* %eip */ ++ REG_OFFSET (efl), /* %efl */ ++ REG_OFFSET (cs), /* %cs */ ++ REG_OFFSET (ss), /* %ss */ ++ REG_OFFSET (ds), /* %ds */ ++ REG_OFFSET (es), /* %es */ ++ REG_OFFSET (fs), /* %fs */ ++ REG_OFFSET (gs) /* gs */ ++}; ++ ++static const int i386_gnu_thread_state_num_regs = ++ ARRAY_SIZE (i386_gnu_thread_state_reg_offset); ++ ++#define REG_ADDR(state, regnum) \ ++ ((char *)(state) + i386_gnu_thread_state_reg_offset[regnum]) ++#define VALID_REGISTER(regnum) \ ++ ((regnum) >= 0 && (regnum) < i386_gnu_thread_state_num_regs) ++#define NUM_GREGS i386_gnu_thread_state_num_regs ++#define FLAGS_REGISTER efl ++ ++#endif /* __x86_64__ */ + + + +-/* The i386 GNU Hurd target. */ ++/* The x86 GNU Hurd target. */ + + #ifdef i386_DEBUG_STATE + using gnu_base_target = x86_nat_target; +@@ -64,13 +131,13 @@ using gnu_base_target = x86_nat_target; + using gnu_base_target = gnu_nat_target; + #endif + +-struct i386_gnu_nat_target final : public gnu_base_target ++struct x86_gnu_nat_target final : public gnu_base_target + { + void fetch_registers (struct regcache *, int) override; + void store_registers (struct regcache *, int) override; + }; + +-static i386_gnu_nat_target the_i386_gnu_nat_target; ++static x86_gnu_nat_target the_x86_gnu_nat_target; + + /* Get the whole floating-point state of THREAD and record the values + of the corresponding (pseudo) registers. */ +@@ -105,7 +172,7 @@ fetch_fpregs (struct regcache *regcache, struct proc *thread) + + /* Fetch register REGNO, or all regs if REGNO is -1. */ + void +-i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) ++x86_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + { + struct proc *thread; + ptid_t ptid = regcache->ptid (); +@@ -118,7 +185,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + error (_("Can't fetch registers from thread %s: No such thread"), + target_pid_to_str (ptid).c_str ()); + +- if (regno < I386_NUM_GREGS || regno == -1) ++ if (VALID_REGISTER (regno) || regno == -1) + { + thread_state_t state; + +@@ -137,7 +204,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + + proc_debug (thread, "fetching all register"); + +- for (i = 0; i < I386_NUM_GREGS; i++) ++ for (i = 0; i < NUM_GREGS; i++) + regcache->raw_supply (i, REG_ADDR (state, i)); + thread->fetched_regs = ~0; + } +@@ -152,7 +219,7 @@ i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno) + } + } + +- if (regno >= I386_NUM_GREGS || regno == -1) ++ if (!VALID_REGISTER(regno) || regno == -1) + { + proc_debug (thread, "fetching floating-point registers"); + +@@ -195,7 +262,7 @@ store_fpregs (const struct regcache *regcache, struct proc *thread, int regno) + + /* Store at least register REGNO, or all regs if REGNO == -1. */ + void +-i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) ++x86_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + { + struct proc *thread; + struct gdbarch *gdbarch = regcache->arch (); +@@ -209,7 +276,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + error (_("Couldn't store registers into thread %s: No such thread"), + target_pid_to_str (ptid).c_str ()); + +- if (regno < I386_NUM_GREGS || regno == -1) ++ if (VALID_REGISTER (regno) || regno == -1) + { + thread_state_t state; + thread_state_data_t old_state; +@@ -230,14 +297,14 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + + /* Save the T bit. We might try to restore the %eflags register + below, but changing the T bit would seriously confuse GDB. */ +- trace = ((struct i386_thread_state *)state)->efl & 0x100; ++ trace = ((struct i386_thread_state *)state)->FLAGS_REGISTER & 0x100; + + if (!was_aborted && was_valid) + /* See which registers have changed after aborting the thread. */ + { + int check_regno; + +- for (check_regno = 0; check_regno < I386_NUM_GREGS; check_regno++) ++ for (check_regno = 0; check_regno < NUM_GREGS; check_regno++) + if ((thread->fetched_regs & (1 << check_regno)) + && memcpy (REG_ADDR (&old_state, check_regno), + REG_ADDR (state, check_regno), +@@ -262,7 +329,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + + proc_debug (thread, "storing all registers"); + +- for (i = 0; i < I386_NUM_GREGS; i++) ++ for (i = 0; i < NUM_GREGS; i++) + if (REG_VALID == regcache->get_register_status (i)) + regcache->raw_collect (i, REG_ADDR (state, i)); + } +@@ -276,11 +343,11 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + } + + /* Restore the T bit. */ +- ((struct i386_thread_state *)state)->efl &= ~0x100; +- ((struct i386_thread_state *)state)->efl |= trace; ++ ((struct i386_thread_state *)state)->FLAGS_REGISTER &= ~0x100; ++ ((struct i386_thread_state *)state)->FLAGS_REGISTER |= trace; + } + +- if (regno >= I386_NUM_GREGS || regno == -1) ++ if (!VALID_REGISTER (regno) || regno == -1) + { + proc_debug (thread, "storing floating-point registers"); + +@@ -295,7 +362,7 @@ i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno) + /* Get debug registers for thread THREAD. */ + + static void +-i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) ++x86_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) + { + mach_msg_type_number_t count = i386_DEBUG_STATE_COUNT; + kern_return_t err; +@@ -310,7 +377,7 @@ i386_gnu_dr_get (struct i386_debug_state *regs, struct proc *thread) + /* Set debug registers for thread THREAD. */ + + static void +-i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) ++x86_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) + { + kern_return_t err; + +@@ -324,23 +391,23 @@ i386_gnu_dr_set (const struct i386_debug_state *regs, struct proc *thread) + /* Set DR_CONTROL in THREAD. */ + + static void +-i386_gnu_dr_set_control_one (struct proc *thread, void *arg) ++x86_gnu_dr_set_control_one (struct proc *thread, void *arg) + { + unsigned long *control = (unsigned long *) arg; + struct i386_debug_state regs; + +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + regs.dr[DR_CONTROL] = *control; +- i386_gnu_dr_set (®s, thread); ++ x86_gnu_dr_set (®s, thread); + } + + /* Set DR_CONTROL to CONTROL in all threads. */ + + static void +-i386_gnu_dr_set_control (unsigned long control) ++x86_gnu_dr_set_control (unsigned long control) + { + inf_update_procs (gnu_current_inf); +- inf_threads (gnu_current_inf, i386_gnu_dr_set_control_one, &control); ++ inf_threads (gnu_current_inf, x86_gnu_dr_set_control_one, &control); + } + + /* Parameters to set a debugging address. */ +@@ -354,20 +421,20 @@ struct reg_addr + /* Set address REGNUM (zero based) to ADDR in THREAD. */ + + static void +-i386_gnu_dr_set_addr_one (struct proc *thread, void *arg) ++x86_gnu_dr_set_addr_one (struct proc *thread, void *arg) + { + struct reg_addr *reg_addr = (struct reg_addr *) arg; + struct i386_debug_state regs; + +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + regs.dr[reg_addr->regnum] = reg_addr->addr; +- i386_gnu_dr_set (®s, thread); ++ x86_gnu_dr_set (®s, thread); + } + + /* Set address REGNUM (zero based) to ADDR in all threads. */ + + static void +-i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr) ++x86_gnu_dr_set_addr (int regnum, CORE_ADDR addr) + { + struct reg_addr reg_addr; + +@@ -377,13 +444,13 @@ i386_gnu_dr_set_addr (int regnum, CORE_ADDR addr) + reg_addr.addr = addr; + + inf_update_procs (gnu_current_inf); +- inf_threads (gnu_current_inf, i386_gnu_dr_set_addr_one, ®_addr); ++ inf_threads (gnu_current_inf, x86_gnu_dr_set_addr_one, ®_addr); + } + + /* Get debug register REGNUM value from only the one LWP of PTID. */ + + static unsigned long +-i386_gnu_dr_get_reg (ptid_t ptid, int regnum) ++x86_gnu_dr_get_reg (ptid_t ptid, int regnum) + { + struct i386_debug_state regs; + struct proc *thread; +@@ -392,7 +459,7 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum) + inf_update_procs (gnu_current_inf); + + thread = inf_tid_to_thread (gnu_current_inf, ptid.lwp ()); +- i386_gnu_dr_get (®s, thread); ++ x86_gnu_dr_get (®s, thread); + + return regs.dr[regnum]; + } +@@ -400,46 +467,50 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum) + /* Return the inferior's debug register REGNUM. */ + + static CORE_ADDR +-i386_gnu_dr_get_addr (int regnum) ++x86_gnu_dr_get_addr (int regnum) + { + gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); + +- return i386_gnu_dr_get_reg (inferior_ptid, regnum); ++ return x86_gnu_dr_get_reg (inferior_ptid, regnum); + } + + /* Get DR_STATUS from only the one thread of INFERIOR_PTID. */ + + static unsigned long +-i386_gnu_dr_get_status (void) ++x86_gnu_dr_get_status (void) + { +- return i386_gnu_dr_get_reg (inferior_ptid, DR_STATUS); ++ return x86_gnu_dr_get_reg (inferior_ptid, DR_STATUS); + } + + /* Return the inferior's DR7 debug control register. */ + + static unsigned long +-i386_gnu_dr_get_control (void) ++x86_gnu_dr_get_control (void) + { +- return i386_gnu_dr_get_reg (inferior_ptid, DR_CONTROL); ++ return x86_gnu_dr_get_reg (inferior_ptid, DR_CONTROL); + } + #endif /* i386_DEBUG_STATE */ + +-void _initialize_i386gnu_nat (); ++void _initialize_x86_gnu_nat (); + void +-_initialize_i386gnu_nat () ++_initialize_x86_gnu_nat () + { + #ifdef i386_DEBUG_STATE +- x86_dr_low.set_control = i386_gnu_dr_set_control; ++ x86_dr_low.set_control = x86_gnu_dr_set_control; + gdb_assert (DR_FIRSTADDR == 0 && DR_LASTADDR < i386_DEBUG_STATE_COUNT); +- x86_dr_low.set_addr = i386_gnu_dr_set_addr; +- x86_dr_low.get_addr = i386_gnu_dr_get_addr; +- x86_dr_low.get_status = i386_gnu_dr_get_status; +- x86_dr_low.get_control = i386_gnu_dr_get_control; ++ x86_dr_low.set_addr = x86_gnu_dr_set_addr; ++ x86_dr_low.get_addr = x86_gnu_dr_get_addr; ++ x86_dr_low.get_status = x86_gnu_dr_get_status; ++ x86_dr_low.get_control = x86_gnu_dr_get_control; ++#ifdef __x86_64__ ++ x86_set_debug_register_length (8); ++#else + x86_set_debug_register_length (4); ++#endif + #endif /* i386_DEBUG_STATE */ + +- gnu_target = &the_i386_gnu_nat_target; ++ gnu_target = &the_x86_gnu_nat_target; + + /* Register the target. */ +- add_inf_child_target (&the_i386_gnu_nat_target); ++ add_inf_child_target (&the_x86_gnu_nat_target); + } +-- +2.46.0 + +From 7cfe6f639e601d6cca567342360ecbd3cdca128c Mon Sep 17 00:00:00 2001 +From: Flavio Cruz +Date: Wed, 3 Jul 2024 23:05:06 +0100 +Subject: [PATCH 2/2] Hurd: do not include defs.h when compiling MiG stubs + since they are compiled as C files + +Otherwise, GDB will fail to compile for Hurd. +--- + gdb/Makefile.in | 3 ++- + gdb/config/i386/x86-gnu.mn | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gdb/Makefile.in b/gdb/Makefile.in +index 67a15e2cc68..d847a8bad72 100644 +--- a/gdb/Makefile.in ++++ b/gdb/Makefile.in +@@ -603,11 +603,12 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) + # your system doesn't have fcntl.h in /usr/include (which is where it + # should be according to Posix). + DEFS = @DEFS@ ++GDB_INCLUDED_HEADER = -include $(srcdir)/defs.h + GDB_CFLAGS = \ + -I. \ + -I$(srcdir) \ + -I$(srcdir)/config \ +- -include $(srcdir)/defs.h \ ++ $(GDB_INCLUDED_HEADER) \ + -DLOCALEDIR="\"$(localedir)\"" \ + $(DEFS) + +diff --git a/gdb/config/i386/x86-gnu.mn b/gdb/config/i386/x86-gnu.mn +index b7414e3bcb4..24c58b02e98 100644 +--- a/gdb/config/i386/x86-gnu.mn ++++ b/gdb/config/i386/x86-gnu.mn +@@ -21,7 +21,9 @@ MIGCOM = $(MIG) -cc cat - /dev/null + | $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h + + # MIG stubs are not yet ready for C++ compilation. +-%_S.o %_U.o : COMPILE.post += -x c -include gnu-nat-mig.h ++%_S.o %_U.o : COMPILE.post += -x c ++# Do not include defs.h since it requires C++. Rather include our own gnu-nat-mig.h ++%_S.o %_U.o : GDB_INCLUDED_HEADER = -include gnu-nat-mig.h + + NAT_GENERATED_FILES = notify_S.h notify_S.c \ + process_reply_S.h process_reply_S.c \ +-- +2.46.0 + -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 51/58] system: examples: Add devel-hurd64.tmpl. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:32 +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.173243504518354 (code B ref 74290); Sun, 24 Nov 2024 07:57:32 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:25 +0000 Received: from localhost ([127.0.0.1]:60894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ui-0004li-9E for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UE-0004dC-Cy for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:55 -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 1tF7U9-0002Ic-6i; Sun, 24 Nov 2024 02:56:49 -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=7gbNsATbjXb2kpk7BHDgk2nAhT3t7Z4uLWUboY9VNLs=; b=kZ3DVapJ/nMJsqzkWbnv 9eoygZpYwolsjXr/zA++TL6eO9/cfLL1haQB3Pkjzt3h0rGdsRL33XzLsLPi+FXm0yMU52i/bP9iV 0gw8r+Chhlu9CXbYaMPKe3oq1LraFqSZyOy2nkQkjHXOXncXQ1tAF1vNoEGRw94+Tn7tu0X3kP4a/ EDL5UzIIumLBoknyhFt1AuHw+ICHmsMCbjaimoqZPU5HIgNUzazuQ8geube7R/vwL1VF2HsNH57lG o906HAI4UB1wwafKKKQgOVZNS/MFS1L5B/UXUVzZ7KPo5rj7qJckCmrSiYHekappwzMpraqyN+wiD 1P0BKZek/wNMsg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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..146a35adcf --- /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-15 + git-minimal + gnu-make + m4 + openssh-sans-x + (append + guix-packages + hurd-packages + %base-packages/hurd))))) + +%hurd64-devel-os -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 52/58] gnu: Use gcc-14, gcc-toolchain-14 on the 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: Sun, 24 Nov 2024 07:57:33 +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.173243504518367 (code B ref 74290); Sun, 24 Nov 2024 07:57:33 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:25 +0000 Received: from localhost ([127.0.0.1]:60897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uj-0004ly-6m for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UF-0004dK-9K for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:55 -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 1tF7UA-0002Ij-3D; Sun, 24 Nov 2024 02:56:50 -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=nIPQ9KKvElj9RO8ubX0wnllGEGxd+ijB69ou0YJogJw=; b=KigKCP2EUub+87YfejfD 6+qYYpYx8+ob1zJ42BMNzWA9ZVRyqFxQ/hVp/8TKttRD8+FmA7HF07kedo/YfyCMTrWG6acHWcYKy QtTHIdNw9ZzTFP3NWeuKCk2L4MRdogNMwx5PqffdYIqrAjwbwsaXuQqd++YtG+0lq1g3XjbWJG3wU ZC86M8x86FATqnI2k8mjvEg9RLn1NmJGTsCaZYBKYaahGSvpbJ5zndz504/6Ji1zDfjDvREJsTE5W O64hBe/cupVqM841F0E7b3lI4kGOzi7PQq4xJW2emLriDu4iZ6U3sO40TsU4TXR6yZ+LkFw3mMhTe 6o3IuSjSyiRPFg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:15 +0100 Message-ID: <55654c05fe45127e85fead81e90c0516c760d93a.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) This enables building packages in a 64bit childhurd. It will not enable offloading to a childhurd. * guix/utils.scm (host-hurd?, host-x86-64, host-hurd64?): New procedures. * gnu/packages/commencement.scm (gcc-toolchain): Use them to determine if the host is a 64bit Hurd, and use gcc-toolchain-14. * gnu/packages/gcc.scm (gcc): Likewise, to use gcc-14. Change-Id: I55e43fdc61e3ea5fc13065fc7ca854b951c94930 --- gnu/packages/commencement.scm | 4 +++- gnu/packages/gcc.scm | 5 ++++- guix/utils.scm | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index a14de3002f..3f11bb3384 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3642,7 +3642,9 @@ (define-public gcc-toolchain-14 ;; The default GCC (define-public gcc-toolchain - gcc-toolchain-11) + (if (host-hurd64?) + gcc-toolchain-14 + gcc-toolchain-11)) (define-public gcc-toolchain-aka-gcc ;; It's natural for users to try "guix install gcc". This package diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index e437bf5826..6247919fec 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -858,7 +858,10 @@ (define-public gcc-14 ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions. -(define-public gcc gcc-11) +(define-public gcc + (if (host-hurd64?) + gcc-14 + gcc-11)) ;;; diff --git a/guix/utils.scm b/guix/utils.scm index e100c03365..537d0490e0 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -96,6 +96,9 @@ (define-module (guix utils) system-hurd? target-hurd64? system-hurd64? + host-hurd? + host-hurd64? + host-x86-64? target-mingw? target-x86-32? target-x86-64? @@ -729,6 +732,22 @@ (define* (system-hurd64?) (and (system-hurd?) (target-64bit? (%current-system)))) +(define (host-hurd?) + "Are we running on a Hurd system? This is almost never the right function, +use target-hurd? or system-hurd? instead." + (equal? (utsname:sysname (uname)) "GNU")) + +(define (host-x86-64?) + "Are we running on a x86_64 system? This is almost never the right +function, use target-x86-64? or system-x86-64? instead." + (equal? (utsname:machine (uname)) "x86_64")) + +(define (host-hurd64?) + "Are we running on a 64bit Hurd? This is almost never the right +function, use target-hurd64? or system-hurd64? instead." + (and (host-hurd?) + (host-x86-64?))) + (define* (target-mingw? #:optional (target (%current-target-system))) "Is the operating system of TARGET Windows?" (and target -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 53/58] gnu: commencement: kernel-headers-boot0: Support the 64bit Hurd. 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: Sun, 24 Nov 2024 07:57:33 +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.173243504618381 (code B ref 74290); Sun, 24 Nov 2024 07:57:33 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:26 +0000 Received: from localhost ([127.0.0.1]:60900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uj-0004mC-PB for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UG-0004dR-56 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:56 -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 1tF7UA-0002Is-V6; Sun, 24 Nov 2024 02:56:50 -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=PrN9Kk4W1Jf/U7iXJ0r18w4mwJp1ou3k1AyIvUEhUAE=; b=sObK24yJIsa24IaIYZvz sJq3qGfWFxnvWC0orcrJtf5jGL6Q3eJarrnFQjAUBNzqMvrutvtVMqelTbYstT6w5IadCRl4YZbHp wpRBYuzfL60Yqfcj92oydSMN3bajELuOarzKTinHTy3bxDiQxLHoRcmJyoAiYwgrf7M1m3X3TBe+Z HhFBRIxoumiEQzvKUS4UxgAP9O8VzDJ2GxBifz2BlyyMkniBEJGYjRmMtY3ci68SoflizgblA+jky IRg4wbQhf4jQ7lxIBGXOknkbRbWVJUx2gLY1mkljLWBS7w+sm/26YCBkB6PIpDAaPM2W2n3EDI+TN j7y4xWBv+/NHTQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:16 +0100 Message-ID: <8920d690de4871ea09c32ebcd12831cbc88351d0.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/commencement.scm (kernel-headers-boot0): Match using target-hurd? rather than "i586-gnu". Change-Id: I3c05f110674e55c97d6712202da9d9af6c1d953f --- gnu/packages/commencement.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3f11bb3384..dab65c7ca1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2742,7 +2742,7 @@ (define/system-dependent hurd-core-headers-boot0 (define* (kernel-headers-boot0 #:optional (system (%current-system))) (match system - ("i586-gnu" hurd-core-headers-boot0) + ((? target-hurd?) hurd-core-headers-boot0) (_ linux-libre-headers-boot0))) (define texinfo-boot0 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 54/58] gnu: hurd: Add refcounts-assert patch. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:34 +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.173243504718397 (code B ref 74290); Sun, 24 Nov 2024 07:57:34 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:27 +0000 Received: from localhost ([127.0.0.1]:60902 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uk-0004mM-6z for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UG-0004dS-Vg for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:57 -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 1tF7UB-0002J0-PB; Sun, 24 Nov 2024 02:56:51 -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=qoubATqRvpGsRjmPxgZA0YpRqvLFlUGMrYPhUmtDjOg=; b=TIvmAC7Job2yUyrGnVwO ZLIOiL+7/T8KHghstFUHNQxSMusfZQffNHbijrIu/tMmmdiyHITnhlBMeSz3jQbJXPfuFuYmbBam1 mhKVVI06NE2H20oumg2Fqdm0lJSpQthGaYHbOanWrL1B/Ls5kzLYwS/gRfeeJL5t/3kpPPeb1G36z e43IHNea4FvOOIQeqY9WDttH44ZW47i8mZIUj9lrMcK4CqyvHDghRz/wcrmJGFBLG/Yba8C0ojQw0 ZGNTtl0vEG820SsX9n/+zJkf5h21qULceXaDbNQkyglpUIkIXgwOtCqG5tvZOqqHLSwYZ/C5x4+xe oq3PtkltUk/WTw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:17 +0100 Message-ID: <473ee0bdce15a1b12924885e9740cd0d1b54b6f9.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) See . * gnu/packages/patches/hurd-refcounts-assert.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/hurd.scm (hurd): Use it. Change-Id: I51ee319f1b7e26a7ed0f4e9f69755aa596ea6877 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 3 ++- .../patches/hurd-refcounts-assert.patch | 26 +++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/hurd-refcounts-assert.patch diff --git a/gnu/local.mk b/gnu/local.mk index 08314ade22..c75345ee93 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1556,6 +1556,7 @@ dist_patch_DATA = \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hurd-64bit.patch \ + %D%/packages/patches/hurd-refcounts-assert.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 63249b4ef7..61833219c4 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -316,7 +316,8 @@ (define-public hurd (name "hurd") (source (origin (inherit (package-source hurd-headers)) - (patches (search-patches "hurd-rumpdisk-no-hd.patch" + (patches (search-patches "hurd-refcounts-assert.patch" + "hurd-rumpdisk-no-hd.patch" "hurd-startup.patch" "hurd-64bit.patch")))) (version (package-version hurd-headers)) diff --git a/gnu/packages/patches/hurd-refcounts-assert.patch b/gnu/packages/patches/hurd-refcounts-assert.patch new file mode 100644 index 0000000000..fe6d5e814f --- /dev/null +++ b/gnu/packages/patches/hurd-refcounts-assert.patch @@ -0,0 +1,26 @@ +Upstream-status: Taken from . + +libports-iterate-refcount.patch> + +http://lists.gnu.org/archive/html/bug-hurd/2016-03/msg00034.html + +diff --git a/libports/bucket-iterate.c b/libports/bucket-iterate.c +index b021b99..76dc3f7 100644 +--- a/libports/bucket-iterate.c ++++ b/libports/bucket-iterate.c +@@ -58,7 +58,14 @@ _ports_bucket_class_iterate (struct hurd_ihash *ht, + + if (class == 0 || pi->class == class) + { +- refcounts_ref (&pi->refcounts, NULL); ++ struct references result; ++ refcounts_unsafe_ref (&pi->refcounts, &result); ++ if (result.hard == 1 && result.weak == 0) ++ { ++ /* This one is on its way out, skip it. */ ++ refcounts_deref (&pi->refcounts, NULL); ++ continue; ++ } + p[n] = pi; + n++; + } -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 55/58] gnu: bootstrap: %bootstrap-gcc: Also wrap g++ 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: Sun, 24 Nov 2024 07:57:34 +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 , Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243504718404 (code B ref 74290); Sun, 24 Nov 2024 07:57:34 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:27 +0000 Received: from localhost ([127.0.0.1]:60907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Uk-0004mg-Uk for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UI-0004dW-16 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:58 -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 1tF7UC-0002J7-Qa; Sun, 24 Nov 2024 02:56:52 -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=NrZ6SmZrq6SBxLSl282MRapZpzQdQyajdGWxYDjNIEc=; b=ptnbPd9Q/I6WJD6SpK6v I9OAlrQkChtTFSQsAUXA0XFSaq3D5ZCT+un5YLxDB2KNRqTiRNhZ5XBL8vSGmXnORnLARfr7NnBsM nBCrowGDRRLHYJMKQGLpgYb7XqCxuskrkqrO1EG32IPAiFe2/UYTssGZHePsBUBXoFfsk0CKCnERc b0Ug7u12ZjQtEALvk9mNsy8KTLf2HzeXoMYkUUuEdKJ7jyibuNAalENpshLqj4UshqiHYdp+UmnEU 0WNGX2/kXe8+KdG0kqSIaOeW8oZYzcrAyql+VNhemz4gwagUqGsGz45eSvTPSFi6Equc/NlYzuFri /q/RZ0zbIrFpMQ==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:18 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/bootstrap.scm (%bootstrap-gcc)[arguments] When building for thee 64bit Hurd have the #:builder also wrap g++. Co-authored-by: Efraim Flashner Change-Id: I2cdbc6837e1c451f108b309f2608240a7f57b82c --- gnu/packages/bootstrap.scm | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a6cdda2122..48c7b42cc9 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -866,29 +866,36 @@ (define %bootstrap-gcc (tarball (assoc-ref %build-inputs "tarball"))) (mkdir out) - (copy-file tarball "binaries.tar.xz") + (copy-file tarball "binaries.tar.xz") ;avoid: more than one hard link (invoke xz "-d" "binaries.tar.xz") (let ((builddir (getcwd)) (bindir (string-append out "/bin"))) + + (define (wrap-program program) + (let ((wrapped (format #f ".~a-wrapped" program))) + (rename-file program wrapped) + (call-with-output-file program + (lambda (p) + (format p "#!~a +exec ~a/bin/~a -B~a/lib \ + -Wl,-rpath -Wl,~a/lib \ + -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" + bash + out wrapped + libc libc libc + ,(glibc-dynamic-linker))))) + (chmod program #o555)) + (with-directory-excursion out (invoke tar "xvf" (string-append builddir "/binaries.tar"))) (with-directory-excursion bindir (chmod "." #o755) - (rename-file "gcc" ".gcc-wrapped") - (call-with-output-file "gcc" - (lambda (p) - (format p "#!~a -exec ~a/bin/.gcc-wrapped -B~a/lib \ - -Wl,-rpath -Wl,~a/lib \ - -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" - bash - out libc libc libc - ,(glibc-dynamic-linker)))) - - (chmod "gcc" #o555) - #t)))))) + (for-each wrap-program + ,(if (target-hurd64?) + ''("gcc" "g++") + ''("gcc"))))))))) (inputs `(("tar" ,(bootstrap-executable "tar" (%current-system))) ("xz" ,(bootstrap-executable "xz" (%current-system))) -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 56/58] gnu: commencement: libstdc++-boot0: Support the 64bit Hurd. 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: Sun, 24 Nov 2024 07:59: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.173243513118709 (code B ref 74290); Sun, 24 Nov 2024 07:59:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:58:51 +0000 Received: from localhost ([127.0.0.1]:60952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7W6-0004rg-HK for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:58:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UK-0004dr-B3 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:00 -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 1tF7UF-0002JM-4q; Sun, 24 Nov 2024 02:56: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=feTzeLEZGTB7ah3HXKXNglmeGzuIMI8rPmaGtJtoGYE=; b=aK42UhKI1SZBqFseo2Dd /cucq5uqiwJXYr76XnqZHTln1f5l/OqzmNYsXFRffwj37ecDWCdyyv10u6UmG09y20TRmNdtFIlob IoybdvC/Cn4j8QfE3bBXFQ03LoEbAZGxqDBwGEFsnWaanpM3PysPLBo+t2c96b7o8vp5HPLCINkja tSRFRgPGVA0z8C7P9GW+VPr4OfS6w3+HNMXPT9TVPG6h2qTukX1AUoASnCOr6EB6zS/cAMYeTCixf VuMXdDpMG/VqTOjsY6nnFull7GXot1H485EonpnmHIV277CNx9Ic109o43Z+XHq7Yh4382IzPCvdy Bbj3tl1lDdCQPw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:19 +0100 Message-ID: <5f6e1725357abea8b870ce7272053961be6dc52f.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/commencement.scm (make-libstdc++-boot0)[arguments]: When creating libstdc++-boot0 for the 64bit Hurd, add disable options similar to libstdc++ to #:configure-flags. Change-Id: I00636fa48e38823b00ede7dcbd0c1c23544d898c --- gnu/packages/commencement.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index dab65c7ca1..2a32485fc0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2288,6 +2288,14 @@ (define (make-libstdc++-boot0 gcc) #:validate-runpath? #f ,@(substitute-keyword-arguments (package-arguments lib) + ((#:configure-flags flags) + (if (target-hurd64?) + #~(cons* "--disable-shared" + "--disable-libstdcxx-dual-abi" + "--disable-libstdcxx-threads" + "--disable-libstdcxx-pch" + #$flags) + flags)) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-gmp&co -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 57/58] gnu: commencement: gcc-boot0: Support the 64bit Hurd. 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: Sun, 24 Nov 2024 07:59: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.173243513118717 (code B ref 74290); Sun, 24 Nov 2024 07:59:02 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:58:51 +0000 Received: from localhost ([127.0.0.1]:60954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7W7-0004ri-68 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:58:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UL-0004e4-Eo for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:57: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 1tF7UF-0002JU-Vw; Sun, 24 Nov 2024 02:56: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=5htvk33j+nNdoI2yUfgG7cRsdw9VkL0Vki8PiZfmNFk=; b=OmxUhQcyHMnMoox6IT2S C45n0bPlw5Iui7O1NMP6SHVy7Q3LrTucduVRtXNABgiq6cWXuT6hMlSsdT73nVEmX5F188ROXWgIR e7TkluUvUynkIA1QAd1GNMiBon/6IhLFShSr77ZRjgxIHplTJ1SqYaq1OTAnXjictQOIZI5ubwoUf OhbeWB32e6+4WwNkRIRpFvgaskBea86eTMsBxGj+5QBDiODolJUTMJmG0avjLziert/m9gWd2LFmn +wBUuZL0vUWazuKwMmusx3eiY0tl2uJxu5jXy6Sky+TredC6QoS0Rb4cRV4sg5AkN1fwyAyw13qET con0BXUPt6SdMA==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:20 +0100 Message-ID: <636bfab83864d614e1bb7e74db3810fe8f9b0fc9.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Asking gcc to "--disable-shared" is overridden for libcc1 by the build system, which lateron fails with install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory because no shared libcc1.so.0.0.0 could actually be built. * gnu/packages/commencement.scm (gcc-boot0)[arguments]: When building for the 64bit Hurd, add CC_FOR_BUILD to #:make-flags to convince gmp's configure that gcc works. Also, add phase "patch-libcc1-static" to avoid attempting a shared libcc1. --- gnu/packages/commencement.scm | 36 ++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2a32485fc0..3dbd27b660 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2391,13 +2391,21 @@ (define gcc-boot0 `(let* ((libc (assoc-ref %build-inputs "libc")) (libc-native (or (assoc-ref %build-inputs "libc-native") libc))) - `(,(string-append "LDFLAGS=" - "-Wl,-rpath=" libc-native "/lib " - "-Wl,-dynamic-linker " - "-Wl," libc-native ,(glibc-dynamic-linker - (match (%current-system) - ("x86_64-linux" "i686-linux") - (_ (%current-system)))))))) + `(,,@(append + `((string-append "LDFLAGS=" + "-Wl,-rpath=" libc-native "/lib " + "-Wl,-dynamic-linker " + "-Wl," libc-native + ,(glibc-dynamic-linker + (match (%current-system) + ("x86_64-linux" "i686-linux") + (_ (%current-system)))))) + (if (target-hurd64?) + ;;Convince gmp's configure that gcc works + (list (string-append + "CC_FOR_BUILD=gcc" + " -Wno-implicit-function-declaration")) + '()))))) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'unpack-gmp&co @@ -2421,6 +2429,20 @@ (define gcc-boot0 char-set:letter) #$(package-name lib))) (list gmp-6.0 mpfr mpc))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'patch-libcc1-static + (lambda _ + ;;Attempting to build libcc1 shared gives: + ;; install: cannot stat '.libs/libcc1.so.0.0.0': + ;; No such file or directory + ;;convince gcc harder to not build a shared libcc1 + (substitute* "Makefile.def" + (("module= libcc1; [^;]*;") "module= libcc1;")) + (substitute* "Makefile.in" + (("(--target=[$][{]target_alias[}]) --enable-shared \\\\" + all target) + (string-append target " \\")))))) + #~()) #$(match (%current-system) ((or "i686-linux" "x86_64-linux") #~(add-before 'configure 'fix-libcc1 -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 58/58] gnu: commencement: gcc-final: Support the 64bit Hurd. 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: Sun, 24 Nov 2024 07:59: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 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.173243513218723 (code B ref 74290); Sun, 24 Nov 2024 07:59:03 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:58:52 +0000 Received: from localhost ([127.0.0.1]:60956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7W7-0004rq-LN for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:58:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UM-0004eA-6I for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:02 -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 1tF7UG-0002Jc-Pa; Sun, 24 Nov 2024 02:56: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=KEatdoaMsLm6sff5++m1V0tmRoOnqBS5FwUubhW7YlQ=; b=ZLjD7qB40HOyPR6iGjDt 9qGuVjKOVtYBMg0K2a0eGbElpbwqufzTw5wP6byBygAsnwiIu9X6JbaabytIj2dCB0RxiSjERVIxV qLQhClAEO1R6NFKkItrmgoz8U199BsrWCZNw7C70tWfQ6VLdnB/FI564jVK78jHLwBvBHR7eyS+Aj 64enN+srnMzNUfoJzN0+0ikjaviCNCf0olPcY4gZytQh2y89jfqz71bASg9zfpdzc5+wQORX5KSKx wQTLYork2G7PaOWzLIIWm645HAkj83GSHYcg6xgynRDSY69IfBtKdV5gqtSW6OH5mNt+9IUe3vp0r 5LVEL2qesSZRbg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:21 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.6 (-) * gnu/packages/commencement.scm (gcc-final)[arguments]: When building for the 64bit Hurd, create a gcc wrapper in phase "create-stage-wrapper", use it by adding STAGE_CC_WRAPPER to #:make-flags, and CC to #:configure-flags to convince configure gmp that gcc and g++ work. Change-Id: I939c03c6c0fd9698efc4b293e59cf576249e3b77 --- gnu/packages/commencement.scm | 37 ++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3dbd27b660..4368893f4d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3255,13 +3255,32 @@ (define gcc-final ;; Since $LIBRARY_PATH is not honored, add the relevant flags. #~(let ((zlib (assoc-ref %build-inputs "zlib"))) (map (lambda (flag) - (if (string-prefix? "LDFLAGS=" flag) + (if #$(if (target-hurd64?) + #~(and (string? flag) + (string-prefix? "LDFLAGS=" flag)) + #~(string-prefix? "LDFLAGS=" flag)) (string-append flag " -L" (assoc-ref %build-inputs "libstdc++") "/lib -L" zlib "/lib -Wl,-rpath=" zlib "/lib") flag)) - #$flags))) + #$(if (target-hurd64?) + `(cons + (string-append + ;;Convince gmp's configure that gcc works + "STAGE_CC_WRAPPER=" (getcwd) "/build/gcc.sh") + ,flags) + flags)))) + ((#:configure-flags flags) + (if (target-hurd64?) + #~(append + #$flags + (list #$(string-append + ;;Convince gmp's configure that gcc works + "CC=gcc" + " -Wno-implicit-function-declaration") + "--disable-plugin")) + flags)) ;; Build again GMP & co. within GCC's build process, because it's hard ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) @@ -3306,7 +3325,19 @@ (define gcc-final (getenv "CPLUS_INCLUDE_PATH") #\:)) ":") - "\nAM_CXXFLAGS = "))))))))))) + "\nAM_CXXFLAGS = ")))))) + #$@(if (target-hurd64?) + #~((add-after 'configure 'create-stage-wrapper + (lambda _ + (with-output-to-file "gcc.sh" + (lambda _ + (format #t "#! ~a/bin/bash +exec \"$@\" \ + -Wno-error \ + -Wno-implicit-function-declaration" + #$static-bash-for-glibc))) + (chmod "gcc.sh" #o555)))) + #~())))))) ;; This time we want Texinfo, so we get the manual. Add ;; STATIC-BASH-FOR-GLIBC so that it's used in the final shebangs of -- 2.46.0 From unknown Wed Jun 25 00:26:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 28/58] DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Nov 2024 16:33: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: Josselin Poiret , Maxim Cournoyer , Simon Tournier , Mathieu Othacehe , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173255235732296 (code B ref 74290); Mon, 25 Nov 2024 16:33:02 +0000 Received: (at 74290) by debbugs.gnu.org; 25 Nov 2024 16:32:37 +0000 Received: from localhost ([127.0.0.1]:40192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFc0q-0008Oo-Vc for submit@debbugs.gnu.org; Mon, 25 Nov 2024 11:32:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tFc0o-0008Ob-Ca for 74290@debbugs.gnu.org; Mon, 25 Nov 2024 11:32:35 -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 1tFc0W-0004aT-1i; Mon, 25 Nov 2024 11:32: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:Date:References:In-Reply-To:Subject:To: From; bh=vQPgSUS3gppIGBGscqrrQRB0zbt/bgOeIyeIeiN6Ulc=; b=RS+SpoKJ5B5pyW/w9hzB qeG1py368ae6pyWFcK6oP2/1nfQ+cBl/coE+rXWo8fdtlH8Oo5Wu9ZK3amQ8hbHArsaoaIh4IXKUS vhpTHedqGfFfAl3Csu/tK0wTEa1eNK5cm7b5bRQcH05nBZj04ze1YGcGqPGy9Gh+s0btMuGVGwGjT 9YUEFLUKevbftlBrOfZu9KwJvnrRd5tuD1fQU8cDdAv/ct2nO9oijB3Aro/ChcUJKnL3Bexok1ueW 9Z1RBQOY4SUr9UUm71vzYwVdmzmXa+JXXqQW8gEr2rXIGq6V6PQQaC4dfSACUw9aFna9mQ3CUedi+ 8OaVIGeID5Gybw==; From: In-Reply-To: <767111b9284fbd2980452205459f446cbc75a5cc.1732434271.git.janneke@gnu.org> (Janneke Nieuwenhuizen's message of "Sun, 24 Nov 2024 08:54:51 +0100") Organization: AvatarAcademy.nl References: <767111b9284fbd2980452205459f446cbc75a5cc.1732434271.git.janneke@gnu.org> X-Url: http://AvatarAcademy.nl Date: Mon, 25 Nov 2024 17:31:44 +0100 Message-ID: <874j3vgtqn.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen writes: > XXX TODO: > > v Boot a 64bit hurd, and > v Guix shell --bootstrap -D -e '(@@ (gnu packages commencement) gnu-ma= ke-boot0)' > v Guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' > o Guix build hello, I just pushed some additional patches disabling some tests for coreutils, grep, and diffutils to `hurd-team'...and: --8<---------------cut here---------------start------------->8--- 17:21:31 root@guixygnu64:~=20 # file $(guix build hello)/bin/hello /gnu/store/ri36ixbd3y2hcrf52pg1rv4jc8wgv2y4-hello-2.12.1/bin/hello: ELF 64-= bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpret= er /gnu/store/d2mvmghwxd1jyix6hg0zpcgw0b5jqr1b-glibc-2.39/lib/ld-x86-64.so.= 1, for GNU/Hurd 0.0.0, stripped 17:22:14 root@guixygnu64:~=20 # $(guix build hello)/bin/hello Hello, world! 17:22:24 root@guixygnu64:~=20 #=20 --8<---------------cut here---------------end--------------->8--- so I suggest to postpone this milestone: > o Guix shell --bootstrap -D guix, until later. > 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 Write hurd64 blog post! WDYT? --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 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: guix-patches@gnu.org Resent-Date: Tue, 03 Dec 2024 07:43: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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 74290@debbugs.gnu.org, Josselin Poiret , Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173321173624061 (code B ref 74290); Tue, 03 Dec 2024 07:43:02 +0000 Received: (at 74290) by debbugs.gnu.org; 3 Dec 2024 07:42:16 +0000 Received: from localhost ([127.0.0.1]:58051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tINY0-0006G1-BZ for submit@debbugs.gnu.org; Tue, 03 Dec 2024 02:42:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tINXy-0006Fk-AR for 74290@debbugs.gnu.org; Tue, 03 Dec 2024 02:42: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 1tINXp-0003ab-Mr; Tue, 03 Dec 2024 02:42: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:Date:References:In-Reply-To:Subject:To: From; bh=3ojJ56DlLlO2nvP+l7AjaxPbFN7xBAVzLo5I/ywUl/0=; b=EEec8ZiQtkVdYIEGIypq rW9wskg0KKxOYQE0usGuEgMAk0+iZLDM5847SRPDIccXcgbScomoZ4u9N8NVk/CUvl0AWttXwhGiA G29BiVz49rspWHCV+85m3gJhOx67bQgiT9d1EKdQsc0+4zHcgwJlsMOBVLVRAKzoCRmAzWL6R68yX WmYrP3bTQYpzvhpEVv/+G2O48rMLd0W8Dbzji7GI/iKEFuxZOCewzec1vwfW5swz9B6ofDIJhlMkO iStL25GPpUgUePRxEOBz4Ft/046efy3cfW1FQTYwvgGr+04N1KvTERD2ESjaeIaWzD59uQjLHRFE+ xVPIwrtqef32VA==; From: Janneke Nieuwenhuizen In-Reply-To: <87v7wixh17.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 20 Nov 2024 12:48:20 +0100") Organization: AvatarAcademy.nl References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> <87o72dn544.fsf@gnu.org> <87v7wixh17.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Tue, 03 Dec 2024 08:41:46 +0100 Message-ID: <87iks1kybp.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: Hello, > skribis: > >> Ludovic Court=C3=A8s writes: > > [...] > >>> how about changing the GCC version used for cross-compilation, and >>> only that: >>> >>> diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm >>> index 5781341a87..6120740b3c 100644 >>> --- a/gnu/packages/cross-base.scm >>> +++ b/gnu/packages/cross-base.scm >>> @@ -61,7 +61,7 @@ (define-syntax %xgcc >>> ;; >>> ;; Note: This is a macro so that we do not refer to 'gcc' from the t= op >>> ;; level, which would lead to circular-dependency issues. >>> - (identifier-syntax gcc)) >>> + (identifier-syntax gcc-14)) >> >> Interesting...I would have thought this would cause a world rebuild, >> because of the cross-gcc in commencement. Apparently, it doesn't. >> >>> That would affect also non-Hurd cross-compilation targets, but if it >>> works, it=E2=80=99s simpler. >> >> Ok, I very much like the simplicity of this. > > Yay. > >>> Then, as a second step, we could prepare a =E2=80=98core-packages-team= =E2=80=99 branch >>> that upgrades =E2=80=98gcc=E2=80=99 globally, and that way we keep some= thing consistent >>> and simpler, without =E2=80=98current-gcc=E2=80=99. (Though it means w= e=E2=80=99d have to wait >>> before we can build natively on x86_64-gnu.) >>> >>> WDYT? >> >> I've been thinking about this route and decided against it because it >> seems to me that upgrading to gcc-14 will cause a lot of trouble/work. > > True. > >> However, if that work is shared, and we have the build farm to help, it >> may be the best route. Maybe the wait doesn't have to be too long? >> Also, in the mean time, upstream support might improve. > > Well yes, it=E2=80=99s going to take a bit of time, let=E2=80=99s face it. > > But hopefully quite a few of us would work on it and we=E2=80=99d set up = ci.guix > to build the branch. > > Also, with the reduced scope of =E2=80=98core-packages=E2=80=99, I hope i= t can be faster > than =E2=80=98core-updates=E2=80=99 was before. And we can choose to hav= e a cycle that > changes very little beside GCC. > >> Maybe we can decide to go the route you propose and also keep this >> current-gcc patch on the hurd-team branch for a bit (we prepend a fat >> REMOVEME in front of it). We can keep working on native Hurd builds >> that use gcc-14 on hurd-team using this hack, until core-packages-team >> is ready to make it obsolete? > > Yes. > > At least, we can already merge cross-compilation support. Pushed to master as ec8a5ec15f898e864705e5a5c834532e3fa8d0a4. Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Wed Jun 25 00:26:10 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Janneke Nieuwenhuizen Subject: bug#74290: closed (Re: [bug#74290] [PATCH v2 05/40] gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd.) Message-ID: References: <87jzchjiyg.fsf@gnu.org> X-Gnu-PR-Message: they-closed 74290 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 74290@debbugs.gnu.org Date: Tue, 03 Dec 2024 08:00:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1733212803-27301-1" This is a multi-part message in MIME format... ------------=_1733212803-27301-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #74290: [PATCH 00/31] Add support for x86_64-gnu, aka the 64bit Hurd. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 74290@debbugs.gnu.org. --=20 74290: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74290 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1733212803-27301-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 74290-done) by debbugs.gnu.org; 3 Dec 2024 07:59:19 +0000 Received: from localhost ([127.0.0.1]:58136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tINoV-00074m-6c for submit@debbugs.gnu.org; Tue, 03 Dec 2024 02:59:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tINoS-00074X-IP for 74290-done@debbugs.gnu.org; Tue, 03 Dec 2024 02:59: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 1tINoJ-0006ez-Nt; Tue, 03 Dec 2024 02:59: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:Date:References:In-Reply-To:Subject:To: From; bh=xlkR9gaDzXZy5lJlyPxH4lWSHYiIuPohNf3nEenootM=; b=oB9mlNzbrEliWYaTZrKO u+LSGC6uRJlCqtUyFIAEr7jW9fR+QgLh7/Rj9GCFt4um2ylyz+5PGFdn7HDb1KsMp+lVjfzElw0hU HcNInUmL4u/iByk4q8+hT144+HK8M2MmbzsTWk486TMG1YbNOyg7pdY3I3MWNCDedbnWq/pEMejbd bEvsI+Xoc7auLtTXhxL63mi7AZ30I+9mYzBGLeXVzU9YpOEIN+DiPaVUCTX1ile/RrJHJZPnsITHN Saw1CWID9PN63iUImR+JZhOWPi2CxdXSuPDcrSV1ME+BMIyCRWnCUHQ/JvLYe10vD8SYPv123fgN9 LamXHtsZciNK7A==; From: Janneke Nieuwenhuizen To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#74290] [PATCH v2 05/40] gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. In-Reply-To: <87mshxkd89.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "Sun, 17 Nov 2024 17:59:50 +0100") Organization: AvatarAcademy.nl References: <99a9152dc069538a151504d65b85fd5105149a51.1731427612.git.janneke@gnu.org> <87mshxkd89.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Tue, 03 Dec 2024 08:59:03 +0100 Message-ID: <87jzchjiyg.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 74290-done Cc: Josselin Poiret , 74290-done@debbugs.gnu.org, Ekaitz Zarraga , Simon Tournier , Mathieu Othacehe , Tobias Geerinckx-Rice , Efraim Flashner , Andreas Enge , Christopher Baines X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Then, as a second step, we could prepare a =E2=80=98core-packages-team=E2= =80=99 branch > that upgrades =E2=80=98gcc=E2=80=99 globally, and that way we keep someth= ing consistent > and simpler, without =E2=80=98current-gcc=E2=80=99. (Though it means we= =E2=80=99d have to wait > before we can build natively on x86_64-gnu.) > > WDYT? Pushed a `core-packages-team' with (this one) gcc-14 commit. Let the fun begin :) Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com ------------=_1733212803-27301-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Nov 2024 10:34:35 +0000 Received: from localhost ([127.0.0.1]:55652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5H8-0002Jy-Rp for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:34:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:34794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5H6-0002Jq-FV for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:34:33 -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 1tA5Ez-0007Tb-1s for guix-patches@gnu.org; Sun, 10 Nov 2024 05:32: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 1tA5Ex-0007DR-Na; Sun, 10 Nov 2024 05:32: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:Date:Subject:To:From:in-reply-to: references; bh=n58E9ohwXzGeRU97edGTJjeJSF/WfgfRDeNanaCMTkc=; b=PVavsBKksb/me3 gQQLTgvqDT3MFqnb9dGTn5DbdpyjRVpf305vxmJ/Chi08ZIs6qk9oqbJIKpGDz4xEQAsCpxQuIloU 7BWELA4mzVJPWd7fCeKM/abXAT/CVJ7uPX/tyhvekwYHrZ9c/YZ4QfZmOJ7jbB6KkkYoP5IXIRJmd jqfoimyLrDN9XLsLwvhx/fMUH4ojqqNbMy7y+LPdhbSzHaM95fYo7E2fNeyu3E1ef8qTv+VKFZ2mz 5OIit7FAjsWaB2MxQlDgpSegQHacOlbvek10vWrty7ITx6IAYRrAh3dZFmwlWmLbU29qbTJj4AJtM O/Bao7Q39w0E5XW7csIg==; From: Janneke Nieuwenhuizen To: guix-patches@gnu.org Subject: [PATCH 00/31] Add support for x86_64-gnu, aka the 64bit Hurd. Date: Sun, 10 Nov 2024 11:32:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: "Jan \(janneke\) Nieuwenhuizen" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) From: "Jan (janneke) Nieuwenhuizen" Hi, Lo and behold, the 64bit Hurd boots! Again, thanks to the help from the kind folks over at libera #hurd and their excellent work. Do something like: --8<---------------cut here---------------start------------->8--- ./pre-inst-env guix system image --image-type=hurd64-qcow2 \ gnu/system/examples/bare-hurd.tmpl --8<---------------cut here---------------end--------------->8--- producing something like: /gnu/store/...-disk-image. Run the image in QEMU: --8<---------------cut here---------------start------------->8--- guix shell qemu@7 -- qemu-system-x86_64 \ --machine q35 \ -m 4096 \ --enable-kvm \ --device rtl8139,netdev=net0 \ --netdev user,id=net0,hostfwd=tcp:0.0.0.0:11022-:2222 \ --snapshot \ --hda /gnu/store/...-disk-image --8<---------------cut here---------------end--------------->8--- and login --8<---------------cut here---------------start------------->8--- 11:03:20 janneke@dundal:~/src/guix/hurd-team $ ssh -p 11022 root@localhost Last login: Sun Nov 10 10:09:00 2024 from 10.0.2.2    This is the GNU Hurd. Welcome. root@guixygnu ~# uname -a GNU guixygnu 0.9 GNU-Mach 1.8/Hurd-0.9 x86_64 GNU --8<---------------cut here---------------end--------------->8--- Most notably, besides the expected updates, this series adds an indirection for gcc and gcc-toolchain, (current-gcc) and (current-gcc-toolchain) respectively, as the 64bit Hurd needs gcc-14. We may also want to think about image names hurd64-qcow2 etc. and their defaults, vs hurd-qcow2/hurd32-qcow2. We'll probably also want a 64bit childhurd service, etc, etc... This series builds on/waits for #73927, which I intend to rebase and push later this weekend if there are no further comments. And I guess that the pending blog post will also need an update :) For your hacking convenience I have reset and updated the `hurd-team' branch. Greetings, Janneke Janneke Nieuwenhuizen (31): gnu: mig: Update to v1.8+git20231217. gnu: gnumach: Update to v1.8+git20240714. gnu: hurd: Update to v0.9.git20240714. gnu: gcc: Add indirections current-gcc, current-gcc-toolchain. gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd. gnu: cross-libc: Support cross-building for the 64bit Hurd. gnu: bash-minimal: Fix build for 64bit Hurd. gnu: elfutils: Fix build for 64bit Hurd. gnu: grep: Fix build for the 64bit Hurd. gnu: patch: Fix build for the 64bit Hurd. gnu: libxcrypt: Support the 64bit Hurd. gnu: libstdc++: Support the 64bit Hurd. gnu: gcc-13, gcc-14: Support being used as parent for gcc-static. DRAFT gnu: bootstrap: Add support for x86_64-gnu, aka the 64bit Hurd. system: image: Add hurd64 image types. gnu: Add libgpg-error-1.50. gnu: libgcrypt: Use libgpg-error-1.50 for the 64bit Hurd. gnu: perl: Support cross-building for the 64bit Hurd. gnu: openssl-3.0: Support the 64bit Hurd. gnu: pciutils: Support the 64bit Hurd. gnu: libpciaccess: Support the 64bit Hurd. gnu: netdde: Update to c0ef248dc7c5ccc1273e2a796f3ece30c5b645df. gnu: netdde: Support the 64bit Hurd. gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337. gnu: rumpkernel: Support the 64bit Hurd. gnu: hurd: Build fixes for the 64bit Hurd. gnu: git-minimal: Support the 64bit Hurd. gnu: inetutils: Fix build for the 64bit Hurd. gnu: grub: Fix build for the 64bit Hurd. gnu: guile-fibers: Fix build for the 64bit Hurd. system: hurd: Use 64bit gnumach for the 64bit Hurd. doc/guix.texi | 9 +- gnu/ci.scm | 4 +- gnu/local.mk | 9 + gnu/packages/admin.scm | 14 +- gnu/packages/avr.scm | 7 +- gnu/packages/base.scm | 74 ++++--- gnu/packages/bash.scm | 9 + gnu/packages/benchmark.scm | 6 +- gnu/packages/bootloaders.scm | 10 +- gnu/packages/bootstrap.scm | 46 ++++- gnu/packages/c.scm | 4 +- gnu/packages/chicken.scm | 7 +- gnu/packages/commencement.scm | 35 ++-- gnu/packages/containers.scm | 5 +- gnu/packages/cross-base.scm | 27 +-- gnu/packages/crypto.scm | 15 ++ gnu/packages/dlang.scm | 3 +- gnu/packages/elf.scm | 6 +- gnu/packages/engineering.scm | 4 +- gnu/packages/gawk.scm | 3 +- gnu/packages/gcc.scm | 69 ++++--- gnu/packages/gnupg.scm | 19 +- gnu/packages/golang.scm | 3 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/hurd.scm | 187 ++++++++++++------ gnu/packages/julia-xyz.scm | 3 +- gnu/packages/lisp.scm | 3 +- gnu/packages/llvm.scm | 7 +- gnu/packages/make-bootstrap.scm | 60 +++--- gnu/packages/mpi.scm | 3 +- gnu/packages/parallel.scm | 5 +- gnu/packages/patches/gnumach-version.patch | 23 +++ gnu/packages/patches/grub-hurd64.patch | 32 +++ gnu/packages/patches/hurd-64bit.patch | 56 ++++++ gnu/packages/patches/inetutils-hurd64.patch | 65 ++++++ .../patches/libpciaccess-hurd64.patch | 58 ++++++ gnu/packages/patches/libxcrypt-hurd64.patch | 38 ++++ gnu/packages/patches/netdde-csum.patch | 18 ++ gnu/packages/patches/openssl-hurd64.patch | 99 ++++++++++ gnu/packages/patches/pciutils-hurd64.patch | 31 +++ gnu/packages/pciutils.scm | 25 ++- gnu/packages/perl.scm | 20 +- gnu/packages/rocm.scm | 3 +- gnu/packages/tls.scm | 9 + gnu/packages/version-control.scm | 8 +- gnu/packages/xorg.scm | 23 ++- gnu/system.scm | 1 - gnu/system/hurd.scm | 11 +- gnu/system/images/hurd.scm | 47 ++++- guix/packages.scm | 8 +- guix/platforms/x86.scm | 11 +- guix/utils.scm | 15 +- m4/guix.m4 | 12 +- 53 files changed, 1025 insertions(+), 246 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch create mode 100644 gnu/packages/patches/grub-hurd64.patch create mode 100644 gnu/packages/patches/hurd-64bit.patch create mode 100644 gnu/packages/patches/inetutils-hurd64.patch create mode 100644 gnu/packages/patches/libpciaccess-hurd64.patch create mode 100644 gnu/packages/patches/libxcrypt-hurd64.patch create mode 100644 gnu/packages/patches/netdde-csum.patch create mode 100644 gnu/packages/patches/openssl-hurd64.patch create mode 100644 gnu/packages/patches/pciutils-hurd64.patch base-commit: 7105e7125882be35e334448eafd6d81b37b627f0 -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com ------------=_1733212803-27301-1--