me
/
guix
Archived
1
0
Fork 0
Code

gnu: hurd: Support native build on the Hurd. 

* gnu/packages/hurd.scm (hurd)[arguments]: In phases 'build-libdde-linux' and
'install-goodies', also look in inputs for dependencies.  There is no check
target, so set #:tests? to #false.
Janneke Nieuwenhuizen 2023-06-20 17:09:17 +02:00
parent c4c08775a8
commit 6547d3852b
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/hurd.scm
View File

@ -329,14 +329,14 @@ Hurd-minimal package which are needed for both glibc and GCC.")
"hurd-rumpdisk-no-hd.patch")))) "hurd-rumpdisk-no-hd.patch"))))
(version (package-version hurd-headers)) (version (package-version hurd-headers))
(arguments (arguments
`(#:phases `(#:tests? #f ;no "check" target
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'prepare-addons (add-after 'unpack 'prepare-addons
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
;; First we import the things we want from dde. ;; First we import the things we want from dde.
(for-each make-file-writable (find-files ".")) (for-each make-file-writable (find-files "."))
(let ((dde (or (assoc-ref inputs "dde-sources") (let ((dde (assoc-ref (or native-inputs inputs) "dde-sources")))
(assoc-ref native-inputs "dde-sources"))))
(for-each (lambda (dir) (for-each (lambda (dir)
(copy-recursively (copy-recursively
(string-append dde "/" dir ) dir)) (string-append dde "/" dir ) dir))
@ -466,13 +466,13 @@ exec ${system}/rc \"$@\"
#t))) #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 native-inputs "make") (invoke (string-append (assoc-ref (or native-inputs inputs) "make")
"/bin/make") "/bin/make")
;; XXX There can be a race condition because subdirs ;; XXX There can be a race condition because subdirs
;; aren't interdependent targets in the Makefile. ;; aren't interdependent targets in the Makefile.
"-j1" "-C" "libdde_linux26" "-j1" "-C" "libdde_linux26"
(string-append "SHELL=" (string-append "SHELL="
(assoc-ref native-inputs "bash") (assoc-ref (or native-inputs inputs) "bash")
"/bin/bash") "/bin/bash")
(string-append "CC=" (string-append "CC="
,(cc-for-target))))) ,(cc-for-target)))))
@ -483,12 +483,12 @@ exec ${system}/rc \"$@\"
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(datadir (string-append out "/share/hurd"))) (datadir (string-append out "/share/hurd")))
;; Install libdde_linux26. ;; Install libdde_linux26.
(invoke (string-append (assoc-ref native-inputs "make") (invoke (string-append (assoc-ref (or native-inputs inputs) "make")
"/bin/make") "/bin/make")
"-C" "libdde_linux26" "install" "-C" "libdde_linux26" "install"
(string-append "SHELL=" (string-append "SHELL="
(assoc-ref native-inputs "bash") (assoc-ref (or native-inputs inputs) "bash")
"/bin/bash") "/bin/bash")
(string-append "INSTALLDIR=" (string-append "INSTALLDIR="
out out
"/share/libdde_linux26/build/include")) "/share/libdde_linux26/build/include"))
@ -590,8 +590,7 @@ implementing them.")
(add-after 'unpack 'prepare-dde (add-after 'unpack 'prepare-dde
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(for-each make-file-writable (find-files ".")) (for-each make-file-writable (find-files "."))
(let ((dde (or (assoc-ref inputs "dde-sources") (let ((dde (assoc-ref (or native-inputs inputs) "dde-sources")))
(assoc-ref native-inputs "dde-sources"))))
(for-each (lambda (dir) (for-each (lambda (dir)
(copy-recursively (copy-recursively
(string-append dde "/" dir ) dir)) (string-append dde "/" dir ) dir))