bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 12:05:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: netdde: Support the 64bit Hurd.

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-07 21:41:57 +01:00
parent c2a67e8743
commit b331a07a46
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1826,6 +1826,7 @@ dist_patch_DATA = \
%D%/packages/patches/ncftp-reproducible.patch \
%D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netdde-build-fix.patch \
%D%/packages/patches/netdde-csum.patch \
%D%/packages/patches/netpbm-CVE-2017-2586.patch \
%D%/packages/patches/netpbm-CVE-2017-2587.patch \
%D%/packages/patches/netsurf-message-timestamp.patch \

19
gnu/packages/hurd.scm
View file

@ -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)))))

18
gnu/packages/patches/netdde-csum.patch Normal file
View file

@ -0,0 +1,18 @@
Upstream-status: Taken from debian.
<https://salsa.debian.org/hurd-team/netdde/raw/master/debian/patches/csum>.
---
linux/drivers/net/vmxnet3/vmxnet3_drv.c | 1 +
1 file changed, 1 insertion(+)
--- a/linux/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/linux/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -25,6 +25,7 @@
*/
#include "vmxnet3_int.h"
+#include <net/ip6_checksum.h>
char vmxnet3_driver_name[] = "vmxnet3";
#define VMXNET3_DRIVER_DESC "VMware vmxnet3 virtual NIC driver"