mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: inetutils: Fix build for the 64bit Hurd.

Browse source 
* gnu/packages/patches/inetutils-hurd64.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/admin.scm (inetutils)[arguments]: When building for the 64bit
Hurd, use it in new "apply-hurd64-patch" stage.

Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428
This commit is contained in:
Janneke Nieuwenhuizen 2024-11-08 11:15:12 +01:00
parent f21fb53a8d
commit 70ed0260b3
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 78 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1579,6 +1579,7 @@ dist_patch_DATA = \
%D%/packages/patches/indent-CVE-2024-0911.patch \
%D%/packages/patches/instead-use-games-path.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/inetutils-hurd64.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
%D%/packages/patches/irrlicht-link-against-needed-libs.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \

14
gnu/packages/admin.scm
View file

@ -31,7 +31,7 @@
;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
@ -1044,7 +1044,17 @@ (define-public inetutils
"\\\""))
;; On some systems, 'libls.sh' may fail with an error such as:
;; "Failed to tell switch -a apart from -A".
#:parallel-tests? #f))
#:parallel-tests? #f
#:phases (if (target-hurd64?)
#~(modify-phases %standard-phases
(add-after 'unpack 'apply-hurd64-patch
(lambda _
(let ((patch
#$(local-file
(search-patch
"inetutils-hurd64.patch"))))
(invoke "patch" "--force" "-p1" "-i" patch)))))
#~%standard-phases)))
(inputs
(list coreutils
shadow ;for login (used in telnetd and rlogind)

65
gnu/packages/patches/inetutils-hurd64.patch Normal file
View file

@ -0,0 +1,65 @@
Upstream-status: Not presented upstream.
From 0804e655a7abfd22dc3a053f03fab8f811405f84 Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 8 Nov 2024 11:07:56 +0100
Subject: [PATCH] ifconfig hurd: Build fix for the 64bit HUrd.
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
* ifconfig/system/hurd.c (check_driving): Use mach_msg_type_number_t
instead of size_t for file_get_fs_options.
---
ifconfig/system/hurd.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c
index 70b2ed27..86fe6375 100644
--- a/ifconfig/system/hurd.c
+++ b/ifconfig/system/hurd.c
@@ -47,7 +47,7 @@ check_driving (const char *name)
error_t err;
char *argz = 0, *new_argz = 0;
- size_t argz_len = 0;
+ mach_msg_type_number_t argz_len = 0;
char *entry = 0;
const char *socket = _SERVERS_SOCKET "/2";
@@ -106,7 +106,9 @@ check_driving (const char *name)
new_argz = malloc (argz_len);
memcpy (new_argz, argz, argz_len);
- err = argz_insert (&new_argz, &argz_len, new_argz, name);
+ size_t new_argz_len = 0;
+
+ err = argz_insert (&new_argz, &new_argz_len, new_argz, name);
if (err)
{
error (0, err, "Could not prepend name %s to '%s' for %s", name,
@@ -114,7 +116,7 @@ check_driving (const char *name)
goto out;
}
- err = argz_insert (&new_argz, &argz_len, new_argz, "-i");
+ err = argz_insert (&new_argz, &new_argz_len, new_argz, "-i");
if (err)
{
argz_stringify (new_argz, argz_len, ' ');
@@ -122,10 +124,10 @@ check_driving (const char *name)
goto out;
}
- err = fsys_set_options (fsys, new_argz, argz_len, 1);
+ err = fsys_set_options (fsys, new_argz, new_argz_len, 1);
if (err)
{
- argz_stringify (new_argz, argz_len, ' ');
+ argz_stringify (new_argz, new_argz_len, ' ');
error (0, err, "Could not make pfinet %s drive %s with '%s'", socket,
name, new_argz);
goto out;
--
Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com