diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-04-16 06:28:27 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-04-16 06:28:27 +0000 |
| commit | ff698fa4d7003b96eaa201f4fe2b35b9610f9f4a (patch) | |
| tree | 101e7b0f00bc7cf34c83ece8e0214ec0f0dbd999 /src | |
| parent | more upstream fixes (diff) | |
| download | gentoo-ff698fa4d7003b96eaa201f4fe2b35b9610f9f4a.tar.gz gentoo-ff698fa4d7003b96eaa201f4fe2b35b9610f9f4a.tar.bz2 gentoo-ff698fa4d7003b96eaa201f4fe2b35b9610f9f4a.zip | |
fix building w/glibc-2.23 #580014
Diffstat (limited to 'src')
| -rw-r--r-- | src/patchsets/coreutils/8.25/020_all_sysmacros.patch | 40 | ||||
| -rw-r--r-- | src/patchsets/coreutils/8.25/README.history | 3 |
2 files changed, 43 insertions, 0 deletions
diff --git a/src/patchsets/coreutils/8.25/020_all_sysmacros.patch b/src/patchsets/coreutils/8.25/020_all_sysmacros.patch new file mode 100644 index 0000000000..2eb98136c2 --- /dev/null +++ b/src/patchsets/coreutils/8.25/020_all_sysmacros.patch @@ -0,0 +1,40 @@ +patch sent to upstream gnulib + +https://bugs.gentoo.org/580014 + +From 45eae8fd19089c4ba2b66c063fe127ee131f0b00 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sat, 16 Apr 2016 01:59:07 -0400 +Subject: [PATCH] mountlist/ptsname_r: leverage AC_HEADER_MAJOR + +These two modules use makedev/major/minor but don't have explicit +checks for the functions. Use the existing autoconf macro which +will probe some headers for use and set up some defines. + +* lib/mountlist.c [MAJOR_IN_MKDEV]: Include sys/mkdev.h. +[MAJOR_IN_SYSMACROS]: Include sys/sysmacros.h. +* lib/ptsname_r.c: Likewise. +[__sun]: Delete sys/sysmacros.h include. +[_AIX || __osf__]: Likewise. +* m4/mountlist.m4 (gl_MOUNTLIST): Require AC_HEADER_MAJOR. +* m4/ptsname_r.m4 (gl_FUNC_PTSNAME_R): Likewise. +--- + lib/mountlist.c | 7 +++++++ + lib/ptsname_r.c | 12 ++++++++---- + m4/mountlist.m4 | 1 + + m4/ptsname_r.m4 | 2 ++ + 4 files changed, 18 insertions(+), 4 deletions(-) + +--- a/lib/mountlist.c ++++ b/lib/mountlist.c +@@ -37,6 +37,10 @@ + # include <sys/param.h> + #endif + ++#ifdef __linux__ ++# 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, diff --git a/src/patchsets/coreutils/8.25/README.history b/src/patchsets/coreutils/8.25/README.history index 7882004907..5da5d9ef8b 100644 --- a/src/patchsets/coreutils/8.25/README.history +++ b/src/patchsets/coreutils/8.25/README.history @@ -1,3 +1,6 @@ +1.1 16 Apr 2016 + + 020_all_sysmacros.patch + 1.0 20 Jan 2016 + 003_all_coreutils-gentoo-uname.patch + 010_all_coreutils-tests.patch |