mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 23:06:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: hurd: Add gnumach-headers as native input.

Browse source 
This provides the include/mach/machine/mach_i386.h.

* gnu/packages/hurd.scm (hurd)[native-inputs]: Add gnumach-headers, or
gnumach-headers-cross when cross-building.
[arguments]: Remove #t from phases.

Change-Id: Id57e0cf184c7793be52192bdc5587c6e6ef2a312
This commit is contained in:
Janneke Nieuwenhuizen 2024-01-19 12:32:46 +01:00 committed by Ludovic Courtès
parent 61f07911f7
commit feae33359f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/cross-base.scm
View file

@ -51,6 +51,7 @@ (define-module (gnu packages cross-base)
#:export (cross-binutils #:export (cross-binutils
cross-libc cross-libc
cross-gcc cross-gcc
cross-gnumach-headers
cross-mig cross-mig
cross-kernel-headers cross-kernel-headers
cross-gcc-toolchain)) cross-gcc-toolchain))

33
gnu/packages/hurd.scm
View file

@ -353,8 +353,7 @@ (define-public hurd
"include/tirpc") "include/tirpc")
":" (or (getenv var) "")))) ":" (or (getenv var) ""))))
'("CROSS_C_INCLUDE_PATH" "C_INCLUDE_PATH" '("CROSS_C_INCLUDE_PATH" "C_INCLUDE_PATH"
"CROSS_CPATH" "CPATH")) "CROSS_CPATH" "CPATH"))))
#t))
(add-after 'unpack 'fix-rpc-headers (add-after 'unpack 'fix-rpc-headers
(lambda _ (lambda _
(substitute* "nfs/mount.c" (substitute* "nfs/mount.c"
@ -367,14 +366,12 @@ (define-public hurd
"nfsd/main.c" "nfsd/main.c"
"nfsd/ops.c") "nfsd/ops.c")
(("#include <rpc/pmap_prot.h>" m) (("#include <rpc/pmap_prot.h>" m)
(string-append "#include <rpc/types.h>\n#include <rpc/xdr.h>\n" m))) (string-append "#include <rpc/types.h>\n#include <rpc/xdr.h>\n" m)))))
#t))
(add-before 'build 'pre-build (add-before 'build 'pre-build
(lambda _ (lambda _
;; Don't change the ownership of any file at this time. ;; Don't change the ownership of any file at this time.
(substitute* '("daemons/Makefile" "utils/Makefile") (substitute* '("daemons/Makefile" "utils/Makefile")
(("-o root -m 4755") "")) (("-o root -m 4755") ""))))
#t))
(add-after 'unpack 'create-runsystem (add-after 'unpack 'create-runsystem
(lambda _ (lambda _
;; XXX Work towards having startup.c invoke the Guile rc ;; XXX Work towards having startup.c invoke the Guile rc
@ -449,8 +446,7 @@ (define-public hurd
":" util-linux "/sbin\n")) ":" util-linux "/sbin\n"))
(("/sbin/") (string-append out "/sbin/")) (("/sbin/") (string-append out "/sbin/"))
(("/libexec/") (string-append out "/libexec/")) (("/libexec/") (string-append out "/libexec/"))
(("/hurd/") (string-append out "/hurd/"))) (("/hurd/") (string-append out "/hurd/"))))))
#t)))
(add-after 'patch-shebangs 'patch-libexec-shebangs (add-after 'patch-shebangs 'patch-libexec-shebangs
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; XXX: Since the 'patch-shebangs' phase doesn't traverse ;; XXX: Since the 'patch-shebangs' phase doesn't traverse
@ -460,8 +456,7 @@ (define-public hurd
(path (list (string-append bash "/bin")))) (path (list (string-append bash "/bin"))))
(for-each (lambda (file) (for-each (lambda (file)
(patch-shebang file path)) (patch-shebang file path))
(find-files (string-append out "/libexec"))) (find-files (string-append out "/libexec"))))))
#t)))
(add-after 'build 'build-libdde-linux (add-after 'build 'build-libdde-linux
(lambda* (#:key inputs native-inputs #:allow-other-keys) (lambda* (#:key inputs native-inputs #:allow-other-keys)
(invoke (string-append (assoc-ref (or native-inputs inputs) "make") (invoke (string-append (assoc-ref (or native-inputs inputs) "make")
@ -501,8 +496,7 @@ (define-public hurd
(invoke "gunzip" "unifont.gz") (invoke "gunzip" "unifont.gz")
(mkdir-p datadir) (mkdir-p datadir)
(copy-file "unifont" (copy-file "unifont"
(string-append datadir "/vga-system.bdf")) (string-append datadir "/vga-system.bdf"))))))
#t))))
#:configure-flags #:configure-flags
,#~(list (string-append "LDFLAGS=-Wl,-rpath=" ,#~(list (string-append "LDFLAGS=-Wl,-rpath="
#$output "/lib") #$output "/lib")
@ -517,7 +511,11 @@ (define-public hurd
"CFLAGS=-fcommon"))) "CFLAGS=-fcommon")))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libgcrypt" ,libgcrypt) ;for /hurd/random `(("gnumach-headers" ,(if (%current-target-system)
(cross-gnumach-headers (%current-target-system))
gnumach-headers))
("libgcrypt" ,libgcrypt) ;for /hurd/random
("libdaemon" ,libdaemon) ;for /bin/console --daemonize ("libdaemon" ,libdaemon) ;for /bin/console --daemonize
("unifont" ,unifont) ("unifont" ,unifont)
("libpciaccess" ,libpciaccess-0.17) ;need libpciaccess > 0.16 ("libpciaccess" ,libpciaccess-0.17) ;need libpciaccess > 0.16
@ -536,10 +534,13 @@ (define-public hurd
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("gnumach-headers" ,(if (%current-target-system)
(cross-gnumach-headers (%current-target-system))
gnumach-headers))
("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config' ("libgcrypt" ,libgcrypt) ;for 'libgcrypt-config'
("mig" , (if (%current-target-system) ("mig" ,(if (%current-target-system)
(cross-mig (%current-target-system)) (cross-mig (%current-target-system))
mig)) mig))
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("perl" ,perl) ("perl" ,perl)
("texinfo" ,texinfo-4) ("texinfo" ,texinfo-4)