diff options
| author | Janneke Nieuwenhuizen <[email protected]> | 2024-11-07 21:41:57 +0100 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <[email protected]> | 2024-12-03 08:39:00 +0100 |
| commit | b331a07a469faf0aeb7bc11f42399b9e986e8e8d (patch) | |
| tree | dcbab5028156c4ef32ceaf3dc47cb21356694a20 /gnu/packages/hurd.scm | |
| parent | c2a67e8743c264e1d72d161605e879a82ecb4c97 (diff) | |
gnu: netdde: Support the 64bit Hurd.
* gnu/packages/patches/netdde-csum.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/hurd.scm (netdde)[source]: Use it.
[arguments]: Do not assume x86, rather use actual ARCH in #:make-flags, and
follow upstream's "amd64" symlinking voodoo.
Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1
Diffstat (limited to 'gnu/packages/hurd.scm')
| -rw-r--r-- | gnu/packages/hurd.scm | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 2c231425aa..defa3f2689 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -579,7 +579,8 @@ implementing them.") (uri (git-reference (url "https://git.savannah.gnu.org/git/hurd/incubator.git") (commit commit))) - (patches (list (search-patch "netdde-build-fix.patch"))) + (patches (search-patches "netdde-build-fix.patch" + "netdde-csum.patch")) (sha256 (base32 "070fpmd4nvn3mp8dj9w4if63iwz7j2m0h6ywq888znw70wlrc6sh")) @@ -599,6 +600,13 @@ implementing them.") " -Wno-int-conversion" " -Wno-strict-prototypes") "ARCH=x86") + (let ((arch ,(match (or (%current-target-system) + (%current-system)) + ((? target-x86-32?) + "x86") + ((? target-x86-64?) + "amd64")))) + (string-append "ARCH=" arch))) #:configure-flags ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) #:phases @@ -616,6 +624,15 @@ implementing them.") (("/bin/bash") (which "bash"))))) (add-after 'patch-generated-file-shebangs 'build-libdde-linux26 (lambda* (#:key make-flags #:allow-other-keys) + (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")))) (with-directory-excursion "libdde_linux26" (apply invoke "make" (delete "PKGDIR=libdde_linux26" make-flags))))) |