[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62307] [PATCH core-updates v2 12/20] gnu: hurd: Update DDE and use
From: |
Ludovic Courtès |
Subject: |
[bug#62307] [PATCH core-updates v2 12/20] gnu: hurd: Update DDE and use libdde_linux26. |
Date: |
Tue, 28 Mar 2023 16:28:44 +0200 |
From: Josselin Poiret <dev@jpoiret.xyz>
* gnu/packages/hurd.scm (dde-sources): Update.
(hurd): Build libdde_linux26 and install it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/hurd.scm | 46 +++++++++++++++++++++++++++++++++++--------
1 file changed, 38 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 7ad893380c..be9e7a9071 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -345,7 +345,7 @@ (define unifont
(define dde-sources
;; This is the current tip of the dde branch
- (let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136"))
+ (let ((commit "ce8810277fa3584eb36ecb23da58394153fabe6f"))
(origin
(method git-fetch)
(uri (git-reference
@@ -353,9 +353,15 @@ (define dde-sources
(commit commit)))
(sha256
(base32
- "1vryinbg75xpydfrv9dbgfnds6knlh8l8bk2rxp32y9dc58z0692"))
+ "0ygk7jm4jmhpvh0zzi5bk638242z7sbcab2i57fkb4y2mmdkjjbw"))
(file-name (git-file-name "dde" commit)))))
+(define %import-from-dde
+ (list "libmachdevdde" "libddekit" "libdde_linux26"))
+
+(define %add-to-hurd-subdirs
+ (list "libmachdevdde" "libddekit"))
+
(define-public hurd
(package
(name "hurd")
@@ -366,17 +372,19 @@ (define-public hurd
(modify-phases %standard-phases
(add-after 'unpack 'prepare-dde
(lambda* (#:key native-inputs inputs #:allow-other-keys)
- (substitute* "Makefile"
- (("libbpf ")
- "libbpf libmachdev libmachdevdde libddekit"))
+ ;; First we import the things we want from dde.
(for-each make-file-writable (find-files "."))
(let ((dde (or (assoc-ref inputs "dde-sources")
(assoc-ref native-inputs "dde-sources"))))
(for-each (lambda (dir)
(copy-recursively
(string-append dde "/" dir ) dir))
- '("libmachdev" "libmachdevdde" "libddekit")))
- #t))
+ '("libmachdevdde" "libddekit" "libdde_linux26")))
+ ;; And we add some as subdirs so that they're built by the main
+ ;; Makefile. libdde_linux26 is built later in its own phase.
+ (substitute* "Makefile"
+ (("libbpf ")
+ "libbpf libmachdevdde libddekit"))))
(add-after 'unpack 'find-tirpc
(lambda* (#:key inputs #:allow-other-keys)
(for-each (lambda (var)
@@ -495,12 +503,34 @@ (define-public hurd
(patch-shebang file path))
(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 native-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 native-inputs "bash")
+ "/bin/bash")
+ (string-append "CC="
+ ,(cc-for-target)))))
(add-after 'install 'install-goodies
- (lambda* (#:key inputs outputs #:allow-other-keys)
+ (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 native-inputs "make")
+ "/bin/make")
+ "-C" "libdde_linux26" "install"
+ (string-append "SHELL="
+ (assoc-ref native-inputs "bash")
+ "/bin/bash")
+ (string-append "INSTALLDIR="
+ out
+ "/share/libdde_linux26/build/include"))
;; Install the fancy UTF-8 motd.
(mkdir-p (string-append out "/etc"))
(copy-file "console/motd.UTF8"
--
2.39.2
- [bug#62307] [PATCH core-updates v2 00/20] Update Hurd and fix build failures, (continued)
- [bug#62307] [PATCH core-updates v2 00/20] Update Hurd and fix build failures, Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 02/20] gnu: cross-base: Use gexps for 'cross-gcc-arguments'., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 01/20] gnu: glibc: Work around broken GNU Mach header detection., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 05/20] gnu: cross-base: Add cross arguments to hurd derivatives., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 03/20] gnu: gcc@11: Patch libpthread on GNU/Hurd., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 07/20] gnu: mig: Update to 1.8+git20220827., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 08/20] gnu: gnumach: Update to 1.8+git20220827., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 13/20] gnu: mig/32-bit: Remove., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 04/20] gnu: cross-base: Factor out cross-mig., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 09/20] gnu: hurd: Update to 3ff7053., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 12/20] gnu: hurd: Update DDE and use libdde_linux26.,
Ludovic Courtès <=
- [bug#62307] [PATCH core-updates v2 10/20] gnu: hurd: Remove useless glibc/hurd-headers input., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 17/20] gnu: guile-static: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 06/20] gnu: cross-base: Removed useless inputs to xhurd-core-headers., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 11/20] gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 14/20] system: hurd: Use shepherd-0.8 in the package list., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 15/20] gnu: linux-pam: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 16/20] gnu: linux-pam: Allow compilation on GNU/Hurd., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 19/20] gnu: guile-readline: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 18/20] gnu: guile: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 20/20] gnu: guile: Fix 'posix_spawn' usage for GNU/Hurd., Ludovic Courtès, 2023/03/28