From patchwork Sun Nov 10 10:38:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70190 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5D15C27BBE2; Sun, 10 Nov 2024 10:41:00 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7DBEF27BBEA for ; Sun, 10 Nov 2024 10:40:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5Mb-00015t-KS; Sun, 10 Nov 2024 05:40:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tA5MW-000105-JL for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tA5MW-0008GL-4o for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=sV5SsB9sebbUu4v31xkcnewo2VsNGx4ihlTSUMGUz1I=; b=bZVMlHGi8mkQVsuyXQ3kIoiHcgJSeno7oq65Lfbl2DAjuIXLe3PKtwQe560CyGRGTDr46Vq0x2uvjAwNq3ic385HHto+IQUstooaJe8yhupJBBKWy/eOZS0wSRC4utWIcLRZfo+TJc/b5s9h7tdt85SBzJld5nsRzNnKZAUdXOtc5xDJyEFpGFgMVPHwWQJ1bto3kLSHjpSxl2K7OdLWDSvijrYlJbGVV3JqNpFQbXxaPl9VjbEdxJzTIMuI/UZJfT80B1DZMGb8Te26tUWy0+DzH9WJvWp46OtZELIsPuACGbaBLDgoq8GlnOTW4oZWkhXAqr1FPstgd/cyMnmYFA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5MW-0002kh-0U for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 23/31] gnu: netdde: Support the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516610260 (code B ref 74290); Sun, 10 Nov 2024 10:40:07 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:26 +0000 Received: from localhost ([127.0.0.1]:55794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Lp-0002fF-0f for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5Ld-0002bN-1g for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:13 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tA5LX-0007t6-RR; Sun, 10 Nov 2024 05:39:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=sV5SsB9sebbUu4v31xkcnewo2VsNGx4ihlTSUMGUz1I=; b=N25zDGH/R6nVxrOQHWtQ VBJgkoC1sw5pb24Oz4O48Li88lB9aa3L/fyD47uX7iOXoX8oFbWPPykJTYkkFEZv8pnoNG51gZ2Ha koW2uOEiLKwgRrZUvCNJ91UoSnwZbbrp+fhfZST9lc+alBaUQcikJx31qxqEIk52JEuTtWpYYKyKD NocqcEUdm8GE+9fEv3SAOTryLerAcpNTsIgDYDMwKWbx6kdTzZLsp9S+kpsFcY1A+OsgjObLozJwm 7x+w+TVANk+Cl+AjkjBGDx1mhV7S407X+4gwI8UWYS9pCA1fQNj20H16bdmXr6VEfMt5xAL6Tyh1E pFdCm2ZhdXFa9A==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:38:19 +0100 Message-ID: <22aeb4fc3065120e43b55b1a169e76b53e5da4e7.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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, disable -Wstrict-prototypes and -Wint-conversion, and follow upstream's "amd64" symlinking voodoo. Change-Id: Ie825e56779dae2f489066569dc3c4405bac778c1 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 22 ++++++++++++++++++++-- gnu/packages/patches/netdde-csum.patch | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/netdde-csum.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1e81c16979..9a4715df86 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1816,6 +1816,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 \ diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index f9d8b28b8c..973564ee33 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -573,7 +573,8 @@ (define-public netdde (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")) @@ -586,7 +587,13 @@ (define-public netdde (search-input-file %build-inputs "/bin/bash")) "PKGDIR=libdde_linux26" (string-append "CC=" ,(cc-for-target)) - "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 @@ -604,8 +611,19 @@ (define-public netdde (("/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" + (string-append "WARNINGS=-Wno-strict-prototypes" + " -Wno-int-conversion") (delete "PKGDIR=libdde_linux26" make-flags))))) (add-after 'build-libdde-linux26 'convert (lambda* (#:key make-flags #:allow-other-keys) diff --git a/gnu/packages/patches/netdde-csum.patch b/gnu/packages/patches/netdde-csum.patch new file mode 100644 index 0000000000..4fdd004898 --- /dev/null +++ b/gnu/packages/patches/netdde-csum.patch @@ -0,0 +1,18 @@ +Upstream-status: Taken from debian. + +. + +--- + 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 + + char vmxnet3_driver_name[] = "vmxnet3"; + #define VMXNET3_DRIVER_DESC "VMware vmxnet3 virtual NIC driver"