diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-24 17:24:51 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-25 16:23:36 +0200 |
| commit | 2fa4066c0a7c44ec5686a6197542e56c9e47fa45 (patch) | |
| tree | 7db26ba4f844000914d0a02675d32f4890a74b20 /gnu/packages/patches/findutils-makedev.patch | |
| parent | 8c8ded2cc9201e69e87999bb40ef09c6c868deb8 (diff) | |
| download | guix-2fa4066c0a7c44ec5686a6197542e56c9e47fa45.tar.gz | |
gnu: findutils: Fix build with glibc 2.28.
* gnu/packages/patches/findutils-gnulib-libio.patch, gnu/packages/patches/findutils-makedev.patch: New files. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm (findutils)[source](patches): Use them.
Diffstat (limited to 'gnu/packages/patches/findutils-makedev.patch')
| -rw-r--r-- | gnu/packages/patches/findutils-makedev.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gnu/packages/patches/findutils-makedev.patch b/gnu/packages/patches/findutils-makedev.patch new file mode 100644 index 0000000000..2f16c625d8 --- /dev/null +++ b/gnu/packages/patches/findutils-makedev.patch @@ -0,0 +1,22 @@ +Include <sys/sysmacros.h> for "makedev". + +Taken from this gnulib commit: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4da63c5881f60f71999a943612da9112232b9161 + +diff --git a/gl/lib/mountlist.c b/gl/lib/mountlist.c +index bb4e4ee21..cf4020e2a 100644 +--- a/gl/lib/mountlist.c ++++ b/gl/lib/mountlist.c +@@ -37,6 +37,12 @@ + # include <sys/param.h> + #endif + ++#if MAJOR_IN_MKDEV ++# include <sys/mkdev.h> ++#elif MAJOR_IN_SYSMACROS ++# include <sys/sysmacros.h> ++#endif ++ + #if defined MOUNTED_GETFSSTAT /* OSF_1 and Darwin1.3.x */ + # if HAVE_SYS_UCRED_H + # include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS, |