1 |
commit: 3769666d8426aeb5b8b2028b161168e0e09dddf3 |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 7 22:25:35 2016 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 7 22:25:35 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3769666d |
7 |
|
8 |
sys-apps/util-linux: fix building w/newer glibc |
9 |
|
10 |
.../files/util-linux-2.27.1-sysmacros.patch | 278 +++++++++++++++++++++ |
11 |
sys-apps/util-linux/util-linux-2.27.1.ebuild | 1 + |
12 |
2 files changed, 279 insertions(+) |
13 |
|
14 |
diff --git a/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch b/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch |
15 |
new file mode 100644 |
16 |
index 0000000..9c64e07 |
17 |
--- /dev/null |
18 |
+++ b/sys-apps/util-linux/files/util-linux-2.27.1-sysmacros.patch |
19 |
@@ -0,0 +1,278 @@ |
20 |
+From 71cd37a19acef366ff12f322c78c711559764e13 Mon Sep 17 00:00:00 2001 |
21 |
+From: Mike Frysinger <vapier@g.o> |
22 |
+Date: Mon, 7 Mar 2016 16:42:05 -0500 |
23 |
+Subject: [PATCH] include sysmacros.h where used |
24 |
+ |
25 |
+BSD/Linux systems stick major/minor/makedev in sysmacros.h. Newer Linux |
26 |
+libraries have been moving away from including sysmacros.h implicitly via |
27 |
+sys/types.h, so include it directly. |
28 |
+ |
29 |
+Signed-off-by: Mike Frysinger <vapier@g.o> |
30 |
+--- |
31 |
+ |
32 |
+diff --git a/lib/ismounted.c b/lib/ismounted.c |
33 |
+index f83be65..9b0e447 100644 |
34 |
+--- a/lib/ismounted.c |
35 |
++++ b/lib/ismounted.c |
36 |
+@@ -18,6 +18,7 @@ |
37 |
+ #include <sys/stat.h> |
38 |
+ #include <ctype.h> |
39 |
+ #include <sys/param.h> |
40 |
++#include <sys/sysmacros.h> |
41 |
+ #ifdef __APPLE__ |
42 |
+ #include <sys/ucred.h> |
43 |
+ #include <sys/mount.h> |
44 |
+diff --git a/lib/sysfs.c b/lib/sysfs.c |
45 |
+index 9e973a4..4b46459 100644 |
46 |
+--- a/lib/sysfs.c |
47 |
++++ b/lib/sysfs.c |
48 |
+@@ -7,6 +7,7 @@ |
49 |
+ * Written by Karel Zak <kzak@××××××.com> |
50 |
+ */ |
51 |
+ #include <ctype.h> |
52 |
++#include <sys/sysmacros.h> |
53 |
+ |
54 |
+ #include "c.h" |
55 |
+ #include "at.h" |
56 |
+diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c |
57 |
+index fe8eab1..56f5336 100644 |
58 |
+--- a/login-utils/sulogin-consoles.c |
59 |
++++ b/login-utils/sulogin-consoles.c |
60 |
+@@ -27,6 +27,7 @@ |
61 |
+ #include <stdio.h> |
62 |
+ #include <stdlib.h> |
63 |
+ #include <string.h> |
64 |
++#include <sys/sysmacros.h> |
65 |
+ #include <sys/types.h> |
66 |
+ #include <sys/stat.h> |
67 |
+ #include <sys/ioctl.h> |
68 |
+diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c |
69 |
+index dbbe5b5..d583800 100644 |
70 |
+--- a/libblkid/src/devname.c |
71 |
++++ b/libblkid/src/devname.c |
72 |
+@@ -25,6 +25,7 @@ |
73 |
+ #ifdef HAVE_SYS_TYPES_H |
74 |
+ #include <sys/types.h> |
75 |
+ #endif |
76 |
++#include <sys/sysmacros.h> |
77 |
+ #include <dirent.h> |
78 |
+ #ifdef HAVE_SYS_STAT_H |
79 |
+ #include <sys/stat.h> |
80 |
+diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c |
81 |
+index 58fbce5..4b8f3db 100644 |
82 |
+--- a/libblkid/src/devno.c |
83 |
++++ b/libblkid/src/devno.c |
84 |
+@@ -31,6 +31,7 @@ |
85 |
+ #endif |
86 |
+ #include <fcntl.h> |
87 |
+ #include <inttypes.h> |
88 |
++#include <sys/sysmacros.h> |
89 |
+ |
90 |
+ #include "blkidP.h" |
91 |
+ #include "pathnames.h" |
92 |
+diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c |
93 |
+index cee7008..29b4428 100644 |
94 |
+--- a/libmount/src/tab_parse.c |
95 |
++++ b/libmount/src/tab_parse.c |
96 |
+@@ -16,6 +16,7 @@ |
97 |
+ #include <limits.h> |
98 |
+ #include <dirent.h> |
99 |
+ #include <fcntl.h> |
100 |
++#include <sys/sysmacros.h> |
101 |
+ |
102 |
+ #include "at.h" |
103 |
+ #include "mangle.h" |
104 |
+diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c |
105 |
+index f72be14..e14119b 100644 |
106 |
+--- a/misc-utils/findmnt.c |
107 |
++++ b/misc-utils/findmnt.c |
108 |
+@@ -31,6 +31,7 @@ |
109 |
+ #include <assert.h> |
110 |
+ #include <poll.h> |
111 |
+ #include <sys/statvfs.h> |
112 |
++#include <sys/sysmacros.h> |
113 |
+ #include <sys/types.h> |
114 |
+ #ifdef HAVE_LIBUDEV |
115 |
+ # include <libudev.h> |
116 |
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c |
117 |
+index c9a39b3..6010167 100644 |
118 |
+--- a/misc-utils/lsblk.c |
119 |
++++ b/misc-utils/lsblk.c |
120 |
+@@ -26,6 +26,7 @@ |
121 |
+ #include <stdlib.h> |
122 |
+ #include <unistd.h> |
123 |
+ #include <stdint.h> |
124 |
++#include <sys/sysmacros.h> |
125 |
+ #include <sys/types.h> |
126 |
+ #include <sys/stat.h> |
127 |
+ #include <dirent.h> |
128 |
+diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c |
129 |
+index a47c1d0..7689964 100644 |
130 |
+--- a/misc-utils/lslocks.c |
131 |
++++ b/misc-utils/lslocks.c |
132 |
+@@ -30,6 +30,7 @@ |
133 |
+ #include <dirent.h> |
134 |
+ #include <unistd.h> |
135 |
+ #include <sys/stat.h> |
136 |
++#include <sys/sysmacros.h> |
137 |
+ #include <sys/types.h> |
138 |
+ |
139 |
+ #include <libmount.h> |
140 |
+diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c |
141 |
+index 6f9e78b..2b7e712 100644 |
142 |
+--- a/disk-utils/fsck.c |
143 |
++++ b/disk-utils/fsck.c |
144 |
+@@ -30,6 +30,7 @@ |
145 |
+ #include <sys/types.h> |
146 |
+ #include <sys/wait.h> |
147 |
+ #include <sys/stat.h> |
148 |
++#include <sys/sysmacros.h> |
149 |
+ #include <sys/file.h> |
150 |
+ #include <fcntl.h> |
151 |
+ #include <limits.h> |
152 |
+diff --git a/disk-utils/partx.c b/disk-utils/partx.c |
153 |
+index 50bd6a4..955166b 100644 |
154 |
+--- a/disk-utils/partx.c |
155 |
++++ b/disk-utils/partx.c |
156 |
+@@ -19,6 +19,7 @@ |
157 |
+ #include <unistd.h> |
158 |
+ #include <assert.h> |
159 |
+ #include <dirent.h> |
160 |
++#include <sys/sysmacros.h> |
161 |
+ |
162 |
+ #include <blkid.h> |
163 |
+ #include <libsmartcols.h> |
164 |
+diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c |
165 |
+index 81371eb..9c1aacb 100644 |
166 |
+--- a/disk-utils/sfdisk.c |
167 |
++++ b/disk-utils/sfdisk.c |
168 |
+@@ -29,6 +29,7 @@ |
169 |
+ #include <errno.h> |
170 |
+ #include <getopt.h> |
171 |
+ #include <sys/stat.h> |
172 |
++#include <sys/sysmacros.h> |
173 |
+ #include <assert.h> |
174 |
+ #include <fcntl.h> |
175 |
+ #include <libsmartcols.h> |
176 |
+diff --git a/libblkid/src/evaluate.c b/libblkid/src/evaluate.c |
177 |
+index ffbe097..3d9a76b 100644 |
178 |
+--- a/libblkid/src/evaluate.c |
179 |
++++ b/libblkid/src/evaluate.c |
180 |
+@@ -12,6 +12,7 @@ |
181 |
+ #include <unistd.h> |
182 |
+ #include <fcntl.h> |
183 |
+ #include <ctype.h> |
184 |
++#include <sys/sysmacros.h> |
185 |
+ #include <sys/types.h> |
186 |
+ #ifdef HAVE_SYS_STAT_H |
187 |
+ #include <sys/stat.h> |
188 |
+diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c |
189 |
+index c8e0bfe..4ba5411 100644 |
190 |
+--- a/libblkid/src/partitions/partitions.c |
191 |
++++ b/libblkid/src/partitions/partitions.c |
192 |
+@@ -15,6 +15,7 @@ |
193 |
+ #include <ctype.h> |
194 |
+ #include <sys/types.h> |
195 |
+ #include <sys/stat.h> |
196 |
++#include <sys/sysmacros.h> |
197 |
+ #include <errno.h> |
198 |
+ #include <stdint.h> |
199 |
+ #include <inttypes.h> |
200 |
+diff --git a/libblkid/src/topology/dm.c b/libblkid/src/topology/dm.c |
201 |
+index e061632..993161c 100644 |
202 |
+--- a/libblkid/src/topology/dm.c |
203 |
++++ b/libblkid/src/topology/dm.c |
204 |
+@@ -17,6 +17,7 @@ |
205 |
+ #include <string.h> |
206 |
+ #include <sys/stat.h> |
207 |
+ #include <sys/types.h> |
208 |
++#include <sys/sysmacros.h> |
209 |
+ #include <unistd.h> |
210 |
+ |
211 |
+ #include "topology.h" |
212 |
+diff --git a/libblkid/src/topology/evms.c b/libblkid/src/topology/evms.c |
213 |
+index 7a4fd55..b59b97b 100644 |
214 |
+--- a/libblkid/src/topology/evms.c |
215 |
++++ b/libblkid/src/topology/evms.c |
216 |
+@@ -18,6 +18,7 @@ |
217 |
+ #include <sys/ioctl.h> |
218 |
+ #include <sys/stat.h> |
219 |
+ #include <sys/types.h> |
220 |
++#include <sys/sysmacros.h> |
221 |
+ #include <unistd.h> |
222 |
+ |
223 |
+ #include "topology.h" |
224 |
+diff --git a/libblkid/src/topology/lvm.c b/libblkid/src/topology/lvm.c |
225 |
+index bd079d4..2ade0c2 100644 |
226 |
+--- a/libblkid/src/topology/lvm.c |
227 |
++++ b/libblkid/src/topology/lvm.c |
228 |
+@@ -17,6 +17,7 @@ |
229 |
+ #include <string.h> |
230 |
+ #include <sys/stat.h> |
231 |
+ #include <sys/types.h> |
232 |
++#include <sys/sysmacros.h> |
233 |
+ #include <unistd.h> |
234 |
+ |
235 |
+ #include "topology.h" |
236 |
+diff --git a/libblkid/src/topology/md.c b/libblkid/src/topology/md.c |
237 |
+index 5eba947..388f996 100644 |
238 |
+--- a/libblkid/src/topology/md.c |
239 |
++++ b/libblkid/src/topology/md.c |
240 |
+@@ -18,6 +18,7 @@ |
241 |
+ #include <sys/ioctl.h> |
242 |
+ #include <sys/stat.h> |
243 |
+ #include <sys/types.h> |
244 |
++#include <sys/sysmacros.h> |
245 |
+ #include <unistd.h> |
246 |
+ |
247 |
+ #include "topology.h" |
248 |
+diff --git a/libmount/python/fs.c b/libmount/python/fs.c |
249 |
+index 0789d37..651a7c5 100644 |
250 |
+--- a/libmount/python/fs.c |
251 |
++++ b/libmount/python/fs.c |
252 |
+@@ -27,6 +27,7 @@ |
253 |
+ |
254 |
+ #include "pylibmount.h" |
255 |
+ #include <errno.h> |
256 |
++#include <sys/sysmacros.h> |
257 |
+ |
258 |
+ #define Fs_HELP "Fs(source=None, root=None, target=None, fstype=None, options=None, attributes=None, freq=0, passno=0)" |
259 |
+ |
260 |
+diff --git a/libmount/src/fs.c b/libmount/src/fs.c |
261 |
+index 2bab7d6..ab3155d 100644 |
262 |
+--- a/libmount/src/fs.c |
263 |
++++ b/libmount/src/fs.c |
264 |
+@@ -14,6 +14,7 @@ |
265 |
+ #include <ctype.h> |
266 |
+ #include <blkid.h> |
267 |
+ #include <stddef.h> |
268 |
++#include <sys/sysmacros.h> |
269 |
+ |
270 |
+ #include "mountP.h" |
271 |
+ #include "strutils.h" |
272 |
+diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c |
273 |
+index 1d57ab3..90a42b6 100644 |
274 |
+--- a/sys-utils/losetup.c |
275 |
++++ b/sys-utils/losetup.c |
276 |
+@@ -12,6 +12,7 @@ |
277 |
+ #include <unistd.h> |
278 |
+ #include <sys/ioctl.h> |
279 |
+ #include <sys/stat.h> |
280 |
++#include <sys/sysmacros.h> |
281 |
+ #include <inttypes.h> |
282 |
+ #include <getopt.h> |
283 |
+ |
284 |
+diff --git a/sys-utils/mountpoint.c b/sys-utils/mountpoint.c |
285 |
+index ad9c1da..64d0a7e 100644 |
286 |
+--- a/sys-utils/mountpoint.c |
287 |
++++ b/sys-utils/mountpoint.c |
288 |
+@@ -31,6 +31,7 @@ |
289 |
+ #include <unistd.h> |
290 |
+ #include <sys/types.h> |
291 |
+ #include <sys/stat.h> |
292 |
++#include <sys/sysmacros.h> |
293 |
+ |
294 |
+ #include <libmount.h> |
295 |
+ |
296 |
+-- |
297 |
+2.6.2 |
298 |
|
299 |
diff --git a/sys-apps/util-linux/util-linux-2.27.1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild |
300 |
index 6c46297..144441e 100644 |
301 |
--- a/sys-apps/util-linux/util-linux-2.27.1.ebuild |
302 |
+++ b/sys-apps/util-linux/util-linux-2.27.1.ebuild |
303 |
@@ -72,6 +72,7 @@ src_prepare() { |
304 |
po/update-potfiles |
305 |
eautoreconf |
306 |
fi |
307 |
+ epatch "${FILESDIR}"/${P}-sysmacros.patch |
308 |
elibtoolize |
309 |
} |