[PATCH 00/31] Add support for x86_64-gnu, aka the 64bit Hurd.

+++ b/gnu/local.mk

+ %D%/packages/patches/gnumach-version.patch \

+++ b/gnu/packages/hurd.scm

+ (let ((commit "v1.8+git20240714"))

+ (version (string-drop commit 1))

+ (patches (search-patches "gnumach-version.patch"))

+ (base32 "0ykav1kx0bgxcxw04bpcsh5s4531fzdkahjgrlsfs2h3w3vfkga0"))))

+++ b/gnu/packages/patches/gnumach-version.patch

+Upstream-status: Taken from Debian upstream:

+ <https://salsa.debian.org/hurd-team/gnumach/-/raw/master/debian/patches/12_version_suffix.patch>

+

+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@";

+++ b/gnu/packages/hurd.scm

+ (version "1.8+git20231217")

+ "1mx7w5vzw5ws0zplm1y6s679jb1g2hjkiwl3dlk5lxys0dxs5g4g"))))

+++ b/gnu/packages/hurd.scm

+ (commit "v0.9.git20240714"))

+ "0wvzil3llmrjg7ymwqs86d11bm5fl771jwncv7kk679lsvqca0ll"))

+ "libbpf libmachdevdde libddekit "))))

+ ,@(if (%current-target-system)

+ '((add-after 'configure 'fixup-cross-configure

+ (lambda _

+ (substitute* "config.make"

+ (("HAVE_LIBRUMP = no") "HAVE_LIBRUMP = yes")))))

+ '())

+++ b/gnu/system.scm

+++ b/gnu/packages/base.scm

+ `((add-after 'install 'augment-libc.so

+ (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))))))

+++ b/gnu/packages/cross-base.scm

+ `((add-after 'install 'augment-libc.so

+ (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))))))

+++ b/gnu/ci.scm

+;;; Copyright © 2017, 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (%gcc-bootstrap-tarball)

+++ b/gnu/packages/commencement.scm

+ (if (target-hurd64?)

+ gcc-toolchain-14

+ gcc-toolchain-11))

+ (deprecated-package "gcc-toolchain" (current-gcc-toolchain)))

+++ b/gnu/packages/cross-base.scm

+ (if (target-hurd? target)

+ xhurd-core-headers

+ xlinux-headers))

+++ b/gnu/packages/gcc.scm

+ (if (target-hurd64?)

+ gcc-14

+ gcc-11))

+ (deprecated-package "gcc" (current-gcc)))

+ (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)))))

+(define (current-libstdc++)

+ ;; Libstdc++ matching the CURRENT-GCC.

+ (inherit (current-libstdc++))

+ (inputs `(("libstdc++" ,(current-libstdc++))))

+++ b/gnu/packages/make-bootstrap.scm

+ (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))))))

+ `(,@(%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

+ ("cross-binutils" ,(cross-binutils target))))

+ (let ((glibc (glibc-for-bootstrap glibc))

+ (gcc (current-gcc)))

+ (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))))

+(define (%gcc-static)

+ (source (package-source (current-gcc)))

+(define (%gcc-stripped)

+ (gcc #$(%gcc-static)))

+(define (%gcc-bootstrap-tarball)

+ (tarball-package (%gcc-stripped)))

+ (list (%gcc-bootstrap-tarball)

+++ b/guix/platforms/x86.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ i586-gnu

+ x86_64-gnu))

+

+(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")))

+++ b/guix/utils.scm

+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ target-hurd64?

+ system-hurd64?

+(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))))

+

+++ b/gnu/packages/bash.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ #:use-module (gnu packages gcc)

