diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-03-07 16:38:31 -0500 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2020-03-26 12:59:34 +0100 |
| commit | 7f31bd25ad734c483d450eefccdfb26874d2326d (patch) | |
| tree | 36e252e4123a49d5667c1e243e6c775d22417c9f | |
| parent | 3da54cc3180ce175b1820dd4e366abdbbffcb45d (diff) | |
| download | guix-7f31bd25ad734c483d450eefccdfb26874d2326d.tar.gz | |
gnu: shadow: Build fix for the Hurd.
* gnu/packages/patches/shadow-hurd-pctrl.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (shadow): Use it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/admin.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/shadow-hurd-pctrl.patch | 16 |
3 files changed, 18 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 6c9cea2c9b..fba481cfd0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1430,6 +1430,7 @@ dist_patch_DATA = \ %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch \ %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 \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9662468b55..d35c455275 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -488,6 +488,7 @@ hostname.") (uri (string-append "https://github.com/shadow-maint/shadow/releases/" "download/" version "/shadow-" version ".tar.xz")) + (patches (search-patches "shadow-hurd-pctrl.patch")) (sha256 (base32 "0qmfq50sdhz6xilgxvinblll8j2iqfl7hwk45bq744y4plq4dbd3")))) diff --git a/gnu/packages/patches/shadow-hurd-pctrl.patch b/gnu/packages/patches/shadow-hurd-pctrl.patch new file mode 100644 index 0000000000..2e376e19a9 --- /dev/null +++ b/gnu/packages/patches/shadow-hurd-pctrl.patch @@ -0,0 +1,16 @@ +Avoid including sys/prctl.h on the Hurd. + +Upstream status: Not submitted. + +--- shadow-4.8.1/libmisc/idmapping.c.orig 2020-03-07 16:32:05.000000000 -0500 ++++ shadow-4.8.1/libmisc/idmapping.c 2020-03-07 16:32:27.000000000 -0500 +@@ -36,8 +36,8 @@ + #include <stdio.h> + #include "prototypes.h" + #include "idmapping.h" +-#include <sys/prctl.h> + #if HAVE_SYS_CAPABILITY_H ++#include <sys/prctl.h> + #include <sys/capability.h> + #endif + |