gnu: rumpkernel: Update to 0-20250111.

* gnu/packages/hurd.scm (rumpkernel): Update to 0-20250111.
[#:phases]: In build phase set C_INCLUDE_PATH and add -DBUFPAGES=16. Remove HOST_CFLAGS
override.
[inputs]: Add libirqhelp.

Change-Id: Iba710d54bb2cfe54b0b9bfcbf7e273fdf79e7d51
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Yelninei 2025-05-19 08:28:15 +00:00 committed by Andreas Enge
parent aeb70ebaff
commit 91379033b3
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3

View file

@ -740,11 +740,11 @@ in userland processes thanks to the DDE layer.")
(license gpl2)))) (license gpl2))))
(define-public rumpkernel (define-public rumpkernel
(let ((commit "f1ffd6405f225336e595a0f99f01095ed7438337") (let ((commit "2aad456903b2dc2232fa18c7f286cea6d77b570f")
(revision "0")) (revision "0"))
(package (package
(name "rumpkernel") (name "rumpkernel")
(version (git-version "0-20211031" revision commit)) (version (git-version "0-20250111" revision commit))
;; This uses the Debian Salsa rumpkernel package git as upstream as that ;; This uses the Debian Salsa rumpkernel package git as upstream as that
;; is where development happens. Once things have stabilized, upstream ;; is where development happens. Once things have stabilized, upstream
;; may change to the NetBSD git from where Debian takes their snapshots. ;; may change to the NetBSD git from where Debian takes their snapshots.
@ -755,7 +755,7 @@ in userland processes thanks to the DDE layer.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1ygn3ysji06ik3k44sf906fjpdmabznkspw70llldbk2zkrcdw7i")) "14fiv2llvd5s1vi9gigmi1vi0b9yvg2zqyc9xg67ffxl1phv7p8j"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -862,6 +862,8 @@ in userland processes thanks to the DDE layer.")
"-V" (string-append "TOPRUMP=" toprump) "-V" (string-append "TOPRUMP=" toprump)
"-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread" "-V" "BUILDRUMP_CPPFLAGS=-Wno-error=stringop-overread"
"-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread" "-V" "RUMPUSER_EXTERNAL_DPLIBS=pthread"
;; build.sh unsets C_INCLUDE_PATH which breaks our HOST_CC
"-V" (string-append "C_INCLUDE_PATH=" (getenv "C_INCLUDE_PATH"))
"-V" (string-append "-V" (string-append
"CPPFLAGS=" "CPPFLAGS="
" -I../../obj/destdir." host-cpu "/usr/include" " -I../../obj/destdir." host-cpu "/usr/include"
@ -870,10 +872,8 @@ in userland processes thanks to the DDE layer.")
" -DRUMPUSER_CONFIG=yes" " -DRUMPUSER_CONFIG=yes"
" -DNO_PCI_MSI_MSIX=yes" " -DNO_PCI_MSI_MSIX=yes"
" -DNUSB_DMA=1" " -DNUSB_DMA=1"
" -DPAE") " -DPAE"
"-V" (string-append " -DBUFPAGES=16")
"HOST_CFLAGS=-O"
" -Wno-error=implicit-function-declaration")
"-V" (string-append "-V" (string-append
"CWARNFLAGS=" "CWARNFLAGS="
" -Wno-error=maybe-uninitialized" " -Wno-error=maybe-uninitialized"
@ -936,7 +936,7 @@ in userland processes thanks to the DDE layer.")
(append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)") (append (find-files "buildrump.sh/src" "librump.*[.](a|so.*)")
(find-files "obj" "librump.*[.](a|so.*)"))))))))) (find-files "obj" "librump.*[.](a|so.*)")))))))))
(inputs (inputs
(list gnumach-headers libpciaccess)) (list gnumach-headers libpciaccess libirqhelp))
(native-inputs (native-inputs
(list autoconf (list autoconf
automake automake