+ ,@(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")

+ '())

+

+++ b/gnu/packages/avr.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+(define* (make-avr-gcc/implementation #:key (xgcc (current-gcc)))

+ `(("gcc" ,(current-gcc))

+(define* (make-avr-toolchain/implementation #:key (xgcc (current-gcc)))

+++ b/gnu/packages/benchmark.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (delay ((module-ref (resolve-interface '(gnu packages commencement))

+ 'current-gcc-toolchain))))

+ gcc-toolchain*

+++ b/gnu/packages/bootloaders.scm

+ (package-version (current-gcc)))))

+++ b/gnu/packages/bootstrap.scm

+;;; Copyright © 2018, 2020, 2022, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ;; See the appropriate 'shlib-versions' file in libc.

+++ b/gnu/packages/c.scm

+;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ("gcc:lib" ,(current-gcc) "lib")))

+++ b/gnu/packages/chicken.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (propagated-inputs (list ((module-ref (resolve-interface

+ '(gnu packages commencement))

+ 'current-gcc-toolchain))))

+++ b/gnu/packages/commencement.scm

+ #:use-module (ice-9 match)

+ #:export (current-gcc-toolchain))

+ (inherit (current-gcc))

+ (inherit (current-gcc))

+ (outputs (delete "debug" (package-outputs (current-gcc))))

+ (inherit (package-source (current-gcc)))

+ #$(origin-snippet (package-source (current-gcc)))

+ (substitute-keyword-arguments (package-arguments (current-gcc))

+ "/" #$(package-version (current-gcc)))

+ (package (inherit (current-gcc))

+ (substitute-keyword-arguments (package-arguments (current-gcc))

+ (name (string-append (package-name (current-gcc)) "-toolchain"))

+ (version (package-version (current-gcc)))

+(define (current-gcc-toolchain)

+ "The current default gcc-toolchain version."

+(define-public gcc-toolchain

+ (deprecated-package "gcc-toolchain" gcc-toolchain-11))

+

+ (deprecated-package "gcc" (current-gcc-toolchain)))

+++ b/gnu/packages/containers.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ,(string-append #$(current-gcc) "/bin") ; cpp

+ ,(string-append #$(current-gcc) "/bin") ; cpp

+++ b/gnu/packages/cross-base.scm

+;;; Copyright © 2016, 2019, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (identifier-syntax (current-gcc)))

+++ b/gnu/packages/dlang.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ #:disallowed-references (list (gexp-input (canonical-package (current-gcc))

+++ b/gnu/packages/engineering.scm

+ ((module-ref (resolve-interface '(gnu packages commencement))

+ 'current-gcc-toolchain))

+++ b/gnu/packages/gawk.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (current-gcc) ; For cpp

+++ b/gnu/packages/gcc.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ #:use-module (ice-9 regex)

+ #:export (current-gcc))

+(define (current-gcc)

+ "The current default gcc version."

+ gcc-11)

+

+(define-public gcc

+ (deprecated-package "gcc" gcc-11))

+ (inherit (current-gcc))

+ (make-libstdc++ (current-gcc)))

+ (make-libiberty (current-gcc)))

+++ b/gnu/packages/elf.scm

+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ,@(if (target-hurd64?)

+ '(#:make-flags '("core-file_no_Werror=yes"))

+ '())

+

+++ b/gnu/packages/base.scm

+ #$@(if (target-hurd64?)

+ #~((add-after 'unpack 'patch-sigsegv

+ (lambda _

+ ;; Stack overflow recovery does not compile

+ (substitute* "lib/sigsegv.in.h"

+ (("__GNU__") "__XGNU__")))))

+ #~())

+++ b/gnu/packages/base.scm

+ (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)))

+++ b/gnu/local.mk

+ %D%/packages/patches/libxcrypt-hurd64.patch \

+++ b/gnu/packages/crypto.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (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))))))

+ '()))

+++ b/gnu/packages/patches/libxcrypt-hurd64.patch

+Upstream-status: Taken from upstream:

+ <https://github.com/besser82/libxcrypt/commit/b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917>

+

+From b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917 Mon Sep 17 00:00:00 2001

+From: Samuel Thibault <samuel.thibault@ens-lyon.org>

+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 <janneke@gnu.org> | GNU LilyPond https://LilyPond.org

+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

+

+++ b/gnu/packages/gcc.scm

+ (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")))))

+ '())))

+++ b/gnu/packages/gcc.scm

+ ((#:phases phases '%standard-phases)

+ `(modify-phases ,phases

+ (delete 'patch-hurd-libpthread))

+ ((#:phases phases '%standard-phases)

+ `(modify-phases ,phases

+++ b/doc/guix.texi

+Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Janneke Nieuwenhuizen@*

+@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.

+

+++ b/gnu/packages/bootstrap.scm

+ ,(base32 "0nb8ga2j7a4kf6j7pnavq8zf68mj8mhqh26nwkilz1ykj86vg9ml"))

+ ,(base32 "0ldsx9pwan40fx2hf4s9d10sfkhvkljvl20hksvm4192p7jb4shp"))

+ ,(base32 "1z6kfvpwhy14vc52i61v1vzzk3gzxka3db5rlg1jsq6kli35s2ab"))

+ ,(base32 "1f7g40sk5a6k6qf65k58vlybnnmhyyzczdxy60m3jgcsp674wfcr")))

+ ("x86_64-gnu"

+ ("bash"

+ ,(base32 "0l0dnighcipvdfbk14q834n57q859i2b9ssiq4bnbh0jpxvvqp1l"))

+ ("mkdir"

+ ,(base32 "1nd17k8pwwi7zsqi685w4rn1p2cvfcalrzdhfgwpsk1ilxnmdvsq"))

+ ("tar"

+ ,(base32 "0lf94y22ngmxdwhsp0cvj33m23p33r999xnlrff0s1yvlf20w3ks"))

+ ("xz"

+ ,(base32 "145aq65rx7w0qk1sw9239888id5ri60ha0xp1kyp6ir3pvizh6by")))

+ ("x86_64-gnu" (string-append system "/20241110/" program))

+ ("x86_64-gnu"

+ "/20241110/guile-static-stripped-3.0.9-x86_64-pc-gnu.tar.xz")

+ ("x86_64-gnu"

+ (base32 "0fgasmbidp584ibr5fbirmp3wr8qchv84a50i4bichysp00gg26p"))

+ ("x86_64-gnu"

+ "/20241110/static-binaries-0-x86_64-pc-gnu.tar.xz")

+ ("x86_64-gnu"

+ (base32

+ "118s161df8hgrdfph2w5spnrms02rh1dk7mzfvx1k1prvgngpm9p"))

+ ("x86_64-gnu"

+ "/20241110/binutils-static-stripped-2.41-x86_64-pc-gnu.tar.xz")

+ ("x86_64-gnu"

+ (base32

+ "07r74sa7341frhf5a7h1p3pklsrmfpfrf5s8dxm3yz2kqzhish48"))

+ ("x86_64-gnu"

+ "/20241110/glibc-stripped-2.39-x86_64-pc-gnu.tar.xz")

+ ("x86_64-gnu"

+ (base32

+ "1dcgrnlxbsdic0xmmrjbr8gl6ra5y2xbj8f8jr6y0zvpdyi12ldd"))

+ ("x86_64-gnu"

+ "/20241110/gcc-stripped-14.2.0-x86_64-pc-gnu.tar.xz")

+ ("x86_64-gnu"

+ (base32

+ "0vqvjvw6xi16lihiqz4mhisfwx3dgs15y60q07ksdkgvi1wdli2w"))

+++ b/guix/packages.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ "riscv64-linux" "x86_64-gnu"))

+ '("i586-gnu" "x86_64-gnu"))

+ (fold delete %supported-systems '("mips64el-linux" "powerpc-linux"

+ "riscv64-linux" "x86_64-gnu")))

+++ b/m4/guix.m4

+dnl Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ 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;;

+ x86_64-linux|i686-linux|armhf-linux|aarch64-linux|powerpc64le-linux|riscv64-linux|i586-gnu|x86_64-gnu)

+++ b/gnu/system/images/hurd.scm

+;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ hurd-barebones-qcow2-image

+

+ hurd64-disk-image

+ hurd6-image-type

+ hurd64-qcow2-image-type

+ hurd64-barebones-disk-image

+ hurd64-barebones-qcow2-image))

+

+;;;

+;;; 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)))

+

+++ b/gnu/packages/gnupg.scm

+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+(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"))))))

+

+++ b/gnu/packages/gnupg.scm

+ `(("libgpg-error-host" ,(if (target-hurd64?)

+ libgpg-error-1.50

+ libgpg-error))))

+++ b/gnu/packages/perl.scm

+ ,(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))))))

+++ b/gnu/local.mk

+ %D%/packages/patches/openssl-hurd64.patch \

+++ b/gnu/packages/patches/openssl-hurd64.patch

+Upstream-status: Taken from upstream:

+

+<https://github.com/openssl/openssl/commit/7c729851d169f30d9e0c0ad6e7c1cf6cefb37935>.

+

+From 795699363be8f717e36802c3ac503011b74ad752 Mon Sep 17 00:00:00 2001

+From: Janneke Nieuwenhuizen <janneke@gnu.org>

+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 <https://salsa.debian.org/debian/openssl>.

+---

+ 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 <janneke@gnu.org> | GNU LilyPond https://LilyPond.org

+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

+

+++ b/gnu/packages/tls.scm

+ #~())

+ #$@(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)))))

+++ b/gnu/local.mk

+ %D%/packages/patches/pciutils-hurd64.patch \

+++ b/gnu/packages/patches/pciutils-hurd64.patch

+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 *) &regions;

