|
1 Changes to make "gmake parfait" work. In other words, instead of using |
|
2 "-include config.h" as part of the build, replace this with the addition |
|
3 of a: |
|
4 |
|
5 #include "config.h" |
|
6 |
|
7 at the beginning of all the source files that get information from this |
|
8 file. |
|
9 |
|
10 This patch can be removed when Parfait CR #19730835 is fixed. |
|
11 |
|
12 These changes will not be sent upstream. |
|
13 |
|
14 --- util-linux-2.24.2/Makefile.in.orig 2014-10-03 13:10:39.157296040 -0700 |
|
15 +++ util-linux-2.24.2/Makefile.in 2014-10-03 13:10:56.518794681 -0700 |
|
16 @@ -3267,7 +3267,6 @@ |
|
17 usrlib_execdir = @usrlib_execdir@ |
|
18 usrsbin_execdir = @usrsbin_execdir@ |
|
19 AM_CPPFLAGS = \ |
|
20 - -include config.h \ |
|
21 -I$(top_srcdir)/include \ |
|
22 -DLOCALEDIR=\"$(localedir)\" \ |
|
23 -D_PATH_LOCALSTATEDIR=\"${localstatedir}\" |
|
24 --- util-linux-2.24.2/text-utils/colcrt.c.orig 2014-10-03 12:57:37.229875653 -0700 |
|
25 +++ util-linux-2.24.2/text-utils/colcrt.c 2014-10-03 13:04:07.012470027 -0700 |
|
26 @@ -38,6 +38,7 @@ |
|
27 * modified to work correctly in multi-byte locales |
|
28 */ |
|
29 |
|
30 +#include "config.h" |
|
31 #include <stdio.h> |
|
32 #include <stdlib.h> |
|
33 #include <unistd.h> /* for close() */ |
|
34 --- util-linux-2.24.2/text-utils/colrm.c.orig 2014-10-03 12:57:37.234365767 -0700 |
|
35 +++ util-linux-2.24.2/text-utils/colrm.c 2014-10-03 13:04:22.353214979 -0700 |
|
36 @@ -38,6 +38,7 @@ |
|
37 * modified to work correctly in multi-byte locales |
|
38 */ |
|
39 |
|
40 +#include "config.h" |
|
41 #include <stdio.h> |
|
42 #include <stdlib.h> |
|
43 #include <getopt.h> |
|
44 --- util-linux-2.24.2/text-utils/column.c.orig 2014-10-03 12:57:37.238786225 -0700 |
|
45 +++ util-linux-2.24.2/text-utils/column.c 2014-10-03 13:04:35.246011917 -0700 |
|
46 @@ -38,6 +38,7 @@ |
|
47 * modified to work correctly in multi-byte locales |
|
48 */ |
|
49 |
|
50 +#include "config.h" |
|
51 #include <sys/types.h> |
|
52 #include <sys/ioctl.h> |
|
53 |
|
54 --- util-linux-2.24.2/text-utils/hexdump.c.orig 2014-10-03 12:57:37.243108535 -0700 |
|
55 +++ util-linux-2.24.2/text-utils/hexdump.c 2014-10-03 13:04:47.087065662 -0700 |
|
56 @@ -35,6 +35,7 @@ |
|
57 * - added Native Language Support |
|
58 */ |
|
59 |
|
60 +#include "config.h" |
|
61 #include <sys/types.h> |
|
62 #include <stdio.h> |
|
63 #include <string.h> |
|
64 --- util-linux-2.24.2/text-utils/hexsyntax.c.orig 2014-10-03 12:57:37.245992188 -0700 |
|
65 +++ util-linux-2.24.2/text-utils/hexsyntax.c 2014-10-03 13:04:59.228066989 -0700 |
|
66 @@ -35,6 +35,7 @@ |
|
67 * - added Native Language Support |
|
68 */ |
|
69 |
|
70 +#include "config.h" |
|
71 #include <sys/types.h> |
|
72 #include <unistd.h> |
|
73 #include <stdlib.h> |
|
74 --- util-linux-2.24.2/text-utils/rev.c.orig 2014-10-03 12:57:37.248641691 -0700 |
|
75 +++ util-linux-2.24.2/text-utils/rev.c 2014-10-03 13:05:12.227532484 -0700 |
|
76 @@ -48,6 +48,7 @@ |
|
77 * Changed tab indentation to 8 chars for better reading the code |
|
78 */ |
|
79 |
|
80 +#include "config.h" |
|
81 #include <stdarg.h> |
|
82 #include <sys/types.h> |
|
83 #include <errno.h> |
|
84 --- util-linux-2.24.2/text-utils/tailf.c.orig 2014-10-03 12:57:37.251263508 -0700 |
|
85 +++ util-linux-2.24.2/text-utils/tailf.c 2014-10-03 13:05:24.645043233 -0700 |
|
86 @@ -26,6 +26,7 @@ |
|
87 * flushed back to disk. This is sort of a "stealth" tail. |
|
88 */ |
|
89 |
|
90 +#include "config.h" |
|
91 #include <stdio.h> |
|
92 #include <stdlib.h> |
|
93 #include <unistd.h> |
|
94 --- util-linux-2.24.2/lib/colors.c.orig 2014-10-03 12:57:53.090779693 -0700 |
|
95 +++ util-linux-2.24.2/lib/colors.c 2014-10-03 13:05:42.799702714 -0700 |
|
96 @@ -4,6 +4,7 @@ |
|
97 * This file may be distributed under the terms of the |
|
98 * GNU Lesser General Public License. |
|
99 */ |
|
100 +#include "config.h" |
|
101 #include <c.h> |
|
102 #include <assert.h> |
|
103 |
|
104 --- util-linux-2.24.2/lib/fileutils.c.orig 2014-10-03 12:57:58.764773604 -0700 |
|
105 +++ util-linux-2.24.2/lib/fileutils.c 2014-10-03 13:05:52.790897687 -0700 |
|
106 @@ -2,6 +2,7 @@ |
|
107 * Copyright (C) 2012 Sami Kerola <[email protected]> |
|
108 */ |
|
109 |
|
110 +#include "config.h" |
|
111 #include <stdio.h> |
|
112 #include <stdlib.h> |
|
113 #include <sys/stat.h> |
|
114 --- util-linux-2.24.2/lib/tt.c.orig 2014-10-03 12:58:03.068722737 -0700 |
|
115 +++ util-linux-2.24.2/lib/tt.c 2014-10-03 13:06:03.548849305 -0700 |
|
116 @@ -10,6 +10,7 @@ |
|
117 * This file may be redistributed under the terms of the |
|
118 * GNU Lesser General Public License. |
|
119 */ |
|
120 +#include "config.h" |
|
121 #include <stdio.h> |
|
122 #include <stdlib.h> |
|
123 #include <unistd.h> |