diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/admin.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/shepherd-hurd.patch | 44 |
3 files changed, 0 insertions, 46 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 535c23d98b..63a9c83c19 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,7 +1463,6 @@ dist_patch_DATA = \ %D%/packages/patches/seq24-rename-mutex.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/shadow-hurd-pctrl.patch \ - %D%/packages/patches/shepherd-hurd.patch \ %D%/packages/patches/shishi-fix-libgcrypt-detection.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 567c7cfb94..a9240dbdb1 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -206,7 +206,6 @@ and provides a \"top-like\" mode (monitoring).") (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) - (patches (search-patches "shepherd-hurd.patch")) (sha256 (base32 "02lbc8z5gd8v8wfi4yh1zww8mk03w0zcwnmk4l4p3vpjlvlb63ll")))) diff --git a/gnu/packages/patches/shepherd-hurd.patch b/gnu/packages/patches/shepherd-hurd.patch deleted file mode 100644 index 5043e831f2..0000000000 --- a/gnu/packages/patches/shepherd-hurd.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fixes compilation on the Hurd. - -Taken from upstream: http://git.savannah.gnu.org/cgit/shepherd.git/commit/?id=232331369fe2a0495c7c777e11eecabee6257b3f - -From 232331369fe2a0495c7c777e11eecabee6257b3f Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen <janneke@gnu.org> -Date: Sat, 7 Mar 2020 22:01:23 +0100 -Subject: [PATCH] system: Support compilation on the Hurd. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* modules/shepherd/system.scm.in (prctl): Wrap 'dynamic-func' call in -'false-if-exception'. - -Co-authored-by: Ludovic Courtès <ludo@gnu.org> ---- - modules/shepherd/system.scm.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/shepherd/system.scm.in b/modules/shepherd/system.scm.in -index 769404a..0b2cc9d 100644 ---- a/modules/shepherd/system.scm.in -+++ b/modules/shepherd/system.scm.in -@@ -1,6 +1,7 @@ - ;; system.scm -- Low-level operating system interface. - ;; Copyright (C) 2013, 2014, 2016, 2018 Ludovic Courtès <ludo@gnu.org> - ;; Copyright (C) 2018 Carlo Zancanaro <carlo@zancanaro.id.au> -+;; Copyright (C) 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> - ;; - ;; This file is part of the GNU Shepherd. - ;; -@@ -145,7 +146,7 @@ ctrlaltdel(8) and see kernel/reboot.c in Linux." - (define PR_SET_CHILD_SUBREAPER @PR_SET_CHILD_SUBREAPER@) - - (define prctl -- (if (dynamic-func "prctl" (dynamic-link)) -+ (if (false-if-exception (dynamic-func "prctl" (dynamic-link))) - (let ((proc (syscall->procedure long "prctl" (list int int)))) - (lambda (process operation) - "Perform an operation on the given process" --- -2.24.0 - |