+- 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)

+++ b/gnu/packages/pciutils.scm

+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (list

+ #:phases

+ #~(modify-phases %standard-phases

+ #$@(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)))))

+ #~())

+ #$@(if (%current-target-system)

+ #~((("^CROSS_COMPILE=.*$")

+ #$(%current-target-system) "-"

+ #$(gnu-triplet->nix-system

+ #:make-flags #~(list #$(string-append "CC="

+++ b/gnu/local.mk

+ %D%/packages/patches/libpciaccess-hurd64.patch \

+++ b/gnu/packages/patches/libpciaccess-hurd64.patch

+Upstream-status: Taken from upstream:

+

+<https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/6cd5a4afbb70868c7746de8d50dea59e02e9acf2>.

+

+From 6cd5a4afbb70868c7746de8d50dea59e02e9acf2 Mon Sep 17 00:00:00 2001

+From: Flavio Cruz <flaviocruz@gmail.com>

+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 <janneke@gnu.org> | GNU LilyPond https://LilyPond.org

+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

+

+++ b/gnu/packages/xorg.scm

+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (list

+ ;; Make sure libpciaccess can read compressed 'pci.ids' files as

+ ;; provided by pciutils.

+ #:configure-flags

+ #~(list "--with-zlib"

+ #~(modify-phases %standard-phases

+ #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)))))

+ #~()))))

+++ b/gnu/packages/hurd.scm

+ (let ((commit "b6c8526c703f3ba76294d9002f195c63897ec661"))

+ "0k1ilj8ghli8x43xaksbc4y419pqh0w16k374914c07svq419bbr"))

+ (let ((commit "c0ef248dc7c5ccc1273e2a796f3ece30c5b645df")

+ (revision "3"))

+ "070fpmd4nvn3mp8dj9w4if63iwz7j2m0h6ywq888znw70wlrc6sh"))

+++ b/gnu/local.mk

+ %D%/packages/patches/netdde-csum.patch \

+++ b/gnu/packages/hurd.scm

+ (patches (search-patches "netdde-build-fix.patch"

+ "netdde-csum.patch"))

+ (let ((arch ,(match (or (%current-target-system)

+ (%current-system))

+ ((? target-x86-32?)

+ "x86")

+ ((? target-x86-64?)

+ "amd64"))))

+ (string-append "ARCH=" arch)))

+ (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"))))

+ (string-append "WARNINGS=-Wno-strict-prototypes"

+ " -Wno-int-conversion")

+++ b/gnu/packages/patches/netdde-csum.patch

+Upstream-status: Taken from debian.

+

+<https://salsa.debian.org/hurd-team/netdde/raw/master/debian/patches/csum>.

+

+---

+ 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 <net/ip6_checksum.h>

+

+ char vmxnet3_driver_name[] = "vmxnet3";

+ #define VMXNET3_DRIVER_DESC "VMware vmxnet3 virtual NIC driver"

+++ b/gnu/packages/hurd.scm

+ (let ((commit "f1ffd6405f225336e595a0f99f01095ed7438337")

+ (revision "0"))

+ "1ygn3ysji06ik3k44sf906fjpdmabznkspw70llldbk2zkrcdw7i"))

+ " -Wno-error=stringop-overflow"

+ " -Wno-error=sign-compare")

+++ b/gnu/packages/hurd.scm

+ "-V" "MKDTRACE=no"

+ "-V" "MKZFS=no"

+

+ " -DNUSB_DMA=1"

+ " -DPAE")

+++ b/gnu/local.mk

+ %D%/packages/patches/hurd-64bit.patch \

+++ b/gnu/packages/hurd.scm

+ "hurd-startup.patch"

+ "hurd-64bit.patch"))))

+ (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)))))

+ (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"))))))

+++ b/gnu/packages/patches/hurd-64bit.patch

+Upstream-status: Taken from upstream:

+ <https://git.savannah.gnu.org/cgit/hurd/hurd.git/commit/?id=d494333e7607ea03819adcfb69d89f8248ec2044>.

+

+From d494333e7607ea03819adcfb69d89f8248ec2044 Mon Sep 17 00:00:00 2001

+From: Flavio Cruz <flaviocruz@gmail.com>

+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 <janneke@gnu.org> | GNU LilyPond https://LilyPond.org

+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

+

+++ b/gnu/packages/version-control.scm

+ #:use-module (gnu packages gcc)

+ "NO_INSTALL_HARDLINKS=indeed"

+ #$@(if (version>=? (package-version (current-gcc)) "14")

+ #~("-Wno-implicit-function-declaration")

+ #~()))

+ (if #$(target-hurd?)

+++ b/gnu/local.mk

+ %D%/packages/patches/inetutils-hurd64.patch \

+++ b/gnu/packages/admin.scm

+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ #: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)))

+++ b/gnu/packages/patches/inetutils-hurd64.patch

+Upstream-status: Not presented upstream.

+

+From 0804e655a7abfd22dc3a053f03fab8f811405f84 Mon Sep 17 00:00:00 2001

+From: Janneke Nieuwenhuizen <janneke@gnu.org>

+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 <janneke@gnu.org> | GNU LilyPond https://LilyPond.org

+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

+

+++ b/gnu/local.mk

+ %D%/packages/patches/grub-hurd64.patch \

+++ b/gnu/packages/bootloaders.scm

+ #$@(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)))))

+ #~())

+++ b/gnu/packages/patches/grub-hurd64.patch

+Upstream-status: Not presented upstream.

+

+From a4eb7d1f2cbd02132a9f5512f1294182576d4653 Mon Sep 17 00:00:00 2001

+From: Janneke Nieuwenhuizen <janneke@gnu.org>

+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 <janneke@gnu.org> | GNU LilyPond https://LilyPond.org

+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

+

+++ b/gnu/packages/guile-xyz.scm

+ (if (and (target-x86-64?) (not (target-hurd?)))

+++ b/gnu/system/hurd.scm

+ #:use-module (ice-9 match)

+ (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))))

+++ b/gnu/local.mk

+ %D%/packages/patches/gnumach-version.patch \

+++ b/gnu/packages/commencement.scm

+ (patches '())

+++ b/gnu/packages/hurd.scm

+ (let ((commit "v1.8+git20240714"))

+ (version (string-drop commit 1))

+ (patches (search-patches "gnumach-version.patch"))

+ (base32 "0ykav1kx0bgxcxw04bpcsh5s4531fzdkahjgrlsfs2h3w3vfkga0"))))

+++ b/gnu/packages/patches/gnumach-version.patch

+Upstream-status: Taken from Debian upstream:

+ <https://salsa.debian.org/hurd-team/gnumach/-/raw/master/debian/patches/12_version_suffix.patch>

+

+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@";

+++ b/gnu/packages/hurd.scm

+ (version "1.8+git20231217")

+ "1mx7w5vzw5ws0zplm1y6s679jb1g2hjkiwl3dlk5lxys0dxs5g4g"))))

+++ b/gnu/packages/hurd.scm

+ (commit "v0.9.git20240714"))

+ "0wvzil3llmrjg7ymwqs86d11bm5fl771jwncv7kk679lsvqca0ll"))

+ "libbpf libmachdevdde libddekit "))))

+ ,@(if (%current-target-system)

+ '((add-after 'configure 'fixup-cross-configure

+ (lambda _

+ (substitute* "config.make"

+ (("HAVE_LIBRUMP = no") "HAVE_LIBRUMP = yes")))))

+ '())

+++ b/gnu/system.scm

+++ b/gnu/ci.scm

+;;; Copyright © 2017, 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (%gcc-bootstrap-tarball)

+++ b/gnu/packages/bootstrap.scm

+ (build (cond ((or (target-riscv64?)

+ (target-hurd64?))

+++ b/gnu/packages/commencement.scm

+ (if (target-hurd64?)

+ gcc-toolchain-14

+ gcc-toolchain-11))

+ (deprecated-package "gcc-toolchain" (current-gcc-toolchain)))

+++ b/gnu/packages/cross-base.scm

+ (if (target-hurd? target)

+ xhurd-core-headers

+ xlinux-headers))

+++ b/gnu/packages/gcc.scm

+ (if (target-hurd64?)

+ gcc-14

+ gcc-11))

+ (deprecated-package "gcc" (current-gcc)))

+ (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)))))

+(define (current-libstdc++)

+ ;; Libstdc++ matching the CURRENT-GCC.

+ (inherit (current-libstdc++))

+ (inputs `(("libstdc++" ,(current-libstdc++))))

+++ b/gnu/packages/make-bootstrap.scm

+ (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))))))

+ `(,@(%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

+ ("cross-binutils" ,(cross-binutils target))))

+ #~(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)

+ (_ #~'())))

+ (let ((glibc (glibc-for-bootstrap glibc))

+ (gcc (current-gcc)))

+ (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))))

+(define (%gcc-static)

+ (source (package-source (current-gcc)))

+(define (%gcc-stripped)

+ (gcc #$(%gcc-static)))

+ #~())

+ #$@(if (target-hurd64?)

+ #~("lt_cv_prog_compiler_static_works=yes")

+(define (%gcc-bootstrap-tarball)

+ (tarball-package (%gcc-stripped)))

+ (list (%gcc-bootstrap-tarball)

+++ b/guix/platforms/x86.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ i586-gnu

+ x86_64-gnu))

+

+(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")))

+++ b/guix/utils.scm

+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ target-hurd64?

+ system-hurd64?

+(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))))

+

+++ b/gnu/packages/avr.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+(define* (make-avr-gcc/implementation #:key (xgcc (current-gcc)))

+ `(("gcc" ,(current-gcc))

+(define* (make-avr-toolchain/implementation #:key (xgcc (current-gcc)))

+++ b/gnu/packages/benchmark.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (delay ((module-ref (resolve-interface '(gnu packages commencement))

+ 'current-gcc-toolchain))))

+ gcc-toolchain*

+++ b/gnu/packages/bootloaders.scm

+ (package-version (current-gcc)))))

+++ b/gnu/packages/bootstrap.scm

+;;; Copyright © 2018, 2020, 2022, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ;; See the appropriate 'shlib-versions' file in libc.

+++ b/gnu/packages/c.scm

+;;; Copyright © 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ("gcc:lib" ,(current-gcc) "lib")))

+++ b/gnu/packages/chicken.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (propagated-inputs (list ((module-ref (resolve-interface

+ '(gnu packages commencement))

+ 'current-gcc-toolchain))))

+++ b/gnu/packages/commencement.scm

+ #:use-module (ice-9 match)

+ #:export (current-gcc-toolchain))

+ (inherit (current-gcc))

+ (inherit (current-gcc))

+ (outputs (delete "debug" (package-outputs (current-gcc))))

+ (inherit (package-source (current-gcc)))

+ #$(origin-snippet (package-source (current-gcc)))

+ (substitute-keyword-arguments (package-arguments (current-gcc))

+ "/" #$(package-version (current-gcc)))

+ (package (inherit (current-gcc))

+ (substitute-keyword-arguments (package-arguments (current-gcc))

+ (name (string-append (package-name (current-gcc)) "-toolchain"))

+ (version (package-version (current-gcc)))

+(define (current-gcc-toolchain)

+ "The current default gcc-toolchain version."

+(define-public gcc-toolchain

+ (deprecated-package "gcc-toolchain" gcc-toolchain-11))

+

+ (deprecated-package "gcc" (current-gcc-toolchain)))

+++ b/gnu/packages/containers.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ,(string-append #$(current-gcc) "/bin") ; cpp

+ ,(string-append #$(current-gcc) "/bin") ; cpp

+++ b/gnu/packages/cross-base.scm

+;;; Copyright © 2016, 2019, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (identifier-syntax (current-gcc)))

+++ b/gnu/packages/dlang.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ #:disallowed-references (list (gexp-input (canonical-package (current-gcc))

+++ b/gnu/packages/engineering.scm

+ ((module-ref (resolve-interface '(gnu packages commencement))

+ 'current-gcc-toolchain))

+++ b/gnu/packages/gawk.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (current-gcc) ; For cpp

+++ b/gnu/packages/gcc.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ #:use-module (ice-9 regex)

+ #:export (current-gcc))

+(define (current-gcc)

+ "The current default gcc version."

+ gcc-11)

+

+(define-public gcc

+ (deprecated-package "gcc" gcc-11))

+ (inherit (current-gcc))

+ (make-libstdc++ (current-gcc)))

+ (make-libiberty (current-gcc)))

+++ b/gnu/packages/base.scm

+ `((add-after 'install 'augment-libc.so

+ (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))))))

+++ b/gnu/packages/cross-base.scm

+ `((add-after 'install 'augment-libc.so

+ (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))))))

+++ b/gnu/packages/elf.scm

+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ ,@(if (target-hurd64?)

+ '(#:make-flags '("core-file_no_Werror=yes"))

+ '())

+

+++ b/gnu/packages/base.scm

+ #$@(if (target-hurd64?)

+ #~((add-after 'unpack 'patch-sigsegv

+ (lambda _

+ ;; Stack overflow recovery does not compile

+ (substitute* "lib/sigsegv.in.h"

+ (("__GNU__") "__XGNU__")))))

+ #~())

+++ b/gnu/packages/bash.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ #:use-module (gnu packages gcc)

+ ,@(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")

+ '())

+

+++ b/gnu/packages/base.scm

+ (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)))

+++ b/gnu/packages/gcc.scm

+ (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")))))

+ '())))

+++ b/gnu/local.mk

+ %D%/packages/patches/libxcrypt-hurd64.patch \

+++ b/gnu/packages/crypto.scm

+;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>

+ (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))))))

+ '()))

+++ b/gnu/packages/patches/libxcrypt-hurd64.patch

+Upstream-status: Taken from upstream:

+ <https://github.com/besser82/libxcrypt/commit/b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917>

+

+From b2c1da2e1ce2d3e72f511f5bc94a6ffa68b70917 Mon Sep 17 00:00:00 2001

+From: Samuel Thibault <samuel.thibault@ens-lyon.org>

+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 <janneke@gnu.org> | GNU LilyPond https://LilyPond.org

+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com

+

+++ b/gnu/packages/gcc.scm

+ ((#:phases phases '%standard-phases)

+ `(modify-phases ,phases

+ (delete 'patch-hurd-libpthread))

+ ((#:phases phases '%standard-phases)

+ `(modify-phases ,phases

+++ b/doc/guix.texi