diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-extended | |
download | meta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-extended')
144 files changed, 10057 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/acpica/acpica_20140828.bb b/meta-oe/recipes-extended/acpica/acpica_20140828.bb new file mode 100644 index 000000000..fb19c8858 --- /dev/null +++ b/meta-oe/recipes-extended/acpica/acpica_20140828.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | SUMMARY = "ACPICA tools for the development and debug of ACPI tables" | ||
2 | DESCRIPTION = "The ACPI Component Architecture (ACPICA) project provides an \ | ||
3 | OS-independent reference implementation of the Advanced Configuration and \ | ||
4 | Power Interface Specification (ACPI). ACPICA code contains those portions of \ | ||
5 | ACPI meant to be directly integrated into the host OS as a kernel-resident \ | ||
6 | subsystem, and a small set of tools to assist in developing and debugging \ | ||
7 | ACPI tables." | ||
8 | HOMEPAGE = "http://www.acpica.org/" | ||
9 | SECTION = "console/tools" | ||
10 | LICENSE = "BSD | GPLv2" | ||
11 | LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa" | ||
12 | DEPENDS = "bison flex" | ||
13 | |||
14 | SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ | ||
15 | file://no-werror.patch \ | ||
16 | " | ||
17 | SRC_URI[md5sum] = "6f05f0d10166a1b1ff6107f3d1cdf1e5" | ||
18 | SRC_URI[sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f5be5fac6d888e" | ||
19 | |||
20 | S = "${WORKDIR}/acpica-unix2-${PV}" | ||
21 | |||
22 | EXTRA_OEMAKE = "CC='${CC}' 'OPT_CFLAGS=-Wall'" | ||
23 | |||
24 | do_install() { | ||
25 | install -D -p -m0755 generate/unix/bin*/iasl ${D}${bindir}/iasl | ||
26 | install -D -p -m0755 generate/unix/bin*/acpibin ${D}${bindir}/acpibin | ||
27 | install -D -p -m0755 generate/unix/bin*/acpiexec ${D}${bindir}/acpiexec | ||
28 | install -D -p -m0755 generate/unix/bin*/acpihelp ${D}${bindir}/acpihelp | ||
29 | install -D -p -m0755 generate/unix/bin*/acpinames ${D}${bindir}/acpinames | ||
30 | install -D -p -m0755 generate/unix/bin*/acpisrc ${D}${bindir}/acpisrc | ||
31 | install -D -p -m0755 generate/unix/bin*/acpixtract ${D}${bindir}/acpixtract | ||
32 | } | ||
33 | |||
34 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | ||
diff --git a/meta-oe/recipes-extended/acpica/acpitests/aapits-linux.patch b/meta-oe/recipes-extended/acpica/acpitests/aapits-linux.patch new file mode 100644 index 000000000..7c5d6b044 --- /dev/null +++ b/meta-oe/recipes-extended/acpica/acpitests/aapits-linux.patch | |||
@@ -0,0 +1,336 @@ | |||
1 | From: Al Stone <ahs3@ahs3.net> | ||
2 | Date: Mon, 7 Apr 2014 19:09:37 +0000 | ||
3 | Subject: [PATCH 1/2] Fixup aapits build | ||
4 | |||
5 | From http://git.linaro.org/people/al.stone/acpica-tools.git | ||
6 | Upstream-status: Unknown | ||
7 | |||
8 | diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapits/tests/aapits/atexec.c | ||
9 | --- acpica-unix2-20130626/tests/aapits/atexec.c 2013-01-17 12:48:28.000000000 -0700 | ||
10 | +++ acpica-unix2-20130626-aapits/tests/aapits/atexec.c 2013-07-25 13:44:23.023894441 -0600 | ||
11 | @@ -639,6 +639,7 @@ | ||
12 | } | ||
13 | |||
14 | |||
15 | +#if ACPI_MACHINE_WIDTH == 32 | ||
16 | /******************************************************************************* | ||
17 | * | ||
18 | * FUNCTION: AtBuildLocalRSDT | ||
19 | @@ -757,8 +758,9 @@ | ||
20 | LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum; | ||
21 | } | ||
22 | } | ||
23 | +#endif | ||
24 | |||
25 | |||
26 | /******************************************************************************* | ||
27 | * | ||
28 | * FUNCTION: AtBuildLocalXSDT | ||
29 | @@ -1424,7 +1426,7 @@ | ||
30 | ACPI_WARNING ((AE_INFO, | ||
31 | "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n", | ||
32 | (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address, | ||
33 | - ByteWidth, (UINT32) BufferAddress, Length)); | ||
34 | + ByteWidth, (UINT32) BufferAddress, (UINT32) Length)); | ||
35 | |||
36 | return (AE_AML_REGION_LIMIT); | ||
37 | } | ||
38 | @@ -1792,7 +1796,9 @@ | ||
39 | Path, Obj.Integer.Value, Value); | ||
40 | #else | ||
41 | printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", | ||
42 | - Path, Obj.Integer.Value, Value); | ||
43 | + Path, | ||
44 | + (long long unsigned int) Obj.Integer.Value, | ||
45 | + (long long unsigned int) Value); | ||
46 | #endif | ||
47 | Status = AE_ERROR; | ||
48 | } | ||
49 | @@ -1871,7 +1877,7 @@ | ||
50 | { | ||
51 | TestErrors++; | ||
52 | printf ("Test Error: cannot allocate buffer of %d bytes\n", | ||
53 | - Results.Length); | ||
54 | + (int) Results.Length); | ||
55 | return (AE_NO_MEMORY); | ||
56 | } | ||
57 | Results.Pointer = Object; | ||
58 | @@ -1952,7 +1956,8 @@ | ||
59 | { | ||
60 | printf ("AtCheckBuffer: unexpected length %d of Buffer vs" | ||
61 | " calculated %d bytes\n", | ||
62 | - Results.Length, ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length)); | ||
63 | + (int)Results.Length, | ||
64 | + (int)(ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof (ACPI_OBJECT) + Length))); | ||
65 | } | ||
66 | |||
67 | /* Initialize the return buffer structure */ | ||
68 | @@ -1961,7 +1968,7 @@ | ||
69 | { | ||
70 | TestErrors++; | ||
71 | printf ("Test Error: cannot allocate buffer of %d bytes\n", | ||
72 | - Results.Length); | ||
73 | + (int) Results.Length); | ||
74 | return (AE_NO_MEMORY); | ||
75 | } | ||
76 | Results.Pointer = Object; | ||
77 | diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapits/tests/aapits/atinit.c | ||
78 | --- acpica-unix2-20130626/tests/aapits/atinit.c 2013-01-17 12:48:28.000000000 -0700 | ||
79 | +++ acpica-unix2-20130626-aapits/tests/aapits/atinit.c 2013-07-25 13:20:19.706705960 -0600 | ||
80 | @@ -3024,7 +3024,7 @@ | ||
81 | AapiErrors++; | ||
82 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
83 | " Length %d, expected %d\n", | ||
84 | - OutBuffer.Length, sizeof (Info)); | ||
85 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
86 | return (AE_ERROR); | ||
87 | } | ||
88 | |||
89 | @@ -3046,7 +3046,7 @@ | ||
90 | AapiErrors++; | ||
91 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
92 | " Length %d, expected %d\n", | ||
93 | - OutBuffer.Length, sizeof (Info)); | ||
94 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
95 | return (AE_ERROR); | ||
96 | } | ||
97 | |||
98 | @@ -3066,7 +3066,7 @@ | ||
99 | AapiErrors++; | ||
100 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
101 | " Length %d, expected %d\n", | ||
102 | - OutBuffer.Length, sizeof (Info)); | ||
103 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
104 | return (AE_ERROR); | ||
105 | } | ||
106 | else if (OutBuffer.Pointer != &Info) | ||
107 | @@ -3149,7 +3149,7 @@ | ||
108 | AapiErrors++; | ||
109 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
110 | " Length %d, expected %d\n", | ||
111 | - OutBuffer.Length, sizeof (Info)); | ||
112 | + (int) OutBuffer.Length, (int) sizeof (Info)); | ||
113 | return (AE_ERROR); | ||
114 | } | ||
115 | else if (OutBuffer.Pointer != &Info) | ||
116 | @@ -3214,7 +3214,7 @@ | ||
117 | AapiErrors++; | ||
118 | printf ("API Error: AcpiGetSystemInfo() returned" | ||
119 | " Length %d, expected %d\n", | ||
120 | - OutBuffer.Length, sizeof (ACPI_SYSTEM_INFO)); | ||
121 | + (int) OutBuffer.Length, (int) sizeof (ACPI_SYSTEM_INFO)); | ||
122 | return (AE_ERROR); | ||
123 | } | ||
124 | else | ||
125 | diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapits/tests/aapits/atmain.c | ||
126 | --- acpica-unix2-20130626/tests/aapits/atmain.c 2013-01-17 12:48:28.000000000 -0700 | ||
127 | +++ acpica-unix2-20130626-aapits/tests/aapits/atmain.c 2013-07-25 13:18:22.083323948 -0600 | ||
128 | @@ -315,7 +315,7 @@ | ||
129 | { | ||
130 | printf ("ACPICA API TS err: test num %ld of test case %ld" | ||
131 | " is not implemented\n", | ||
132 | - test_num, test_case); | ||
133 | + (long int) test_num, (long int) test_case); | ||
134 | return (AtRetNotImpl); | ||
135 | } | ||
136 | |||
137 | @@ -430,7 +432,7 @@ | ||
138 | if (test_case < 1 || test_case > AT_TEST_CASE_NUM) | ||
139 | { | ||
140 | printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n", | ||
141 | - test_case, AT_TEST_CASE_NUM); | ||
142 | + (long int) test_case, (int) AT_TEST_CASE_NUM); | ||
143 | return (AtRetBadParam); | ||
144 | } | ||
145 | |||
146 | @@ -438,7 +440,7 @@ | ||
147 | if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum) | ||
148 | { | ||
149 | printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n", | ||
150 | - test_num, AtTestCase[test_case].TestsNum); | ||
151 | + (long int) test_num, AtTestCase[test_case].TestsNum); | ||
152 | return (AtRetBadParam); | ||
153 | } | ||
154 | |||
155 | diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c | ||
156 | --- acpica-unix2-20130626/tests/aapits/atnamespace.c 2013-01-17 12:48:28.000000000 -0700 | ||
157 | +++ acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c 2013-07-25 13:24:15.366466707 -0600 | ||
158 | @@ -2535,7 +2535,8 @@ | ||
159 | #else | ||
160 | printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n", | ||
161 | PathNames[2 * i + 1], | ||
162 | - Info->Address, ExpectedInfo[i].Address); | ||
163 | + (long long unsigned int) Info->Address, | ||
164 | + (long long unsigned int) ExpectedInfo[i].Address); | ||
165 | #endif | ||
166 | #else | ||
167 | printf ("API Error: Address of %s (0x%X) != (0x%X)\n", | ||
168 | @@ -2908,7 +2909,8 @@ | ||
169 | TestErrors++; | ||
170 | printf ("AtGetNextObjectTypeCommon: different numbers of entities" | ||
171 | "in TypesNames (%d) and LevelTypes0000 (%d)\n", | ||
172 | - TypesCount, sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE)); | ||
173 | + TypesCount, | ||
174 | + (int) (sizeof (LevelTypes0000) / sizeof (ACPI_OBJECT_TYPE))); | ||
175 | return (AE_ERROR); | ||
176 | } | ||
177 | |||
178 | @@ -4192,7 +4194,9 @@ | ||
179 | Pathname, Obj.Integer.Value, Value); | ||
180 | #else | ||
181 | printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", | ||
182 | - Pathname, Obj.Integer.Value, Value); | ||
183 | + Pathname, | ||
184 | + (long long unsigned int) Obj.Integer.Value, | ||
185 | + (long long unsigned int) Value); | ||
186 | #endif | ||
187 | Status = AE_ERROR; | ||
188 | } | ||
189 | @@ -5199,7 +5203,7 @@ | ||
190 | { | ||
191 | AapiErrors++; | ||
192 | printf ("API Error: AcpiOsAllocate(%d) returned NULL\n", | ||
193 | - OutName.Length); | ||
194 | + (int) OutName.Length); | ||
195 | return (AE_ERROR); | ||
196 | } | ||
197 | } | ||
198 | diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c | ||
199 | --- acpica-unix2-20130626/tests/aapits/atosxfctrl.c 2013-01-17 12:48:28.000000000 -0700 | ||
200 | +++ acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c 2013-07-25 13:30:00.375492751 -0600 | ||
201 | @@ -737,13 +737,15 @@ | ||
202 | #if ACPI_MACHINE_WIDTH == 64 | ||
203 | #ifdef _MSC_VER | ||
204 | printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n", | ||
205 | + Width, Address); | ||
206 | #else | ||
207 | printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%llx\n", | ||
208 | + Width, (long long unsigned int) Address); | ||
209 | #endif | ||
210 | #else | ||
211 | printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%x\n", | ||
212 | -#endif | ||
213 | Width, Address); | ||
214 | +#endif | ||
215 | return (NULL); | ||
216 | } | ||
217 | |||
218 | @@ -764,15 +766,19 @@ | ||
219 | #ifdef _MSC_VER | ||
220 | printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)" | ||
221 | " and (0x%I64x: 0x%x)\n", | ||
222 | + Reg->Address, Reg->Width, Address, Width); | ||
223 | #else | ||
224 | printf("OsxfCtrlFingReg: intersection Regs (0x%llx: 0x%x)" | ||
225 | " and (0x%llx: 0x%x)\n", | ||
226 | + (long long unsigned int) Reg->Address, | ||
227 | + Reg->Width, | ||
228 | + (long long unsigned int) Address, Width); | ||
229 | #endif | ||
230 | #else | ||
231 | printf("OsxfCtrlFingReg: intersection Regs (0x%x: 0x%x)" | ||
232 | " and (0x%x: 0x%x)\n", | ||
233 | -#endif | ||
234 | Reg->Address, Reg->Width, Address, Width); | ||
235 | +#endif | ||
236 | return (NULL); | ||
237 | } | ||
238 | } | ||
239 | @@ -786,13 +792,15 @@ | ||
240 | #if ACPI_MACHINE_WIDTH == 64 | ||
241 | #ifdef _MSC_VER | ||
242 | printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n", | ||
243 | + Reg->Address, Reg->Width); | ||
244 | #else | ||
245 | printf("OsxfCtrlFingReg: no memory for Reg (0x%llx: 0x%x)\n", | ||
246 | + (long long unsigned int) Reg->Address, Reg->Width); | ||
247 | #endif | ||
248 | #else | ||
249 | printf("OsxfCtrlFingReg: no memory for Reg (0x%x: 0x%x)\n", | ||
250 | -#endif | ||
251 | Reg->Address, Reg->Width); | ||
252 | +#endif | ||
253 | return (NULL); | ||
254 | } | ||
255 | Reg->Type = Type; | ||
256 | @@ -932,14 +940,19 @@ | ||
257 | #if ACPI_MACHINE_WIDTH == 64 | ||
258 | #ifdef _MSC_VER | ||
259 | printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n", | ||
260 | + i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO", | ||
261 | + Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount); | ||
262 | #else | ||
263 | printf("%.2u (%s Address 0x%llx: Width %.2u) r/w counts: %u/%u\n", | ||
264 | + i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO", | ||
265 | + (long long unsigned int) Reg->Address, | ||
266 | + Reg->Width, Reg->ReadCount, Reg->WriteCount); | ||
267 | #endif | ||
268 | #else | ||
269 | printf("%.2u (%s Address 0x%.4x: Width %.2u) r/w counts: %u/%u\n", | ||
270 | -#endif | ||
271 | i, (Reg->Type == EMUL_REG_SYS)? "SYS": "IO", | ||
272 | Reg->Address, Reg->Width, Reg->ReadCount, Reg->WriteCount); | ||
273 | +#endif | ||
274 | Reg = Reg->Next; | ||
275 | i++; | ||
276 | } | ||
277 | diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-aapits/tests/aapits/atresource.c | ||
278 | --- acpica-unix2-20130626/tests/aapits/atresource.c 2013-01-17 12:48:29.000000000 -0700 | ||
279 | +++ acpica-unix2-20130626-aapits/tests/aapits/atresource.c 2013-07-25 13:25:49.423565947 -0600 | ||
280 | @@ -174,7 +174,7 @@ | ||
281 | AapiErrors++; | ||
282 | printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," | ||
283 | " expected %d\n", | ||
284 | - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
285 | + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
286 | return (AE_ERROR); | ||
287 | } | ||
288 | |||
289 | @@ -490,7 +490,7 @@ | ||
290 | AapiErrors++; | ||
291 | printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," | ||
292 | " expected %d\n", | ||
293 | - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
294 | + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
295 | return (AE_ERROR); | ||
296 | } | ||
297 | |||
298 | @@ -689,7 +689,7 @@ | ||
299 | AapiErrors++; | ||
300 | printf ("Api Error: Resource->Length (%d) != %d\n", | ||
301 | CurrentResource->Length, | ||
302 | - ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ))); | ||
303 | + (int) (ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RS_SIZE (ACPI_RESOURCE_IRQ)))); | ||
304 | } | ||
305 | |||
306 | if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */ | ||
307 | @@ -981,7 +981,7 @@ | ||
308 | AapiErrors++; | ||
309 | printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d," | ||
310 | " expected %d\n", | ||
311 | - Pathname, OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
312 | + Pathname, (int) OutBuffer.Length, RT0000_DEV0_CRS_LEN); | ||
313 | return (AE_ERROR); | ||
314 | } | ||
315 | |||
316 | @@ -1923,7 +1923,7 @@ | ||
317 | AapiErrors++; | ||
318 | printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d," | ||
319 | " expected %d\n", | ||
320 | - Pathname, OutBuffer.Length, 0xA48); | ||
321 | + Pathname, (int) OutBuffer.Length, 0xA48); | ||
322 | return (AE_ERROR); | ||
323 | } | ||
324 | |||
325 | diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapits/tests/aapits/Makefile | ||
326 | --- acpica-unix2-20130626/tests/aapits/Makefile 2013-01-17 12:48:29.000000000 -0700 | ||
327 | +++ acpica-unix2-20130626-aapits/tests/aapits/Makefile 2013-07-25 15:17:09.309236422 -0600 | ||
328 | @@ -194,7 +194,7 @@ | ||
329 | CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include | ||
330 | |||
331 | |||
332 | -acpiexec : $(patsubst %.c,%.o, $(SRCS)) | ||
333 | +$(PROG) : $(patsubst %.c,%.o, $(SRCS)) | ||
334 | $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG) | ||
335 | |||
336 | CLEANFILES= $(PROG) | ||
diff --git a/meta-oe/recipes-extended/acpica/acpitests/aapits-makefile.patch b/meta-oe/recipes-extended/acpica/acpitests/aapits-makefile.patch new file mode 100644 index 000000000..4d9e9974d --- /dev/null +++ b/meta-oe/recipes-extended/acpica/acpitests/aapits-makefile.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From: Al Stone <ahs3@ahs3.net> | ||
2 | Date: Mon, 7 Apr 2014 19:09:37 +0000 | ||
3 | Subject: [PATCH 1/2] Fixup aapits build | ||
4 | |||
5 | From http://git.linaro.org/people/al.stone/acpica-tools.git | ||
6 | Upstream-status: Unknown | ||
7 | |||
8 | diff -urN acpica-unix2-20140325/tests/aapits/Makefile acpica-unix2-20140325/tests/aapits/Makefile | ||
9 | --- acpica-unix2-20140325/tests/aapits/Makefile 2014-04-05 14:23:14.683636794 -0600 | ||
10 | +++ acpica-unix2-20140325-aapits/tests/aapits/Makefile 2014-04-05 15:10:57.879184598 -0600 | ||
11 | @@ -16,6 +16,7 @@ | ||
12 | atosxfwrap.c \ | ||
13 | osunixxf.c \ | ||
14 | ../../source/common/ahids.c \ | ||
15 | + ../../source/common/ahuuids.c \ | ||
16 | ../../source/common/cmfsize.c \ | ||
17 | ../../source/common/getopt.c \ | ||
18 | ../../source/components/hardware/hwtimer.c \ | ||
19 | @@ -174,6 +175,7 @@ | ||
20 | ../../source/components/utilities/utexcep.c \ | ||
21 | ../../source/components/utilities/utfileio.c \ | ||
22 | ../../source/components/utilities/utglobal.c \ | ||
23 | + ../../source/components/utilities/uthex.c \ | ||
24 | ../../source/components/utilities/utids.c \ | ||
25 | ../../source/components/utilities/utinit.c \ | ||
26 | ../../source/components/utilities/utlock.c \ | ||
27 | @@ -189,6 +191,7 @@ | ||
28 | ../../source/components/utilities/utstate.c \ | ||
29 | ../../source/components/utilities/utstring.c \ | ||
30 | ../../source/components/utilities/uttrack.c \ | ||
31 | + ../../source/components/utilities/utuuid.c \ | ||
32 | ../../source/components/utilities/utxface.c \ | ||
33 | ../../source/components/utilities/utxferror.c \ | ||
34 | ../../source/components/utilities/utxfinit.c \ | ||
diff --git a/meta-oe/recipes-extended/acpica/acpitests_20140828.bb b/meta-oe/recipes-extended/acpica/acpitests_20140828.bb new file mode 100644 index 000000000..2a089f859 --- /dev/null +++ b/meta-oe/recipes-extended/acpica/acpitests_20140828.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | SUMMARY = "Test suite used to validate ACPICA" | ||
2 | HOMEPAGE = "http://www.acpica.org/" | ||
3 | |||
4 | LICENSE = "Intel" | ||
5 | LIC_FILES_CHKSUM = "file://tests/aapits/atexec.c;beginline=1;endline=115;md5=e92bcdfcd01d117d1bda3e814bb2030a" | ||
6 | |||
7 | DEPENDS = "bison flex" | ||
8 | |||
9 | SRC_URI = "https://acpica.org/sites/acpica/files/acpitests-unix-${PV}.tar.gz;name=acpitests \ | ||
10 | https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz;name=acpica \ | ||
11 | file://aapits-linux.patch \ | ||
12 | file://aapits-makefile.patch \ | ||
13 | " | ||
14 | SRC_URI[acpitests.md5sum] = "db9d6fdaa8e3eb101d700ee5ba4938ed" | ||
15 | SRC_URI[acpitests.sha256sum] = "e576c74bf1bf1c9f7348bf9419e05c8acfece7105abcdc052e66670c7af2cf00" | ||
16 | SRC_URI[acpica.md5sum] = "6f05f0d10166a1b1ff6107f3d1cdf1e5" | ||
17 | SRC_URI[acpica.sha256sum] = "01d8867656c5ba41dec307c4383ce676196ad4281ac2c9dec9f5be5fac6d888e" | ||
18 | |||
19 | S = "${WORKDIR}/acpitests-unix-${PV}" | ||
20 | |||
21 | EXTRA_OEMAKE = "'CC=${TARGET_PREFIX}gcc ${HOST_CC_ARCH}' 'OPT_CFLAGS=-Wall'" | ||
22 | |||
23 | # The Makefiles expect a specific layout | ||
24 | do_compile() { | ||
25 | cp -af ${WORKDIR}/acpica-unix2-${PV}/source ${S} | ||
26 | cd tests/aapits | ||
27 | oe_runmake | ||
28 | } | ||
29 | |||
30 | do_install() { | ||
31 | install -d ${D}${bindir} | ||
32 | install -m0755 tests/aapits/bin/aapits ${D}${bindir} | ||
33 | } | ||
34 | |||
35 | COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" | ||
diff --git a/meta-oe/recipes-extended/acpica/files/no-werror.patch b/meta-oe/recipes-extended/acpica/files/no-werror.patch new file mode 100644 index 000000000..5d28f474f --- /dev/null +++ b/meta-oe/recipes-extended/acpica/files/no-werror.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Description: remove -Werror flag | ||
2 | Forwarded: not-needed | ||
3 | Author: Fathi Boudra <fathi.boudra@linaro.org> | ||
4 | |||
5 | --- | ||
6 | generate/unix/iasl/Makefile | 12 ++++++------ | ||
7 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
8 | |||
9 | --- a/generate/unix/iasl/Makefile | ||
10 | +++ b/generate/unix/iasl/Makefile | ||
11 | @@ -266,19 +266,19 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prpars | ||
12 | # by the utilities above and they are not necessarily ANSI C, etc. | ||
13 | # | ||
14 | $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c | ||
15 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
16 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
17 | |||
18 | $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c | ||
19 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
20 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
21 | |||
22 | $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c | ||
23 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
24 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
25 | |||
26 | $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c | ||
27 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
28 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
29 | |||
30 | $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c | ||
31 | - $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< | ||
32 | + $(CC) -c $(CFLAGS) -Wall -o$@ $< | ||
diff --git a/meta-oe/recipes-extended/anki/anki-0.4.3.inc b/meta-oe/recipes-extended/anki/anki-0.4.3.inc new file mode 100644 index 000000000..072e7f1e4 --- /dev/null +++ b/meta-oe/recipes-extended/anki/anki-0.4.3.inc | |||
@@ -0,0 +1,8 @@ | |||
1 | require anki.inc | ||
2 | |||
3 | SRC_URI = "${SOURCEFORGE_MIRROR}/anki/anki-${PV}.tgz" | ||
4 | SRC_URI[md5sum] = "90434860945de4c09d55cdb5dbe984fc" | ||
5 | SRC_URI[sha256sum] = "18a93fb46363ca34963fc2588cadf7415dd799dd647efa681859eb8b1b22f104" | ||
6 | |||
7 | export BUILD_PV := "${PV}" | ||
8 | SRC_URI += "file://no-need-for-pyqt-at-buildtime.patch" | ||
diff --git a/meta-oe/recipes-extended/anki/anki.inc b/meta-oe/recipes-extended/anki/anki.inc new file mode 100644 index 000000000..3092539ec --- /dev/null +++ b/meta-oe/recipes-extended/anki/anki.inc | |||
@@ -0,0 +1,9 @@ | |||
1 | DESCRIPTION = "Anki is a program designed to help you remember facts \ | ||
2 | (such as words and phrases in a foreign language) \ | ||
3 | as easily, quickly and efficiently as possible" | ||
4 | HOMEPAGE = "http://ichi2.net/anki/" | ||
5 | AUTHOR = "Damien Elmes" | ||
6 | LICENSE = "GPLv3+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" | ||
8 | |||
9 | inherit setuptools | ||
diff --git a/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch new file mode 100644 index 000000000..9eac1dc7b --- /dev/null +++ b/meta-oe/recipes-extended/anki/anki/no-need-for-pyqt-at-buildtime.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | # | ||
2 | # (C) Michael 'Mickey' Lauer <mlauer@vanille-media.de> | ||
3 | # | ||
4 | Index: anki-0.4.3/setup.py | ||
5 | =================================================================== | ||
6 | --- anki-0.4.3.orig/setup.py 2008-02-12 19:17:56.000000000 +0000 | ||
7 | +++ anki-0.4.3/setup.py 2008-02-12 19:19:29.000000000 +0000 | ||
8 | @@ -3,10 +3,8 @@ | ||
9 | from setuptools import setup, find_packages | ||
10 | import sys, os | ||
11 | |||
12 | -import ankiqt | ||
13 | - | ||
14 | setup(name='ankiqt', | ||
15 | - version=ankiqt.appVersion, | ||
16 | + version=os.environ["BUILD_PV"], | ||
17 | description='An intelligent spaced-repetition memory training program', | ||
18 | long_description="", | ||
19 | # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers | ||
20 | @@ -24,7 +22,7 @@ | ||
21 | license='GPLv2', | ||
22 | packages=find_packages(), | ||
23 | include_package_data=True, | ||
24 | - install_requires = 'anki >= ' + ankiqt.appVersion, | ||
25 | + install_requires = 'anki >= ' + os.environ["BUILD_PV"], | ||
26 | zip_safe=False, | ||
27 | package_data={'ankiqt': | ||
28 | ['locale/*/*/*']}, | ||
diff --git a/meta-oe/recipes-extended/anki/anki_0.4.3.bb b/meta-oe/recipes-extended/anki/anki_0.4.3.bb new file mode 100644 index 000000000..61e063d95 --- /dev/null +++ b/meta-oe/recipes-extended/anki/anki_0.4.3.bb | |||
@@ -0,0 +1,4 @@ | |||
1 | require ${PN}-${PV}.inc | ||
2 | |||
3 | RDEPENDS_${PN} = "python-pyqt libanki" | ||
4 | RRECOMMENDS_${PN} = "virtual-japanese-font" | ||
diff --git a/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch b/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch new file mode 100644 index 000000000..92583e59f --- /dev/null +++ b/meta-oe/recipes-extended/anki/libanki/no-need-for-pyqt-at-buildtime.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | --- libanki.orig/setup.py 2008-01-02 13:22:22.000000000 +0100 | ||
2 | +++ libanki/setup.py 2012-08-02 11:39:13.604173933 +0200 | ||
3 | @@ -3,10 +3,8 @@ | ||
4 | from setuptools import setup, find_packages | ||
5 | import sys, os | ||
6 | |||
7 | -import anki | ||
8 | - | ||
9 | setup(name='anki', | ||
10 | - version=anki.version, | ||
11 | + version=os.environ["BUILD_PV"], | ||
12 | description='An intelligent spaced-repetition memory training library', | ||
13 | long_description="", | ||
14 | # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers | ||
diff --git a/meta-oe/recipes-extended/anki/libanki_0.4.3.bb b/meta-oe/recipes-extended/anki/libanki_0.4.3.bb new file mode 100644 index 000000000..636932f3a --- /dev/null +++ b/meta-oe/recipes-extended/anki/libanki_0.4.3.bb | |||
@@ -0,0 +1,3 @@ | |||
1 | require anki-${PV}.inc | ||
2 | |||
3 | S = "${WORKDIR}/anki-${PV}/libanki" | ||
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch new file mode 100644 index 000000000..1e2b7c159 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/collectd-version.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Don't pick up version string from parent git repository | ||
2 | |||
3 | If the collectd source is extracted from a tarball underneath a | ||
4 | directory structure that includes another git repository, that | ||
5 | repository will be picked up by "git describe" which is not | ||
6 | desirable. Check whether collectd itself is a git repository and just | ||
7 | use the default version if not. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
12 | |||
13 | diff --git a/version-gen.sh b/version-gen.sh | ||
14 | index e344541..d1c0929 100755 | ||
15 | --- a/version-gen.sh | ||
16 | +++ b/version-gen.sh | ||
17 | @@ -2,7 +2,10 @@ | ||
18 | |||
19 | DEFAULT_VERSION="5.2.2.git" | ||
20 | |||
21 | -VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" | ||
22 | +VERSION="" | ||
23 | +if test -d .git ; then | ||
24 | + VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`" | ||
25 | +fi | ||
26 | |||
27 | if test -z "$VERSION"; then | ||
28 | VERSION="$DEFAULT_VERSION" | ||
29 | -- | ||
30 | 1.7.10.4 | ||
31 | |||
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd.init b/meta-oe/recipes-extended/collectd/collectd/collectd.init new file mode 100644 index 000000000..95f5f73c6 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/collectd.init | |||
@@ -0,0 +1,212 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # collectd - start and stop the statistics collection daemon | ||
4 | # http://collectd.org/ | ||
5 | # | ||
6 | # Copyright (C) 2005-2006 Florian Forster <octo@verplant.org> | ||
7 | # Copyright (C) 2006-2009 Sebastian Harl <tokkee@debian.org> | ||
8 | # | ||
9 | |||
10 | ### BEGIN INIT INFO | ||
11 | # Provides: collectd | ||
12 | # Required-Start: $local_fs $remote_fs | ||
13 | # Required-Stop: $local_fs $remote_fs | ||
14 | # Should-Start: $network $named $syslog $time cpufrequtils | ||
15 | # Should-Stop: $network $named $syslog | ||
16 | # Default-Start: 2 3 4 5 | ||
17 | # Default-Stop: 0 1 6 | ||
18 | # Short-Description: manage the statistics collection daemon | ||
19 | # Description: collectd is the statistics collection daemon. | ||
20 | # It is a small daemon which collects system information | ||
21 | # periodically and provides mechanisms to monitor and store | ||
22 | # the values in a variety of ways. | ||
23 | ### END INIT INFO | ||
24 | |||
25 | . /etc/init.d/functions | ||
26 | |||
27 | export PATH=/sbin:/bin:/usr/sbin:/usr/bin | ||
28 | |||
29 | DISABLE=0 | ||
30 | |||
31 | NAME=collectd | ||
32 | DAEMON=/usr/sbin/collectd | ||
33 | |||
34 | CONFIGFILE=/etc/collectd.conf | ||
35 | PIDFILE=/var/run/collectd.pid | ||
36 | |||
37 | USE_COLLECTDMON=1 | ||
38 | COLLECTDMON_DAEMON=/usr/sbin/collectdmon | ||
39 | COLLECTDMON_PIDFILE=/var/run/collectdmon.pid | ||
40 | |||
41 | MAXWAIT=30 | ||
42 | |||
43 | # Gracefully exit if the package has been removed. | ||
44 | test -x $DAEMON || exit 0 | ||
45 | |||
46 | if [ -r /etc/default/$NAME ]; then | ||
47 | . /etc/default/$NAME | ||
48 | fi | ||
49 | |||
50 | if test "$ENABLE_COREFILES" == 1; then | ||
51 | ulimit -c unlimited | ||
52 | fi | ||
53 | |||
54 | if test "$USE_COLLECTDMON" == 1; then | ||
55 | _PIDFILE="$COLLECTDMON_PIDFILE" | ||
56 | else | ||
57 | _PIDFILE="$PIDFILE" | ||
58 | fi | ||
59 | |||
60 | # return: | ||
61 | # 0 if config is fine | ||
62 | # 1 if there is a syntax error | ||
63 | # 2 if there is no configuration | ||
64 | check_config() { | ||
65 | if test ! -e "$CONFIGFILE"; then | ||
66 | return 2 | ||
67 | fi | ||
68 | if ! $DAEMON -t -C "$CONFIGFILE"; then | ||
69 | return 1 | ||
70 | fi | ||
71 | return 0 | ||
72 | } | ||
73 | |||
74 | # return: | ||
75 | # 0 if the daemon has been started | ||
76 | # 1 if the daemon was already running | ||
77 | # 2 if the daemon could not be started | ||
78 | # 3 if the daemon was not supposed to be started | ||
79 | d_start() { | ||
80 | if test "$DISABLE" != 0; then | ||
81 | # we get here during restart | ||
82 | echo "disabled by /etc/default/$NAME" | ||
83 | return 3 | ||
84 | fi | ||
85 | |||
86 | if test ! -e "$CONFIGFILE"; then | ||
87 | # we get here during restart | ||
88 | echo "disabled, no configuration ($CONFIGFILE) found" | ||
89 | return 3 | ||
90 | fi | ||
91 | |||
92 | check_config | ||
93 | rc="$?" | ||
94 | if test "$rc" -ne 0; then | ||
95 | echo "not starting, configuration error" | ||
96 | return 2 | ||
97 | fi | ||
98 | |||
99 | if test "$USE_COLLECTDMON" == 1; then | ||
100 | start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \ | ||
101 | --exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE" \ | ||
102 | || return 2 | ||
103 | else | ||
104 | start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \ | ||
105 | --exec $DAEMON -- -C "$CONFIGFILE" -P "$_PIDFILE" \ | ||
106 | || return 2 | ||
107 | fi | ||
108 | return 0 | ||
109 | } | ||
110 | |||
111 | still_running_warning=" | ||
112 | WARNING: $NAME might still be running. | ||
113 | In large setups it might take some time to write all pending data to | ||
114 | the disk. You can adjust the waiting time in /etc/default/collectd." | ||
115 | |||
116 | # return: | ||
117 | # 0 if the daemon has been stopped | ||
118 | # 1 if the daemon was already stopped | ||
119 | # 2 if daemon could not be stopped | ||
120 | d_stop() { | ||
121 | PID=$( cat "$_PIDFILE" 2> /dev/null ) || true | ||
122 | |||
123 | start-stop-daemon --stop --quiet --oknodo --pidfile "$_PIDFILE" | ||
124 | rc="$?" | ||
125 | |||
126 | if test "$rc" -eq 2; then | ||
127 | return 2 | ||
128 | fi | ||
129 | |||
130 | sleep 1 | ||
131 | if test -n "$PID" && kill -0 $PID 2> /dev/null; then | ||
132 | i=0 | ||
133 | while kill -0 $PID 2> /dev/null; do | ||
134 | i=$(( $i + 2 )) | ||
135 | echo -n " ." | ||
136 | |||
137 | if test $i -gt $MAXWAIT; then | ||
138 | echo "$still_running_warning" | ||
139 | return 2 | ||
140 | fi | ||
141 | |||
142 | sleep 2 | ||
143 | done | ||
144 | return "$rc" | ||
145 | fi | ||
146 | return "$rc" | ||
147 | } | ||
148 | |||
149 | # return: | ||
150 | # 0 if the daemon is running | ||
151 | # 3 if the daemon is stopped | ||
152 | d_status(){ | ||
153 | if test "$USE_COLLECTDMON" == 1; then | ||
154 | status $COLLECTDMON_DAEMON | ||
155 | else | ||
156 | status $DAEMON | ||
157 | fi | ||
158 | } | ||
159 | |||
160 | case "$1" in | ||
161 | start) | ||
162 | echo -n "Starting $NAME" | ||
163 | d_start | ||
164 | case "$?" in | ||
165 | 0|1) echo "." ;; | ||
166 | *) exit 1 ;; | ||
167 | esac | ||
168 | ;; | ||
169 | stop) | ||
170 | echo -n "Stopping $NAME" | ||
171 | d_stop | ||
172 | case "$?" in | ||
173 | 0|1) echo "." ;; | ||
174 | *) exit 1 ;; | ||
175 | esac | ||
176 | ;; | ||
177 | status) | ||
178 | d_status | ||
179 | ;; | ||
180 | restart|force-reload) | ||
181 | echo -n "Restarting $NAME" | ||
182 | check_config | ||
183 | rc="$?" | ||
184 | if test "$rc" -eq 1; then | ||
185 | echo "not restarting, configuration error" | ||
186 | exit 1 | ||
187 | fi | ||
188 | d_stop | ||
189 | rc="$?" | ||
190 | case "$rc" in | ||
191 | 0|1) | ||
192 | sleep 1 | ||
193 | d_start | ||
194 | rc2="$?" | ||
195 | case "$rc2" in | ||
196 | 0|1) echo "." ;; | ||
197 | *) exit 1 ;; | ||
198 | esac | ||
199 | ;; | ||
200 | *) | ||
201 | exit 1 | ||
202 | ;; | ||
203 | esac | ||
204 | ;; | ||
205 | *) | ||
206 | echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2 | ||
207 | exit 3 | ||
208 | ;; | ||
209 | esac | ||
210 | |||
211 | # vim: syntax=sh noexpandtab sw=4 ts=4 : | ||
212 | |||
diff --git a/meta-oe/recipes-extended/collectd/collectd/collectd.service b/meta-oe/recipes-extended/collectd/collectd/collectd.service new file mode 100644 index 000000000..d835b735f --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/collectd.service | |||
@@ -0,0 +1,12 @@ | |||
1 | [Unit] | ||
2 | Description=Collectd | ||
3 | After=local-fs.target network.target | ||
4 | Requires=local-fs.target network.target | ||
5 | |||
6 | [Service] | ||
7 | ExecStart=@SBINDIR@/collectd -C /etc/collectd.conf -f | ||
8 | Restart=always | ||
9 | RestartSec=10 | ||
10 | |||
11 | [Install] | ||
12 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch b/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch new file mode 100644 index 000000000..2596bedf9 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/glibc-2.20-compatiblity.patch | |||
@@ -0,0 +1,102 @@ | |||
1 | This makes it forward compatible with glibc 2.20+ where _BSD_SOURCE | ||
2 | macro has been deprecated. | ||
3 | |||
4 | Fixes warnings like | ||
5 | |||
6 | usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp] | ||
7 | | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | Upstream-Status: Pending | ||
11 | Index: collectd-5.4.1/configure.ac | ||
12 | =================================================================== | ||
13 | --- collectd-5.4.1.orig/configure.ac 2014-09-03 01:21:10.666084244 -0700 | ||
14 | +++ collectd-5.4.1/configure.ac 2014-09-03 01:31:27.794084244 -0700 | ||
15 | @@ -1288,6 +1288,7 @@ | ||
16 | |||
17 | AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [], | ||
18 | [#define _BSD_SOURCE | ||
19 | +#define _DEFAULT_SOURCE 1 | ||
20 | #if HAVE_STDINT_H | ||
21 | # include <stdint.h> | ||
22 | #endif | ||
23 | @@ -1309,6 +1310,7 @@ | ||
24 | ]) | ||
25 | AC_CHECK_MEMBERS([struct udphdr.dest, struct udphdr.source], [], [], | ||
26 | [#define _BSD_SOURCE | ||
27 | +#define _DEFAULT_SOURCE 1 | ||
28 | #if HAVE_STDINT_H | ||
29 | # include <stdint.h> | ||
30 | #endif | ||
31 | Index: collectd-5.4.1/src/dns.c | ||
32 | =================================================================== | ||
33 | --- collectd-5.4.1.orig/src/dns.c 2014-01-26 00:09:14.856391886 -0800 | ||
34 | +++ collectd-5.4.1/src/dns.c 2014-09-03 01:32:37.666084244 -0700 | ||
35 | @@ -22,6 +22,7 @@ | ||
36 | **/ | ||
37 | |||
38 | #define _BSD_SOURCE | ||
39 | +#define _DEFAULT_SOURCE 1 | ||
40 | |||
41 | #include "collectd.h" | ||
42 | #include "common.h" | ||
43 | Index: collectd-5.4.1/src/exec.c | ||
44 | =================================================================== | ||
45 | --- collectd-5.4.1.orig/src/exec.c 2014-01-26 00:09:14.860391963 -0800 | ||
46 | +++ collectd-5.4.1/src/exec.c 2014-09-03 01:32:28.874084244 -0700 | ||
47 | @@ -24,6 +24,7 @@ | ||
48 | **/ | ||
49 | |||
50 | #define _BSD_SOURCE /* For setgroups */ | ||
51 | +#define _DEFAULT_SOURCE 1 | ||
52 | |||
53 | #include "collectd.h" | ||
54 | #include "common.h" | ||
55 | Index: collectd-5.4.1/src/load.c | ||
56 | =================================================================== | ||
57 | --- collectd-5.4.1.orig/src/load.c 2014-01-26 00:09:23.532559941 -0800 | ||
58 | +++ collectd-5.4.1/src/load.c 2014-09-03 01:32:51.462084244 -0700 | ||
59 | @@ -22,6 +22,7 @@ | ||
60 | **/ | ||
61 | |||
62 | #define _BSD_SOURCE | ||
63 | +#define _DEFAULT_SOURCE 1 | ||
64 | |||
65 | #include "collectd.h" | ||
66 | #include "common.h" | ||
67 | Index: collectd-5.4.1/src/network.c | ||
68 | =================================================================== | ||
69 | --- collectd-5.4.1.orig/src/network.c 2014-01-26 00:09:23.532559941 -0800 | ||
70 | +++ collectd-5.4.1/src/network.c 2014-09-03 01:32:44.522084244 -0700 | ||
71 | @@ -23,6 +23,7 @@ | ||
72 | **/ | ||
73 | |||
74 | #define _BSD_SOURCE /* For struct ip_mreq */ | ||
75 | +#define _DEFAULT_SOURCE 1 | ||
76 | |||
77 | #include "collectd.h" | ||
78 | #include "plugin.h" | ||
79 | Index: collectd-5.4.1/src/ntpd.c | ||
80 | =================================================================== | ||
81 | --- collectd-5.4.1.orig/src/ntpd.c 2014-01-26 00:09:14.880392351 -0800 | ||
82 | +++ collectd-5.4.1/src/ntpd.c 2014-09-03 01:32:20.350084244 -0700 | ||
83 | @@ -20,6 +20,7 @@ | ||
84 | **/ | ||
85 | |||
86 | #define _BSD_SOURCE /* For NI_MAXHOST */ | ||
87 | +#define _DEFAULT_SOURCE 1 | ||
88 | |||
89 | #include "collectd.h" | ||
90 | #include "common.h" | ||
91 | Index: collectd-5.4.1/src/utils_dns.c | ||
92 | =================================================================== | ||
93 | --- collectd-5.4.1.orig/src/utils_dns.c 2014-01-26 00:09:14.908392893 -0800 | ||
94 | +++ collectd-5.4.1/src/utils_dns.c 2014-09-03 01:31:47.062084244 -0700 | ||
95 | @@ -34,6 +34,7 @@ | ||
96 | */ | ||
97 | |||
98 | #define _BSD_SOURCE | ||
99 | +#define _DEFAULT_SOURCE 1 | ||
100 | |||
101 | #include "collectd.h" | ||
102 | #include "plugin.h" | ||
diff --git a/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch new file mode 100644 index 000000000..0e876ae85 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd/no-gcrypt-badpath.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | Disable defaulting of GCRYPT_LDFLAGS to -L/usr/lib | ||
2 | |||
3 | Prevents "unsafe for cross compilation" warnings that cause | ||
4 | do_qa_configure to fail. | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
9 | |||
10 | Index: collectd-5.4.1/configure.ac | ||
11 | =================================================================== | ||
12 | --- collectd-5.4.1.orig/configure.ac 2014-09-03 01:20:22.062084244 -0700 | ||
13 | +++ collectd-5.4.1/configure.ac 2014-09-03 01:20:22.058084244 -0700 | ||
14 | @@ -1867,11 +1867,11 @@ | ||
15 | GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null` | ||
16 | fi | ||
17 | |||
18 | - if test "x$GCRYPT_LDFLAGS" = "x" | ||
19 | - then | ||
20 | - gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null` | ||
21 | - GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib" | ||
22 | - fi | ||
23 | +# if test "x$GCRYPT_LDFLAGS" = "x" | ||
24 | +# then | ||
25 | +# gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null` | ||
26 | +# GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib" | ||
27 | +# fi | ||
28 | |||
29 | if test "x$GCRYPT_LIBS" = "x" | ||
30 | then | ||
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb b/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb new file mode 100644 index 000000000..46752c895 --- /dev/null +++ b/meta-oe/recipes-extended/collectd/collectd_5.4.1.bb | |||
@@ -0,0 +1,74 @@ | |||
1 | SUMMARY = "Collects and summarises system performance statistics" | ||
2 | DESCRIPTION = "collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files." | ||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
5 | |||
6 | DEPENDS = "rrdtool curl mysql5 libpcap libxml2 yajl libgcrypt libtool lvm2 libmnl" | ||
7 | |||
8 | SRC_URI = "http://collectd.org/files/collectd-${PV}.tar.bz2 \ | ||
9 | file://no-gcrypt-badpath.patch \ | ||
10 | file://collectd-version.patch \ | ||
11 | file://glibc-2.20-compatiblity.patch \ | ||
12 | file://collectd.init \ | ||
13 | file://collectd.service" | ||
14 | SRC_URI[md5sum] = "6f56c71c96573a7f4f7fb3bfab185974" | ||
15 | SRC_URI[sha256sum] = "75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0" | ||
16 | |||
17 | inherit autotools pythonnative update-rc.d pkgconfig systemd | ||
18 | |||
19 | SYSTEMD_SERVICE_${PN} = "collectd.service" | ||
20 | |||
21 | # Floatingpoint layout, architecture dependent | ||
22 | # 'nothing', 'endianflip' or 'intswap' | ||
23 | FPLAYOUT ?= "--with-fp-layout=nothing" | ||
24 | |||
25 | PACKAGECONFIG ??= "" | ||
26 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp --with-libnetsnmp=no,net-snmp" | ||
27 | PACKAGECONFIG[libmemcached] = "--with-libmemcached,--without-libmemcached,libmemcached" | ||
28 | PACKAGECONFIG[iptables] = "--enable-iptables,--disable-iptables,iptables" | ||
29 | PACKAGECONFIG[postgresql] = "--enable-postgresql --with-libpq=yes, \ | ||
30 | --disable-postgresql --with-libpq=no,postgresql" | ||
31 | PACKAGECONFIG[dbi] = "--enable-dbi,--disable-dbi,libdbi" | ||
32 | PACKAGECONFIG[modbus] = "--enable-modbus,--disable-modbus,libmodbus" | ||
33 | PACKAGECONFIG[libowcapi] = "--with-libowcapi,--without-libowcapi,owfs" | ||
34 | PACKAGECONFIG[sensors] = "--enable-sensors --with-libsensors=yes, \ | ||
35 | --disable-sensors --with-libsensors=no,lmsensors" | ||
36 | PACKAGECONFIG[amqp] = "--enable-amqp --with-librabbitmq=yes, \ | ||
37 | --disable-amqp --with-librabbitmq=no,rabbitmq-c" | ||
38 | # protobuf-c that is currently only available in meta-virtualization layer | ||
39 | PACKAGECONFIG[pinba] = "--enable-pinba,--disable-pinba,protobuf-c-native protobuf-c" | ||
40 | |||
41 | EXTRA_OECONF = " \ | ||
42 | ${FPLAYOUT} \ | ||
43 | --disable-perl --with-libperl=no --with-perl-bindings=no \ | ||
44 | --with-libgcrypt=${STAGING_BINDIR_CROSS}/libgcrypt-config \ | ||
45 | --disable-notify_desktop \ | ||
46 | " | ||
47 | |||
48 | do_install_append() { | ||
49 | install -d ${D}${sysconfdir}/init.d | ||
50 | install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd | ||
51 | sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd | ||
52 | sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd | ||
53 | sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd | ||
54 | sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/collectd | ||
55 | |||
56 | # Fix configuration file to allow collectd to start up | ||
57 | sed -i 's!^#FQDNLookup[ \t]*true!FQDNLookup false!g' ${D}${sysconfdir}/collectd.conf | ||
58 | |||
59 | rmdir "${D}${localstatedir}/run" | ||
60 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" | ||
61 | |||
62 | # Install systemd unit files | ||
63 | install -d ${D}${systemd_unitdir}/system | ||
64 | install -m 0644 ${WORKDIR}/collectd.service ${D}${systemd_unitdir}/system | ||
65 | sed -i -e 's,@SBINDIR@,${sbindir},g' \ | ||
66 | ${D}${systemd_unitdir}/system/collectd.service | ||
67 | } | ||
68 | |||
69 | INITSCRIPT_NAME = "collectd" | ||
70 | INITSCRIPT_PARAMS = "defaults" | ||
71 | |||
72 | # threshold.so load.so are also provided by gegl | ||
73 | # disk.so is also provided by libgphoto2-camlibs | ||
74 | PRIVATE_LIBS = "threshold.so load.so disk.so" | ||
diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb new file mode 100644 index 000000000..a36c25085 --- /dev/null +++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.16.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Data recovery tool" | ||
2 | DESCRIPTION = "GNU ddrescue is a data recovery tool. It copies data \ | ||
3 | from one file or block device (hard disc, cdrom, etc) to another, \ | ||
4 | trying hard to rescue data in case of read errors." | ||
5 | HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html" | ||
6 | SECTION = "console" | ||
7 | LICENSE = "GPLv3+" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ | ||
10 | file://main_common.cc;beginline=5;endline=16;md5=b5a59150a33658cc1ffc31b1a4ffb9f2" | ||
11 | |||
12 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" | ||
13 | SRC_URI[md5sum] = "57b67407e882c6418531d48a2f20d16b" | ||
14 | SRC_URI[sha256sum] = "76b3f2e5fb0306d24f2632c3e168cccb73dc0a348e3a7089cd9230748ff23de6" | ||
15 | |||
16 | inherit autotools | ||
17 | |||
18 | EXTRA_OECONF = "'CXX=${CXX}' 'CPPFLAGS=${CPPFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'LDFLAGS=${LDFLAGS}'" | ||
diff --git a/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb new file mode 100644 index 000000000..595f32360 --- /dev/null +++ b/meta-oe/recipes-extended/dialog/dialog-static_1.1-20120706.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require dialog.inc | ||
2 | |||
3 | LDFLAGS += "-static" | ||
4 | |||
5 | SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d" | ||
6 | SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5" | ||
diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog.inc new file mode 100644 index 000000000..995d6c07c --- /dev/null +++ b/meta-oe/recipes-extended/dialog/dialog.inc | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "display dialog boxes from shell scripts" | ||
2 | DESCRIPTION = "Dialog lets you to present a variety of questions \ | ||
3 | or display messages using dialog boxes from a shell \ | ||
4 | script (or any scripting language)." | ||
5 | HOMEPAGE = "http://invisible-island.net/dialog/" | ||
6 | SECTION = "console/utils" | ||
7 | DEPENDS = "ncurses" | ||
8 | LICENSE = "LGPL-2.1" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
10 | |||
11 | SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ | ||
12 | file://use-pkg-config-for-ncurses-detection.patch \ | ||
13 | " | ||
14 | |||
15 | # hardcoded here for use in dialog-static recipe | ||
16 | S = "${WORKDIR}/dialog-${PV}" | ||
17 | |||
18 | inherit autotools-brokensep pkgconfig | ||
19 | |||
20 | EXTRA_OECONF = "--with-ncurses \ | ||
21 | --disable-rpath-hack" | ||
22 | |||
23 | do_configure() { | ||
24 | gnu-configize --force | ||
25 | sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure | ||
26 | oe_runconf | ||
27 | } | ||
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb b/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb new file mode 100644 index 000000000..c87fb6160 --- /dev/null +++ b/meta-oe/recipes-extended/dialog/dialog_1.1-20120706.bb | |||
@@ -0,0 +1,4 @@ | |||
1 | require dialog.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "2e538305977178eb085a9859511c299d" | ||
4 | SRC_URI[sha256sum] = "305aa1000680aa87bb2148a725f9107ef4cd29dcd6185b44d079cb87cf0ce2f5" | ||
diff --git a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch new file mode 100644 index 000000000..a2354ade0 --- /dev/null +++ b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | Subject: [PATCH] use pkg-config for ncurses detection. | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | This is a workaround to make dialog be able to build after ncurses-config | ||
6 | does not work, since the configure file is called directly in dialog bb | ||
7 | file, and autoconf can not work, make a workaround in configure file. | ||
8 | |||
9 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
10 | --- | ||
11 | configure | 6 +++--- | ||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index 24e28c1..c78735d 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -9976,8 +9976,8 @@ fi | ||
19 | |||
20 | if test "$NCURSES_CONFIG" != none ; then | ||
21 | |||
22 | -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" | ||
23 | -LIBS="`$NCURSES_CONFIG --libs` $LIBS" | ||
24 | +CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`" | ||
25 | +LIBS="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $LIBS" | ||
26 | |||
27 | # even with config script, some packages use no-override for curses.h | ||
28 | |||
29 | @@ -10096,7 +10096,7 @@ cat >>confdefs.h <<EOF | ||
30 | #define $cf_nculib_ROOT 1 | ||
31 | EOF | ||
32 | |||
33 | -cf_cv_ncurses_version=`$NCURSES_CONFIG --version` | ||
34 | +cf_cv_ncurses_version=`pkg-config --short-errors --print-errors --modversion "ncurses"` | ||
35 | |||
36 | else | ||
37 | |||
38 | -- | ||
39 | 1.7.10.4 | ||
40 | |||
diff --git a/meta-oe/recipes-extended/efivar/efivar_git.bb b/meta-oe/recipes-extended/efivar/efivar_git.bb new file mode 100644 index 000000000..18446a08a --- /dev/null +++ b/meta-oe/recipes-extended/efivar/efivar_git.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Tools to manipulate UEFI variables" | ||
2 | DESCRIPTION = "efivar provides a simple command line interface to the UEFI variable facility" | ||
3 | HOMEPAGE = "https://github.com/vathpela/efivar" | ||
4 | |||
5 | LICENSE = "LGPLv2.1" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | ||
7 | |||
8 | DEPENDS = "popt" | ||
9 | |||
10 | SRCREV = "c9e1f24a81b5374408bca5616402276e47171cf7" | ||
11 | PV = "0.7+git${SRCPV}" | ||
12 | SRC_URI = "git://github.com/vathpela/efivar.git" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | do_install() { | ||
17 | oe_runmake install DESTDIR=${D} | ||
18 | } | ||
diff --git a/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb b/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb new file mode 100644 index 000000000..a1f0b303a --- /dev/null +++ b/meta-oe/recipes-extended/flashrom/flashrom_0.9.6.1.bb | |||
@@ -0,0 +1,15 @@ | |||
1 | DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" | ||
2 | LICENSE = "GPLv2" | ||
3 | HOMEPAGE = "http://flashrom.org" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
6 | DEPENDS = "pciutils" | ||
7 | |||
8 | SRC_URI = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2" | ||
9 | |||
10 | SRC_URI[md5sum] = "407e836c0a2b17ec76583cb6809f65e5" | ||
11 | SRC_URI[sha256sum] = "6f7b588cce74c90b4fe9c9c794de105de76e0323442fb5770b1aeab81e9d560a" | ||
12 | |||
13 | do_install() { | ||
14 | oe_runmake PREFIX=${prefix} DESTDIR=${D} install | ||
15 | } | ||
diff --git a/meta-oe/recipes-extended/fwts/fwts_git.bb b/meta-oe/recipes-extended/fwts/fwts_git.bb new file mode 100644 index 000000000..4fa1d6be1 --- /dev/null +++ b/meta-oe/recipes-extended/fwts/fwts_git.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "Firmware testsuite" | ||
2 | DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to exercise and test different aspects of a machine's firmware. Many of these tests need super user access to read BIOS data and ACPI tables, so the tool requires running with super user privileges (e.g. with sudo)." | ||
3 | HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f" | ||
7 | |||
8 | PV = "14.05.00" | ||
9 | |||
10 | SRCREV = "fb5385fec1f3468b479e87c0bba38ab76f60915b" | ||
11 | SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | DEPENDS = "libpcre json-c" | ||
16 | |||
17 | inherit autotools-brokensep | ||
18 | |||
19 | FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}" | ||
20 | FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la" | ||
21 | FILES_${PN}-staticdev += "${libdir}/fwts/lib*a" | ||
22 | FILES_${PN}-dbg += "${libdir}/fwts/.debug" | ||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch new file mode 100644 index 000000000..23f2cd26a --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/lua-loadlibs-configure-in-fix.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Index: gnuplot-4.6.5/configure.in | ||
2 | =================================================================== | ||
3 | --- gnuplot-4.6.5.orig/configure.in | ||
4 | +++ gnuplot-4.6.5/configure.in | ||
5 | @@ -690,6 +690,11 @@ if test "${with_lua}" = yes ; then | ||
6 | fi | ||
7 | |||
8 | if test "$with_lua" != no; then | ||
9 | + dnl check for dlopen/dl to fix loadlibs link failure | ||
10 | + AC_CHECK_FUNC([dlopen], [], | ||
11 | + AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) | ||
12 | + AC_SUBST(DLOPEN_LIBS) | ||
13 | + LUA_LIBS="$LUA_LIBS $DLOPEN_LIBS" | ||
14 | TERMLIBS="$TERMLIBS $LUA_LIBS" | ||
15 | CPPFLAGS="$CPPFLAGS $LUA_CFLAGS" | ||
16 | else | ||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch new file mode 100644 index 000000000..8c7d1f0d3 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot-4.6.5/subdirs.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- /tmp/Makefile.am 2007-08-23 13:10:15.560659023 +0200 | ||
2 | +++ gnuplot-4.2.0/Makefile.am 2007-08-23 13:10:34.961764629 +0200 | ||
3 | @@ -1,7 +1,7 @@ | ||
4 | ## Process this file with automake to produce Makefile.in -*-Makefile-*- | ||
5 | AUTOMAKE_OPTIONS = foreign 1.2h | ||
6 | |||
7 | -SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share | ||
8 | +SUBDIRS = config m4 term src $(LISPDIR) man share | ||
9 | |||
10 | EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ | ||
11 | Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ | ||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot.inc b/meta-oe/recipes-extended/gnuplot/gnuplot.inc new file mode 100644 index 000000000..6c27e6d8a --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot.inc | |||
@@ -0,0 +1,39 @@ | |||
1 | DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ | ||
2 | (text or binary) and function plotting utility." | ||
3 | HOMEPAGE = "http://www.gnuplot.info/" | ||
4 | SECTION = "console/scientific" | ||
5 | LICENSE = "gnuplot" | ||
6 | LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" | ||
7 | DEPENDS = "virtual/libx11 gd readline" | ||
8 | |||
9 | inherit autotools | ||
10 | |||
11 | acpaths = "" | ||
12 | |||
13 | PACKAGECONFIG ??= "cairo" | ||
14 | PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango" | ||
15 | PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" | ||
16 | |||
17 | EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ | ||
18 | --without-lisp-files \ | ||
19 | --without-tutorial \ | ||
20 | --disable-wxwidgets" | ||
21 | |||
22 | do_compile_prepend() { | ||
23 | install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ | ||
24 | } | ||
25 | |||
26 | do_install_append() { | ||
27 | install -d ${D}${datadir}/applications/ | ||
28 | install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ | ||
29 | install -d ${D}${datadir}/pixmaps/ | ||
30 | install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/ | ||
31 | } | ||
32 | |||
33 | PACKAGES =+ "${PN}-x11-dbg ${PN}-x11" | ||
34 | DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." | ||
35 | SECTION_${PN}-x11 = "x11/scientific" | ||
36 | FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " | ||
37 | |||
38 | FILES_${PN} += "${datadir}/texmf" | ||
39 | FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug" | ||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop new file mode 100644 index 000000000..f67df9e19 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.desktop | |||
@@ -0,0 +1,8 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Gnuplot | ||
3 | Comment=Plot data and function graphs | ||
4 | Exec=x-terminal-emulator -e gnuplot | ||
5 | Terminal=false | ||
6 | Type=Application | ||
7 | Icon=gnuplot | ||
8 | Categories=Science; | ||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png new file mode 100644 index 000000000..054cd9e7c --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/gnuplot.png | |||
Binary files differ | |||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm b/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm new file mode 100644 index 000000000..b52f9bb97 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot/qtopia.trm | |||
@@ -0,0 +1,483 @@ | |||
1 | /* | ||
2 | * $Id: dumb.trm,v 1.16 2004/04/13 17:24:16 broeker Exp $ | ||
3 | * | ||
4 | */ | ||
5 | |||
6 | /* GNUPLOT - qtopia.trm */ | ||
7 | |||
8 | /*[ | ||
9 | * Copyright 1991 - 1993, 1998, 2004 Thomas Williams, Colin Kelley | ||
10 | * | ||
11 | * Permission to use, copy, and distribute this software and its | ||
12 | * documentation for any purpose with or without fee is hereby granted, | ||
13 | * provided that the above copyright notice appear in all copies and | ||
14 | * that both that copyright notice and this permission notice appear | ||
15 | * in supporting documentation. | ||
16 | * | ||
17 | * Permission to modify the software is granted, but not the right to | ||
18 | * distribute the complete modified source code. Modifications are to | ||
19 | * be distributed as patches to the released version. Permission to | ||
20 | * distribute binaries produced by compiling modified sources is granted, | ||
21 | * provided you | ||
22 | * 1. distribute the corresponding source modifications from the | ||
23 | * released version in the form of a patch file along with the binaries, | ||
24 | * 2. add special version identification to distinguish your version | ||
25 | * in addition to the base release version number, | ||
26 | * 3. provide your name and address as the primary contact for the | ||
27 | * support of your modified version, and | ||
28 | * 4. retain our contact information in regard to use of the base | ||
29 | * software. | ||
30 | * Permission to distribute the released version of the source code along | ||
31 | * with corresponding source modifications in the form of a patch file is | ||
32 | * granted with same provisions 2 through 4 for binary distributions. | ||
33 | * | ||
34 | * This software is provided "as is" without express or implied warranty | ||
35 | * to the extent permitted by applicable law. | ||
36 | ]*/ | ||
37 | |||
38 | /* | ||
39 | * This file is included by ../term.c. | ||
40 | * | ||
41 | * This terminal driver supports: | ||
42 | * qtopia terminals | ||
43 | * | ||
44 | * AUTHORS | ||
45 | * Michael Neuroth, 2004-05-16 | ||
46 | * INTERNET: michael.neuroth@freenet.de | ||
47 | * | ||
48 | * send your comments or suggestions to (gnuplot-info@lists.sourceforge.net). | ||
49 | * | ||
50 | */ | ||
51 | #include "driver.h" | ||
52 | |||
53 | #define NO_QTOPIA_ENHANCED_SUPPORT | ||
54 | |||
55 | #ifdef TERM_REGISTER | ||
56 | register_term(qtopia_driver) | ||
57 | #endif | ||
58 | |||
59 | #ifdef TERM_PROTO | ||
60 | TERM_PUBLIC void QTOPIA_options __PROTO((void)); | ||
61 | TERM_PUBLIC void QTOPIA_init __PROTO((void)); | ||
62 | TERM_PUBLIC void QTOPIA_graphics __PROTO((void)); | ||
63 | TERM_PUBLIC void QTOPIA_text __PROTO((void)); | ||
64 | TERM_PUBLIC void QTOPIA_reset __PROTO((void)); | ||
65 | TERM_PUBLIC void QTOPIA_linetype __PROTO((int linetype)); | ||
66 | TERM_PUBLIC void QTOPIA_move __PROTO((unsigned int x, unsigned int y)); | ||
67 | TERM_PUBLIC void QTOPIA_point __PROTO((unsigned int x, unsigned int y, | ||
68 | int point)); | ||
69 | TERM_PUBLIC void QTOPIA_vector __PROTO((unsigned int x, unsigned int y)); | ||
70 | TERM_PUBLIC void QTOPIA_put_text __PROTO((unsigned int x, unsigned int y, | ||
71 | const char *str)); | ||
72 | TERM_PUBLIC void QTOPIA_arrow __PROTO((unsigned int sx, unsigned int sy, | ||
73 | unsigned int ex, unsigned int ey, | ||
74 | int head)); | ||
75 | |||
76 | #define ENHqtopia_put_text NULL | ||
77 | |||
78 | |||
79 | #define QTOPIA_XMAX 4096 | ||
80 | #define QTOPIA_YMAX 4096 | ||
81 | |||
82 | #ifdef ZAURUS | ||
83 | #define QTOPIA_VCHAR (QTOPIA_YMAX/25) | ||
84 | #define QTOPIA_HCHAR (QTOPIA_XMAX/40) | ||
85 | #define QTOPIA_VTIC (QTOPIA_YMAX/50) | ||
86 | #define QTOPIA_HTIC (QTOPIA_XMAX/40) | ||
87 | #else | ||
88 | #define QTOPIA_VCHAR (QTOPIA_YMAX/25) | ||
89 | #define QTOPIA_HCHAR (QTOPIA_XMAX/50) | ||
90 | #define QTOPIA_VTIC (QTOPIA_YMAX/100) | ||
91 | #define QTOPIA_HTIC (QTOPIA_XMAX/150) | ||
92 | #endif | ||
93 | |||
94 | #endif /* TERM_PROTO */ | ||
95 | |||
96 | #ifdef TERM_BODY | ||
97 | |||
98 | /*#include <winsock2.h>*/ | ||
99 | /* needs: ws2_32.lib */ | ||
100 | #ifndef _MSC_VER | ||
101 | #include <sys/types.h> | ||
102 | #include <sys/socket.h> | ||
103 | #include <netinet/in.h> | ||
104 | #include <arpa/inet.h> | ||
105 | #endif | ||
106 | |||
107 | #define QTOPIA_MAX_BUFFER 512 | ||
108 | #define QTOPIA_MAX_DELAY_COUNT 20 /* * 100 ms = 2 s */ | ||
109 | |||
110 | #ifdef _MSC_VER | ||
111 | #define QTOPIA_BAD_SOCKET INVALID_SOCKET /* -1 */ | ||
112 | #define QTOPIA_BAD_CONNECT SOCKET_ERROR | ||
113 | #else | ||
114 | #define QTOPIA_BAD_SOCKET -1 | ||
115 | #define QTOPIA_BAD_CONNECT -1 | ||
116 | #endif | ||
117 | #define QTOPIA_PORT_NO 5050 | ||
118 | |||
119 | static int qtopia_client_socket = QTOPIA_BAD_SOCKET; | ||
120 | static unsigned short qtopia_port_no = QTOPIA_PORT_NO; | ||
121 | static char qtopia_host_name[QTOPIA_MAX_BUFFER+1] = { "localhost" }; | ||
122 | |||
123 | static int OpenClient __PROTO(( int test)); | ||
124 | static void CloseClient(); | ||
125 | |||
126 | static void MySleep( delay ) | ||
127 | int delay; | ||
128 | { | ||
129 | #ifdef _MSC_VER | ||
130 | Sleep( delay ); | ||
131 | #else | ||
132 | usleep( delay ); | ||
133 | #endif | ||
134 | } | ||
135 | |||
136 | static void InitSockets() | ||
137 | { | ||
138 | #ifdef _MSC_VER | ||
139 | WORD wVersionRequested; | ||
140 | WSADATA wsaData; | ||
141 | int err; | ||
142 | |||
143 | wVersionRequested = MAKEWORD( 2, 2 ); | ||
144 | |||
145 | err = WSAStartup( wVersionRequested, &wsaData ); | ||
146 | #endif | ||
147 | } | ||
148 | |||
149 | static void ExitSockets() | ||
150 | { | ||
151 | #ifdef _MSC_VER | ||
152 | WSACleanup(); | ||
153 | #endif | ||
154 | } | ||
155 | |||
156 | static int CheckForQtplot( count ) | ||
157 | int count; | ||
158 | { | ||
159 | /* test (via sockets) if qtplot is allready running */ | ||
160 | if( !OpenClient( 1 ) ) | ||
161 | { | ||
162 | /* give qtplot a litle bit time to start... */ | ||
163 | if( count < QTOPIA_MAX_DELAY_COUNT ) | ||
164 | { | ||
165 | if( count == 0 ) | ||
166 | { | ||
167 | #ifdef _MSC_VER | ||
168 | system( "start qtplot" ); | ||
169 | #else | ||
170 | system( "qtplot&" ); | ||
171 | #endif | ||
172 | } | ||
173 | |||
174 | MySleep(100); | ||
175 | |||
176 | return CheckForQtplot( count+1 ); | ||
177 | } | ||
178 | else | ||
179 | { | ||
180 | return 0; | ||
181 | } | ||
182 | } | ||
183 | else | ||
184 | { | ||
185 | CloseClient(); | ||
186 | |||
187 | return 1; | ||
188 | } | ||
189 | } | ||
190 | |||
191 | static int OpenClient( test ) | ||
192 | int test; | ||
193 | { | ||
194 | int len; | ||
195 | struct sockaddr_in address; | ||
196 | int result; | ||
197 | |||
198 | /* Create a socket for the client. */ | ||
199 | |||
200 | qtopia_client_socket = socket(AF_INET, SOCK_STREAM, 0); | ||
201 | |||
202 | if( qtopia_client_socket != QTOPIA_BAD_SOCKET ) | ||
203 | { | ||
204 | /* Name the socket, as agreed with the server. */ | ||
205 | |||
206 | address.sin_family = AF_INET; | ||
207 | address.sin_addr.s_addr = inet_addr(/*qtopia_host_name*/"127.0.0.1"); /* localhost */ | ||
208 | address.sin_port = htons(qtopia_port_no); | ||
209 | len = sizeof(address); | ||
210 | |||
211 | /* Now connect our socket to the server's socket. */ | ||
212 | |||
213 | result = connect(qtopia_client_socket, (struct sockaddr *)&address, len); | ||
214 | |||
215 | if( result == QTOPIA_BAD_SOCKET ) | ||
216 | { | ||
217 | /* mark this socket as bad */ | ||
218 | |||
219 | close( qtopia_client_socket ); | ||
220 | |||
221 | qtopia_client_socket = QTOPIA_BAD_SOCKET; | ||
222 | |||
223 | if( !test ) | ||
224 | { | ||
225 | fprintf( gpoutfile, "error connecting to server !\n" ); | ||
226 | } | ||
227 | return 0; /* something went wrong */ | ||
228 | } | ||
229 | } | ||
230 | else | ||
231 | { | ||
232 | if( !test ) | ||
233 | { | ||
234 | fprintf( gpoutfile, "error creating socket !\n" ); | ||
235 | } | ||
236 | return 0; /* something went wrong */ | ||
237 | } | ||
238 | |||
239 | return 1; /* everything ist ok ! */ | ||
240 | } | ||
241 | |||
242 | static void CloseClient() | ||
243 | { | ||
244 | close( qtopia_client_socket ); | ||
245 | } | ||
246 | |||
247 | static int IsClientOk() | ||
248 | { | ||
249 | return qtopia_client_socket != QTOPIA_BAD_SOCKET; | ||
250 | } | ||
251 | |||
252 | static void SendDataToSocket( sLine ) | ||
253 | const char * sLine; | ||
254 | { | ||
255 | if( IsClientOk() ) | ||
256 | { | ||
257 | int send_count; | ||
258 | |||
259 | send_count = send( qtopia_client_socket, sLine, strlen( sLine ), 0 ); | ||
260 | |||
261 | if( send_count <= 0 ) | ||
262 | { | ||
263 | fprintf( gpoutfile, "error writing to socket str=%s!\n", sLine ); | ||
264 | } | ||
265 | /* | ||
266 | else | ||
267 | { | ||
268 | fprintf( gpoutfile, "wrote %d bytes\n", send_count ); | ||
269 | } | ||
270 | */ | ||
271 | } | ||
272 | else | ||
273 | { | ||
274 | /* for testing... */ | ||
275 | /*fprintf( gpoutfile, sLine );*/ | ||
276 | } | ||
277 | } | ||
278 | |||
279 | /* ************************************************** */ | ||
280 | |||
281 | enum QTOPIA_id { QTOPIA_PORT, QTOPIA_HOST, QTOPIA_OTHER }; | ||
282 | |||
283 | static struct gen_table QTOPIA_opts[] = | ||
284 | { | ||
285 | { "po$rt", QTOPIA_PORT }, | ||
286 | { "ho$st", QTOPIA_HOST }, | ||
287 | { NULL, QTOPIA_OTHER } | ||
288 | }; | ||
289 | |||
290 | TERM_PUBLIC void | ||
291 | QTOPIA_options() | ||
292 | { | ||
293 | /* this is not for the qtopia terminal ! */ | ||
294 | /*SendDataToSocket( "qtd options\n" );*/ | ||
295 | |||
296 | int x, y; | ||
297 | struct value a; | ||
298 | |||
299 | while (!END_OF_COMMAND) | ||
300 | { | ||
301 | switch(lookup_table(&QTOPIA_opts[0],c_token)) | ||
302 | { | ||
303 | case QTOPIA_PORT: | ||
304 | c_token++; | ||
305 | if (END_OF_COMMAND) | ||
306 | int_error(c_token, "expecting port number"); | ||
307 | qtopia_port_no = (int) real(const_express(&a)); | ||
308 | break; | ||
309 | case QTOPIA_HOST: | ||
310 | c_token++; | ||
311 | if (END_OF_COMMAND) | ||
312 | int_error(c_token, "expecting host name"); | ||
313 | if (isstring(c_token)) | ||
314 | quote_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); | ||
315 | else | ||
316 | copy_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); | ||
317 | c_token++; | ||
318 | break; | ||
319 | case QTOPIA_OTHER: | ||
320 | default: | ||
321 | break; | ||
322 | } | ||
323 | } | ||
324 | |||
325 | sprintf(term_options, "host=%s port=%d",qtopia_host_name,qtopia_port_no); | ||
326 | } | ||
327 | |||
328 | |||
329 | TERM_PUBLIC void | ||
330 | QTOPIA_init() | ||
331 | { | ||
332 | /* initialize lib (if necassary) */ | ||
333 | InitSockets(); | ||
334 | CheckForQtplot( 0 ); | ||
335 | OpenClient( 0 ); | ||
336 | |||
337 | SendDataToSocket( "qtd init\n" ); | ||
338 | } | ||
339 | |||
340 | |||
341 | TERM_PUBLIC void | ||
342 | QTOPIA_graphics() | ||
343 | { | ||
344 | SendDataToSocket( "qtd graphics\n" ); | ||
345 | } | ||
346 | |||
347 | TERM_PUBLIC void | ||
348 | QTOPIA_text() | ||
349 | { | ||
350 | SendDataToSocket( "qtd text\n" ); | ||
351 | } | ||
352 | |||
353 | |||
354 | TERM_PUBLIC void | ||
355 | QTOPIA_reset() | ||
356 | { | ||
357 | SendDataToSocket( "qtd reset\n" ); | ||
358 | |||
359 | /* give the qtplot a litle bit time to shutdown */ | ||
360 | MySleep(100); | ||
361 | |||
362 | CloseClient(); | ||
363 | ExitSockets(); | ||
364 | } | ||
365 | |||
366 | |||
367 | TERM_PUBLIC void | ||
368 | QTOPIA_linetype(linetype) | ||
369 | int linetype; | ||
370 | { | ||
371 | char sBuffer[QTOPIA_MAX_BUFFER]; | ||
372 | |||
373 | sprintf( sBuffer, "qtd linetype type=%d\n",linetype ); | ||
374 | |||
375 | SendDataToSocket( sBuffer ); | ||
376 | } | ||
377 | |||
378 | |||
379 | TERM_PUBLIC void | ||
380 | QTOPIA_move(x, y) | ||
381 | unsigned int x, y; | ||
382 | { | ||
383 | char sBuffer[QTOPIA_MAX_BUFFER]; | ||
384 | |||
385 | sprintf( sBuffer, "qtd move x=%d y=%d\n",x,y ); | ||
386 | |||
387 | SendDataToSocket( sBuffer ); | ||
388 | } | ||
389 | |||
390 | |||
391 | TERM_PUBLIC void | ||
392 | QTOPIA_point(x, y, point) | ||
393 | unsigned int x, y; | ||
394 | int point; | ||
395 | { | ||
396 | char sBuffer[QTOPIA_MAX_BUFFER]; | ||
397 | |||
398 | sprintf( sBuffer, "qtd point x=%d y=%d point=%d\n",x,y,point ); | ||
399 | |||
400 | SendDataToSocket( sBuffer ); | ||
401 | } | ||
402 | |||
403 | |||
404 | TERM_PUBLIC void | ||
405 | QTOPIA_vector(_x, _y) | ||
406 | unsigned int _x, _y; | ||
407 | { | ||
408 | char sBuffer[QTOPIA_MAX_BUFFER]; | ||
409 | |||
410 | sprintf( sBuffer, "qtd vector x=%d y=%d\n",_x,_y ); | ||
411 | |||
412 | SendDataToSocket( sBuffer ); | ||
413 | } | ||
414 | |||
415 | |||
416 | TERM_PUBLIC void | ||
417 | QTOPIA_put_text(x, y, str) | ||
418 | unsigned int x, y; | ||
419 | const char *str; | ||
420 | { | ||
421 | char sBuffer[QTOPIA_MAX_BUFFER]; | ||
422 | |||
423 | sprintf( sBuffer, "qtd put_text x=%d y=%d str=%s\n",x,y,str ); | ||
424 | |||
425 | SendDataToSocket( sBuffer ); | ||
426 | } | ||
427 | |||
428 | /* not suported yet ! */ | ||
429 | TERM_PUBLIC void | ||
430 | QTOPIA_arrow(sx, sy, ex, ey, head) | ||
431 | unsigned int sx, sy, ex, ey; | ||
432 | int head; /* ignored */ | ||
433 | { | ||
434 | char sBuffer[QTOPIA_MAX_BUFFER]; | ||
435 | |||
436 | sprintf( sBuffer, "qtd arrow sx=%d sy=%d ex=%d ey=%d head=%d\n",sx,sy,ex,ey,head ); | ||
437 | |||
438 | SendDataToSocket( sBuffer ); | ||
439 | } | ||
440 | |||
441 | |||
442 | #endif /* TERM_BODY */ | ||
443 | |||
444 | #ifdef TERM_TABLE | ||
445 | TERM_TABLE_START(qtopia_driver) | ||
446 | "qtopia", "qtopia or Qt", | ||
447 | QTOPIA_XMAX, QTOPIA_YMAX, QTOPIA_VCHAR, QTOPIA_HCHAR, | ||
448 | QTOPIA_VTIC, QTOPIA_HTIC, QTOPIA_options, QTOPIA_init, QTOPIA_reset, | ||
449 | QTOPIA_text, null_scale, QTOPIA_graphics, QTOPIA_move, QTOPIA_vector, | ||
450 | QTOPIA_linetype, QTOPIA_put_text, null_text_angle, | ||
451 | null_justify_text, QTOPIA_point, /*QTOPIA_arrow*/0, set_font_null, | ||
452 | 0, /* pointsize */ | ||
453 | TERM_CAN_MULTIPLOT, | ||
454 | NULL, NULL, NULL, NULL | ||
455 | #ifdef USE_MOUSE | ||
456 | , NULL, NULL, NULL, NULL, NULL | ||
457 | #endif | ||
458 | #ifdef PM3D | ||
459 | , NULL, NULL, NULL, NULL | ||
460 | #endif | ||
461 | TERM_TABLE_END(qtopia_driver) | ||
462 | |||
463 | #undef LAST_TERM | ||
464 | #define LAST_TERM qtopia_driver | ||
465 | |||
466 | #endif /* TERM_TABLE */ | ||
467 | |||
468 | #ifdef TERM_HELP | ||
469 | START_HELP(qtopia) | ||
470 | "1 qtopia", | ||
471 | "?commands set terminal qtopia", | ||
472 | "?set terminal qtopia", | ||
473 | "?set term qtopia", | ||
474 | "?terminal qtopia", | ||
475 | "?term qtopia", | ||
476 | "?qtopia", | ||
477 | " The `qtopia` terminal driver has no additional options.", | ||
478 | "", | ||
479 | " Syntax:", | ||
480 | " set terminal qtopia", | ||
481 | "" | ||
482 | END_HELP(qtopia) | ||
483 | #endif /* TERM_HELP */ | ||
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb new file mode 100644 index 000000000..3f694a054 --- /dev/null +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_4.6.5.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | require gnuplot.inc | ||
2 | |||
3 | SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${BP}.tar.gz;name=archive \ | ||
4 | http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \ | ||
5 | file://subdirs.patch \ | ||
6 | file://lua-loadlibs-configure-in-fix.patch \ | ||
7 | file://gnuplot.desktop \ | ||
8 | file://gnuplot.png \ | ||
9 | " | ||
10 | |||
11 | SRC_URI[archive.md5sum] = "9a476b21f74bd99c876f1509d731a0f9" | ||
12 | SRC_URI[archive.sha256sum] = "e550f030c7d04570e89c3d4e3f6e82296816508419c86ab46c4dd73156519a2d" | ||
13 | SRC_URI[qtplot.md5sum] = "0a481885a496092c77eb4017540b5cf6" | ||
14 | SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530c94f1ad5f4132" | ||
diff --git a/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch b/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch new file mode 100644 index 000000000..a384b05ce --- /dev/null +++ b/meta-oe/recipes-extended/hexedit/hexedit/0001-don-t-strip-when-installing.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From cc67246ca6839e5b3f6a286f10ed24c225b77a5e Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Thu, 4 Jul 2013 12:34:32 +0200 | ||
4 | Subject: [PATCH] don't strip when installing | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | --- | ||
13 | Makefile.in | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/Makefile.in b/Makefile.in | ||
17 | index 159463e..735cc72 100644 | ||
18 | --- a/Makefile.in | ||
19 | +++ b/Makefile.in | ||
20 | @@ -42,6 +42,6 @@ distclean: clean | ||
21 | |||
22 | install: $(PRODUCT) | ||
23 | $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) | ||
24 | - $(INSTALL) -s -m 755 $(PRODUCT) $(DESTDIR)$(bindir) | ||
25 | + $(INSTALL) -m 755 $(PRODUCT) $(DESTDIR)$(bindir) | ||
26 | $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1 | ||
27 | $(INSTALL) -m 644 $(PRODUCT).1 $(DESTDIR)$(mandir)/man1 | ||
28 | -- | ||
29 | 1.7.10.4 | ||
30 | |||
diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb new file mode 100644 index 000000000..c2f063038 --- /dev/null +++ b/meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "view and edit files in hexadecimal or in ASCII" | ||
2 | HOMEPAGE = "http://rigaux.org/hexedit.html" | ||
3 | SECTION = "console/utils" | ||
4 | LICENSE = "GPLv2+" | ||
5 | DEPENDS = "ncurses" | ||
6 | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
8 | |||
9 | SRC_URI = "http://rigaux.org/${BP}.src.tgz \ | ||
10 | file://0001-don-t-strip-when-installing.patch " | ||
11 | |||
12 | SRC_URI[md5sum] = "a5af1378d028512a9cad27a5ba3e15f9" | ||
13 | SRC_URI[sha256sum] = "6a126da30a77f5c0b08038aa7a881d910e3b65d13767fb54c58c983963b88dd7" | ||
14 | |||
15 | inherit autotools-brokensep | ||
16 | |||
17 | S = "${WORKDIR}/${PN}" | ||
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch new file mode 100644 index 000000000..31c005c60 --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Index: hplip-3.12.6/configure.in | ||
2 | =================================================================== | ||
3 | --- hplip-3.12.6.orig/configure.in 2014-07-16 20:03:51.310044196 +0000 | ||
4 | +++ hplip-3.12.6/configure.in 2014-07-18 07:53:31.589559192 +0000 | ||
5 | @@ -27,8 +27,7 @@ | ||
6 | |||
7 | #AC_PREREQ(2.59) | ||
8 | AC_INIT([HP Linux Imaging and Printing], [3.12.6], [3.12.6], [hplip]) | ||
9 | -#AM_INIT_AUTOMAKE([1.9 foreign]) | ||
10 | -AM_INIT_AUTOMAKE | ||
11 | +AM_INIT_AUTOMAKE([1.9 foreign]) | ||
12 | AC_DISABLE_STATIC | ||
13 | |||
14 | # Checks for programs. | ||
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch new file mode 100644 index 000000000..7df01aab3 --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/cups-1.6.patch | |||
@@ -0,0 +1,395 @@ | |||
1 | Imported from gentoo: | ||
2 | https://bugs.gentoo.org/show_bug.cgi?id=428672 | ||
3 | |||
4 | diff -Naur hplip-3.12.6_old/prnt/cupsext/cupsext.c hplip-3.12.6/prnt/cupsext/cupsext.c | ||
5 | --- hplip-3.12.6_old/prnt/cupsext/cupsext.c 2012-08-04 09:18:18.388330038 +0200 | ||
6 | +++ hplip-3.12.6/prnt/cupsext/cupsext.c 2012-08-04 09:18:27.855181327 +0200 | ||
7 | @@ -87,6 +87,46 @@ | ||
8 | #define PY_SSIZE_T_MIN INT_MIN | ||
9 | #endif | ||
10 | |||
11 | +#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) | ||
12 | +#define HAVE_CUPS_1_6 1 | ||
13 | +#endif | ||
14 | + | ||
15 | +#ifndef HAVE_CUPS_1_6 | ||
16 | +#define ippGetCount(attr) attr->num_values | ||
17 | +#define ippGetGroupTag(attr) attr->group_tag | ||
18 | +#define ippGetValueTag(attr) attr->value_tag | ||
19 | +#define ippGetName(attr) attr->name | ||
20 | +#define ippGetBoolean(attr, element) attr->values[element].boolean | ||
21 | +#define ippGetInteger(attr, element) attr->values[element].integer | ||
22 | +#define ippGetStatusCode(ipp) ipp->request.status.status_code | ||
23 | +#define ippGetString(attr, element, language) attr->values[element].string.text | ||
24 | + | ||
25 | +static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) | ||
26 | +{ | ||
27 | + if (!ipp) | ||
28 | + return (NULL); | ||
29 | + return (ipp->current = ipp->attrs); | ||
30 | +} | ||
31 | + | ||
32 | +static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) | ||
33 | +{ | ||
34 | + if (!ipp || !ipp->current) | ||
35 | + return (NULL); | ||
36 | + return (ipp->current = ipp->current->next); | ||
37 | +} | ||
38 | + | ||
39 | +static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) | ||
40 | +{ | ||
41 | + ipp->request.op.operation_id = op; | ||
42 | + return (1); | ||
43 | +} | ||
44 | + | ||
45 | +static int ippSetRequestId( ipp_t *ipp, int request_id ) | ||
46 | +{ | ||
47 | + ipp->request.any.request_id = request_id; | ||
48 | + return (1); | ||
49 | +} | ||
50 | +#endif | ||
51 | |||
52 | int g_num_options = 0; | ||
53 | cups_option_t * g_options; | ||
54 | @@ -333,8 +373,8 @@ | ||
55 | request = ippNew(); | ||
56 | language = cupsLangDefault(); | ||
57 | |||
58 | - request->request.op.operation_id = CUPS_GET_PRINTERS; | ||
59 | - request->request.any.request_id = 1; | ||
60 | + ippSetOperation( request, CUPS_GET_PRINTERS ); | ||
61 | + ippSetRequestId ( request, 1); | ||
62 | |||
63 | ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, | ||
64 | "attributes-charset", NULL, cupsLangEncoding( language ) ); | ||
65 | @@ -378,10 +418,10 @@ | ||
66 | ipp_pstate_t state; | ||
67 | int i = 0; | ||
68 | |||
69 | - for ( attr = response->attrs; attr != NULL; attr = attr->next ) | ||
70 | + for ( attr = ippFirstAttribute( response ); attr != NULL; attr = ippNextAttribute( response ) ) | ||
71 | { | ||
72 | - while ( attr != NULL && attr->group_tag != IPP_TAG_PRINTER ) | ||
73 | - attr = attr->next; | ||
74 | + while ( attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER ) | ||
75 | + attr = ippNextAttribute( response ); | ||
76 | |||
77 | if ( attr == NULL ) | ||
78 | break; | ||
79 | @@ -390,41 +430,41 @@ | ||
80 | state = IPP_PRINTER_IDLE; | ||
81 | accepting = 0; | ||
82 | |||
83 | - while ( attr != NULL && attr->group_tag == IPP_TAG_PRINTER ) | ||
84 | + while ( attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER ) | ||
85 | { | ||
86 | - if ( strcmp( attr->name, "printer-name" ) == 0 && | ||
87 | - attr->value_tag == IPP_TAG_NAME ) | ||
88 | - name = attr->values[ 0 ].string.text; | ||
89 | - | ||
90 | - else if ( strcmp( attr->name, "device-uri" ) == 0 && | ||
91 | - attr->value_tag == IPP_TAG_URI ) | ||
92 | - device_uri = attr->values[ 0 ].string.text; | ||
93 | - | ||
94 | - else if ( strcmp( attr->name, "printer-uri-supported" ) == 0 && | ||
95 | - attr->value_tag == IPP_TAG_URI ) | ||
96 | - printer_uri = attr->values[ 0 ].string.text; | ||
97 | - | ||
98 | - else if ( strcmp( attr->name, "printer-info" ) == 0 && | ||
99 | - attr->value_tag == IPP_TAG_TEXT ) | ||
100 | - info = attr->values[ 0 ].string.text; | ||
101 | - | ||
102 | - else if ( strcmp( attr->name, "printer-location" ) == 0 && | ||
103 | - attr->value_tag == IPP_TAG_TEXT ) | ||
104 | - location = attr->values[ 0 ].string.text; | ||
105 | - | ||
106 | - else if ( strcmp( attr->name, "printer-make-and-model" ) == 0 && | ||
107 | - attr->value_tag == IPP_TAG_TEXT ) | ||
108 | - make_model = attr->values[ 0 ].string.text; | ||
109 | - | ||
110 | - else if ( strcmp( attr->name, "printer-state" ) == 0 && | ||
111 | - attr->value_tag == IPP_TAG_ENUM ) | ||
112 | - state = ( ipp_pstate_t ) attr->values[ 0 ].integer; | ||
113 | - | ||
114 | - else if (!strcmp(attr->name, "printer-is-accepting-jobs") && | ||
115 | - attr->value_tag == IPP_TAG_BOOLEAN) | ||
116 | - accepting = attr->values[ 0 ].boolean; | ||
117 | + if ( strcmp( ippGetName( attr ), "printer-name" ) == 0 && | ||
118 | + ippGetValueTag( attr ) == IPP_TAG_NAME ) | ||
119 | + name = ippGetString( attr, 0, NULL ); | ||
120 | + | ||
121 | + else if ( strcmp( ippGetName( attr ), "device-uri" ) == 0 && | ||
122 | + ippGetValueTag( attr ) == IPP_TAG_URI ) | ||
123 | + device_uri = ippGetString( attr, 0, NULL ); | ||
124 | + | ||
125 | + else if ( strcmp( ippGetName( attr ), "printer-uri-supported" ) == 0 && | ||
126 | + ippGetValueTag( attr ) == IPP_TAG_URI ) | ||
127 | + printer_uri = ippGetString( attr, 0, NULL ); | ||
128 | + | ||
129 | + else if ( strcmp( ippGetName( attr ), "printer-info" ) == 0 && | ||
130 | + ippGetValueTag( attr ) == IPP_TAG_TEXT ) | ||
131 | + info = ippGetString( attr, 0, NULL ); | ||
132 | + | ||
133 | + else if ( strcmp( ippGetName( attr ), "printer-location" ) == 0 && | ||
134 | + ippGetValueTag( attr ) == IPP_TAG_TEXT ) | ||
135 | + location = ippGetString( attr, 0, NULL ); | ||
136 | + | ||
137 | + else if ( strcmp( ippGetName( attr ), "printer-make-and-model" ) == 0 && | ||
138 | + ippGetValueTag( attr ) == IPP_TAG_TEXT ) | ||
139 | + make_model = ippGetString( attr, 0, NULL ); | ||
140 | + | ||
141 | + else if ( strcmp( ippGetName( attr ), "printer-state" ) == 0 && | ||
142 | + ippGetValueTag( attr ) == IPP_TAG_ENUM ) | ||
143 | + state = ( ipp_pstate_t ) ippGetInteger( attr, 0 ); | ||
144 | + | ||
145 | + else if (!strcmp(ippGetName( attr ), "printer-is-accepting-jobs") && | ||
146 | + ippGetValueTag( attr ) == IPP_TAG_BOOLEAN) | ||
147 | + accepting = ippGetBoolean( attr, 0 ); | ||
148 | |||
149 | - attr = attr->next; | ||
150 | + attr = ippNextAttribute( response ); | ||
151 | } | ||
152 | |||
153 | if ( device_uri == NULL ) | ||
154 | @@ -522,8 +562,8 @@ | ||
155 | request = ippNew(); | ||
156 | language = cupsLangDefault(); | ||
157 | |||
158 | - request->request.op.operation_id = CUPS_ADD_PRINTER; | ||
159 | - request->request.any.request_id = 1; | ||
160 | + ippSetOperation( request, CUPS_ADD_PRINTER ); | ||
161 | + ippSetRequestId ( request, 1 ); | ||
162 | |||
163 | ippAddString( request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, | ||
164 | "attributes-charset", NULL, cupsLangEncoding( language ) ); | ||
165 | @@ -568,7 +608,7 @@ | ||
166 | } | ||
167 | else | ||
168 | { | ||
169 | - status = response->request.status.status_code; | ||
170 | + status = ippGetStatusCode( response ); | ||
171 | //ippDelete( response ); | ||
172 | r = 1; | ||
173 | } | ||
174 | @@ -631,8 +671,8 @@ | ||
175 | */ | ||
176 | request = ippNew(); | ||
177 | |||
178 | - request->request.op.operation_id = CUPS_DELETE_PRINTER; | ||
179 | - request->request.op.request_id = 1; | ||
180 | + ippSetOperation( request, CUPS_DELETE_PRINTER ); | ||
181 | + ippSetRequestId ( request, 1 ); | ||
182 | |||
183 | language = cupsLangDefault(); | ||
184 | |||
185 | @@ -650,7 +690,7 @@ | ||
186 | */ | ||
187 | response = cupsDoRequest( http, request, "/admin/" ); | ||
188 | |||
189 | - if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) | ||
190 | + if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) | ||
191 | { | ||
192 | r = 1; | ||
193 | } | ||
194 | @@ -721,8 +761,8 @@ | ||
195 | |||
196 | request = ippNew(); | ||
197 | |||
198 | - request->request.op.operation_id = CUPS_SET_DEFAULT; | ||
199 | - request->request.op.request_id = 1; | ||
200 | + ippSetOperation( request, CUPS_SET_DEFAULT ); | ||
201 | + ippSetRequestId ( request, 1 ); | ||
202 | |||
203 | language = cupsLangDefault(); | ||
204 | |||
205 | @@ -743,7 +783,7 @@ | ||
206 | |||
207 | response = cupsDoRequest( http, request, "/admin/" ); | ||
208 | |||
209 | - if ( ( response != NULL ) && ( response->request.status.status_code <= IPP_OK_CONFLICT ) ) | ||
210 | + if ( ( response != NULL ) && ( ippGetStatusCode( response ) <= IPP_OK_CONFLICT ) ) | ||
211 | { | ||
212 | r = 1; | ||
213 | } | ||
214 | @@ -797,8 +837,8 @@ | ||
215 | |||
216 | request = ippNew(); | ||
217 | |||
218 | - request->request.op.operation_id = op; | ||
219 | - request->request.op.request_id = 1; | ||
220 | + ippSetOperation( request, op ); | ||
221 | + ippSetRequestId ( request, 1 ); | ||
222 | |||
223 | language = cupsLangDefault(); | ||
224 | |||
225 | @@ -822,7 +862,7 @@ | ||
226 | |||
227 | response = cupsDoRequest(http, request, "/admin/"); | ||
228 | |||
229 | - if (( response != NULL ) && (response->request.status.status_code <= IPP_OK_CONFLICT)) | ||
230 | + if (( response != NULL ) && (ippGetStatusCode( response ) <= IPP_OK_CONFLICT)) | ||
231 | { | ||
232 | r = 1; | ||
233 | } | ||
234 | @@ -837,7 +877,7 @@ | ||
235 | if ( response != NULL ) | ||
236 | ippDelete( response ); | ||
237 | |||
238 | - return Py_BuildValue( "i", r );; | ||
239 | + return Py_BuildValue( "i", r ); | ||
240 | } | ||
241 | |||
242 | |||
243 | @@ -1116,8 +1156,8 @@ | ||
244 | |||
245 | request = ippNew(); | ||
246 | |||
247 | - request->request.op.operation_id = CUPS_GET_PPDS; | ||
248 | - request->request.op.request_id = 1; | ||
249 | + ippSetOperation( request, CUPS_GET_PPDS ); | ||
250 | + ippSetRequestId ( request, 1 ); | ||
251 | |||
252 | language = cupsLangDefault(); | ||
253 | |||
254 | @@ -1143,43 +1183,43 @@ | ||
255 | if ((response = cupsDoRequest(http, request, "/")) != NULL) | ||
256 | { | ||
257 | |||
258 | - for (attr = response->attrs; attr; attr = attr->next) | ||
259 | + for (attr = ippFirstAttribute( response ); attr; attr = ippNextAttribute( response )) | ||
260 | { | ||
261 | PyObject *dict; | ||
262 | char *ppdname = NULL; | ||
263 | |||
264 | - while (attr && attr->group_tag != IPP_TAG_PRINTER) | ||
265 | - attr = attr->next; | ||
266 | + while (attr && ippGetGroupTag( attr ) != IPP_TAG_PRINTER) | ||
267 | + attr = ippNextAttribute( response ); | ||
268 | |||
269 | if (!attr) | ||
270 | break; | ||
271 | |||
272 | dict = PyDict_New (); | ||
273 | |||
274 | - for (; attr && attr->group_tag == IPP_TAG_PRINTER; attr = attr->next) | ||
275 | + for (; attr && ippGetGroupTag( attr ) == IPP_TAG_PRINTER; attr = ippNextAttribute( response )) | ||
276 | { | ||
277 | PyObject *val = NULL; | ||
278 | |||
279 | - if (!strcmp (attr->name, "ppd-name") && attr->value_tag == IPP_TAG_NAME) | ||
280 | + if (!strcmp (ippGetName( attr ), "ppd-name") && ippGetValueTag( attr ) == IPP_TAG_NAME) | ||
281 | { | ||
282 | - ppdname = attr->values[0].string.text; | ||
283 | + ppdname = ippGetString( attr, 0, NULL ); | ||
284 | |||
285 | //sprintf( buf, "print '%s'", ppdname); | ||
286 | //PyRun_SimpleString( buf ); | ||
287 | } | ||
288 | |||
289 | - else if (attr->value_tag == IPP_TAG_TEXT || attr->value_tag == IPP_TAG_NAME || attr->value_tag == IPP_TAG_KEYWORD) | ||
290 | - //else if ((!strcmp (attr->name, "ppd-natural-language") && attr->value_tag == IPP_TAG_LANGUAGE) || | ||
291 | - // (!strcmp (attr->name, "ppd-make-and-model") && attr->value_tag == IPP_TAG_TEXT) || | ||
292 | - // (!strcmp (attr->name, "ppd-make") && attr->value_tag == IPP_TAG_TEXT) || | ||
293 | - // (!strcmp (attr->name, "ppd-device-id") && attr->value_tag == IPP_TAG_TEXT)) | ||
294 | + else if (ippGetValueTag( attr ) == IPP_TAG_TEXT || ippGetValueTag( attr ) == IPP_TAG_NAME || ippGetValueTag( attr ) == IPP_TAG_KEYWORD) | ||
295 | + //else if ((!strcmp (ippGetName( attr ), "ppd-natural-language") && ippGetValueTag( attr ) == IPP_TAG_LANGUAGE) || | ||
296 | + // (!strcmp (ippGetName( attr ), "ppd-make-and-model") && ippGetValueTag( attr ) == IPP_TAG_TEXT) || | ||
297 | + // (!strcmp (ippGetName( attr ), "ppd-make") && ippGetValueTag( attr ) == IPP_TAG_TEXT) || | ||
298 | + // (!strcmp (ippGetName( attr ), "ppd-device-id") && ippGetValueTag( attr ) == IPP_TAG_TEXT)) | ||
299 | { | ||
300 | - val = PyObj_from_UTF8(attr->values[0].string.text); | ||
301 | + val = PyObj_from_UTF8(ippGetString( attr, 0, NULL )); | ||
302 | } | ||
303 | |||
304 | if (val) | ||
305 | { | ||
306 | - PyDict_SetItemString (dict, attr->name, val); | ||
307 | + PyDict_SetItemString (dict, ippGetName( attr ), val); | ||
308 | Py_DECREF (val); | ||
309 | } | ||
310 | } | ||
311 | diff -Naur hplip-3.12.6_old/scan/sane/hpaio.c hplip-3.12.6/scan/sane/hpaio.c | ||
312 | --- hplip-3.12.6_old/scan/sane/hpaio.c 2012-08-04 09:18:21.458389913 +0200 | ||
313 | +++ hplip-3.12.6/scan/sane/hpaio.c 2012-08-04 09:18:27.875181720 +0200 | ||
314 | @@ -47,6 +47,43 @@ | ||
315 | #define DEBUG_DECLARE_ONLY | ||
316 | #include "sanei_debug.h" | ||
317 | |||
318 | +#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) | ||
319 | +#define HAVE_CUPS_1_6 1 | ||
320 | +#endif | ||
321 | + | ||
322 | +#ifndef HAVE_CUPS_1_6 | ||
323 | +#define ippGetGroupTag(attr) attr->group_tag | ||
324 | +#define ippGetValueTag(attr) attr->value_tag | ||
325 | +#define ippGetName(attr) attr->name | ||
326 | +#define ippGetString(attr, element, language) attr->values[element].string.text | ||
327 | + | ||
328 | +static ipp_attribute_t * ippFirstAttribute( ipp_t *ipp ) | ||
329 | +{ | ||
330 | + if (!ipp) | ||
331 | + return (NULL); | ||
332 | + return (ipp->current = ipp->attrs); | ||
333 | +} | ||
334 | + | ||
335 | +static ipp_attribute_t * ippNextAttribute( ipp_t *ipp ) | ||
336 | +{ | ||
337 | + if (!ipp || !ipp->current) | ||
338 | + return (NULL); | ||
339 | + return (ipp->current = ipp->current->next); | ||
340 | +} | ||
341 | + | ||
342 | +static int ippSetOperation( ipp_t *ipp, ipp_op_t op ) | ||
343 | +{ | ||
344 | + ipp->request.op.operation_id = op; | ||
345 | + return (1); | ||
346 | +} | ||
347 | + | ||
348 | +static int ippSetRequestId( ipp_t *ipp, int request_id ) | ||
349 | +{ | ||
350 | + ipp->request.any.request_id = request_id; | ||
351 | + return (1); | ||
352 | +} | ||
353 | +#endif | ||
354 | + | ||
355 | static SANE_Device **DeviceList = NULL; | ||
356 | |||
357 | static int AddDeviceList(char *uri, char *model, SANE_Device ***pd) | ||
358 | @@ -186,8 +223,8 @@ | ||
359 | /* Assemble the IPP request */ | ||
360 | request = ippNew(); | ||
361 | |||
362 | - request->request.op.operation_id = CUPS_GET_PRINTERS; | ||
363 | - request->request.any.request_id = 1; | ||
364 | + ippSetOperation( request, CUPS_GET_PRINTERS ); | ||
365 | + ippSetRequestId( request, 1 ); | ||
366 | |||
367 | ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8"); | ||
368 | ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, "en"); | ||
369 | @@ -197,20 +234,20 @@ | ||
370 | if ((response = cupsDoRequest(http, request, "/")) == NULL) | ||
371 | goto bugout; | ||
372 | |||
373 | - for (attr = response->attrs; attr != NULL; attr = attr->next) | ||
374 | + for (attr = ippFirstAttribute ( response ); attr != NULL; attr = ippNextAttribute( response )) | ||
375 | { | ||
376 | /* Skip leading attributes until we hit a printer. */ | ||
377 | - while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER) | ||
378 | - attr = attr->next; | ||
379 | + while (attr != NULL && ippGetGroupTag( attr ) != IPP_TAG_PRINTER) | ||
380 | + attr = ippNextAttribute( response ); | ||
381 | |||
382 | if (attr == NULL) | ||
383 | break; | ||
384 | |||
385 | - while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) | ||
386 | + while (attr != NULL && ippGetGroupTag( attr ) == IPP_TAG_PRINTER) | ||
387 | { | ||
388 | - if (strcmp(attr->name, "device-uri") == 0 && attr->value_tag == IPP_TAG_URI && AddCupsList(attr->values[0].string.text, printer) == 0) | ||
389 | + if (strcmp(ippGetName( attr ), "device-uri") == 0 && ippGetValueTag( attr ) == IPP_TAG_URI && AddCupsList(ippGetString( attr, 0, NULL ), printer) == 0) | ||
390 | cnt++; | ||
391 | - attr = attr->next; | ||
392 | + attr = ippNextAttribute( response ); | ||
393 | } | ||
394 | |||
395 | if (attr == NULL) | ||
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch new file mode 100644 index 000000000..b347f831c --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/fix-libusb-paths.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | diff -rupN hplip-3.12.6_orig/configure.in hplip-3.12.6/configure.in | ||
4 | --- hplip-3.12.6_orig/configure.in 2012-06-18 20:44:24.000000000 +1000 | ||
5 | +++ hplip-3.12.6/configure.in 2012-08-16 13:40:07.259927650 +1000 | ||
6 | @@ -524,6 +524,8 @@ if test "$hpijs_only_build" = "no"; then | ||
7 | AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) | ||
8 | else | ||
9 | AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) | ||
10 | + LIBUSBINCLUDEROOT?="/usr/include/" | ||
11 | + AC_ARG_VAR(LIBUSBINCLUDEROOT, [path to libusb-1.0 folder]) | ||
12 | AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) | ||
13 | fi | ||
14 | fi | ||
15 | diff -rupN hplip-3.12.6_orig/Makefile.am hplip-3.12.6/Makefile.am | ||
16 | --- hplip-3.12.6_orig/Makefile.am 2012-06-18 20:44:13.000000000 +1000 | ||
17 | +++ hplip-3.12.6/Makefile.am 2012-08-16 13:41:12.307932822 +1000 | ||
18 | @@ -72,7 +72,7 @@ libhpmud_la_SOURCES = io/hpmud/hpmud.c i | ||
19 | io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ | ||
20 | io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb_libusb01.c | ||
21 | else | ||
22 | -libhpmud_la_CFLAGS = -I/usr/include/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" | ||
23 | +libhpmud_la_CFLAGS = -I/$(LIBUSBINCLUDEROOT)/libusb-1.0 -DMUDNAME=\"$(MUDNAME)\" -DCONFDIR=\"$(hplip_confdir)\" | ||
24 | libhpmud_la_SOURCES = io/hpmud/hpmud.c io/hpmud/mlc.c io/hpmud/model.c io/hpmud/pml.c \ | ||
25 | io/hpmud/hpmud.h io/hpmud/hpmudi.h io/hpmud/list.h io/hpmud/mlc.h io/hpmud/pml.h io/hpmud/dot4.c \ | ||
26 | io/hpmud/dot4.h io/hpmud/jd.c io/hpmud/jd.h io/hpmud/pp.c io/hpmud/pp.h io/hpmud/musb.h io/hpmud/musb.c | ||
27 | @@ -286,7 +286,7 @@ hpmudext_la_LIBADD = libhpmud.la | ||
28 | if LIBUSB01_BUILD | ||
29 | hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) | ||
30 | else | ||
31 | -hpmudext_la_CFLAGS =-I/usr/include/libusb-1.0 -I$(PYTHONINCLUDEDIR) | ||
32 | +hpmudext_la_CFLAGS =-I$(LIBUSBINCLUDEROOT)/libusb-1.0 -I$(PYTHONINCLUDEDIR) | ||
33 | endif | ||
34 | |||
35 | # ui (qt3) | ||
diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch new file mode 100644 index 000000000..0e1b6c4ed --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/setup-add-sleep-after-cups-reset.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | --- hplip-3.11.10/setup.py.orig 2011-10-02 14:06:19.000000000 +1100 | ||
4 | +++ hplip-3.11.10/setup.py 2012-02-29 08:21:39.167999938 +1100 | ||
5 | @@ -573,6 +573,7 @@ | ||
6 | |||
7 | log.debug("Restarting CUPS...") | ||
8 | status, output = utils.run(restart_cups()) | ||
9 | + time.sleep(3) | ||
10 | log.debug("Restart CUPS returned: exit=%d output=%s" % (status, output)) | ||
11 | |||
12 | cups.setPasswordPrompt("You do not have permission to add a printer.") | ||
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb new file mode 100644 index 000000000..fc5ef18a0 --- /dev/null +++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | |||
@@ -0,0 +1,72 @@ | |||
1 | SUMMARY = "HP Linux Imaging and Printing" | ||
2 | LICENSE="GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=442bb3cbbeeb60643a87325718b8a8ee" | ||
4 | |||
5 | PR = "r1" | ||
6 | |||
7 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ | ||
8 | file://setup-add-sleep-after-cups-reset.patch \ | ||
9 | file://fix-libusb-paths.patch \ | ||
10 | file://cups-1.6.patch \ | ||
11 | file://configure.patch \ | ||
12 | " | ||
13 | |||
14 | DEPENDS += "cups python libusb" | ||
15 | |||
16 | inherit autotools-brokensep python-dir pythonnative pkgconfig | ||
17 | |||
18 | export BUILD_SYS | ||
19 | export HOST_SYS | ||
20 | export STAGING_INCDIR | ||
21 | export STAGING_LIBDIR | ||
22 | |||
23 | EXTRA_OECONF += "\ | ||
24 | LIBUSBINCLUDEROOT=${STAGING_INCDIR} \ | ||
25 | --disable-network-build \ | ||
26 | --disable-doc-build \ | ||
27 | --disable-pp-build \ | ||
28 | --disable-scan-build \ | ||
29 | --disable-gui-build \ | ||
30 | --disable-fax-build \ | ||
31 | --disable-policykit \ | ||
32 | --disable-qt4 \ | ||
33 | --disable-qt3 \ | ||
34 | --disable-dbus-build \ | ||
35 | --disable-foomatic-drv-install \ | ||
36 | --enable-foomatic-ppd-install \ | ||
37 | --enable-foomatic-rip-hplip-install \ | ||
38 | " | ||
39 | |||
40 | PACKAGES += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" | ||
41 | |||
42 | RDEPENDS_${PN} += " \ | ||
43 | python-syslog \ | ||
44 | python-pprint \ | ||
45 | python-compression \ | ||
46 | python-shell \ | ||
47 | python-xml \ | ||
48 | python-unixadmin \ | ||
49 | python-html \ | ||
50 | python-resource \ | ||
51 | python-terminal \ | ||
52 | python-subprocess\ | ||
53 | " | ||
54 | |||
55 | # need to snag the debug file or OE will fail on backend package | ||
56 | FILES_${PN}-dbg += "\ | ||
57 | ${libdir}/cups/backend/.debug \ | ||
58 | ${PYTHON_SITEPACKAGES_DIR}/.debug \ | ||
59 | ${libdir}/cups/filter/.debug " | ||
60 | |||
61 | FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" | ||
62 | FILES_${PN}-ppd = "${datadir}/ppd" | ||
63 | FILES_${PN}-cups = "${datadir}/cups" | ||
64 | FILES_${PN}-backend = "${libdir}/cups/backend" | ||
65 | FILES_${PN}-filter = "${libdir}/cups/filter" | ||
66 | FILES_${PN}-hal = "${datadir}/hal" | ||
67 | |||
68 | FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so" | ||
69 | |||
70 | SRC_URI[md5sum] = "5303938e8630775ea6fb383af85775e5" | ||
71 | SRC_URI[sha256sum] = "54578000792969adb583e75efeacb9c46ab69659ec7e9424de390613f3595775" | ||
72 | |||
diff --git a/meta-oe/recipes-extended/indent/indent_2.2.10.bb b/meta-oe/recipes-extended/indent/indent_2.2.10.bb new file mode 100644 index 000000000..dbd6b7b59 --- /dev/null +++ b/meta-oe/recipes-extended/indent/indent_2.2.10.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "A GNU program for formatting C code" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/indent/" | ||
3 | SECTION = "Applications/Text" | ||
4 | DESCRIPTION = "Indent is a GNU program for beautifying C code, so that \ | ||
5 | it is easier to read. Indent can also convert from one C writing style \ | ||
6 | to a different one. Indent understands correct C syntax and tries to handle \ | ||
7 | incorrect C syntax. \ | ||
8 | Install the indent package if you are developing applications in C and \ | ||
9 | you want a program to format your code." | ||
10 | LICENSE = "GPL-2.0" | ||
11 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
12 | DEPENDS = "virtual/gettext" | ||
13 | |||
14 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" | ||
15 | SRC_URI[md5sum] = "be35ea62705733859fbf8caf816d8959" | ||
16 | SRC_URI[sha256sum] = "8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639" | ||
17 | |||
18 | inherit autotools gettext | ||
19 | |||
20 | FILES_${PN}-doc += "/usr/doc/indent/indent.html" | ||
21 | |||
22 | BBCLASSEXTEND = "native" | ||
diff --git a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb new file mode 100644 index 000000000..d6292453f --- /dev/null +++ b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | SUMMARY = "Simple top-like I/O monitor" | ||
2 | DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \ | ||
3 | It watches I/O usage information output by the Linux kernel and displays \ | ||
4 | a table of current I/O usage by processes on the system." | ||
5 | HOMEPAGE = "http://guichaz.free.fr/iotop/" | ||
6 | |||
7 | PR = "r1" | ||
8 | |||
9 | LICENSE = "GPLv2+" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" | ||
11 | |||
12 | SRC_URI = "http://guichaz.free.fr/iotop/files/${BP}.tar.bz2" | ||
13 | SRC_URI[md5sum] = "cdd38b276cbf238676f5d2bcf098ba9c" | ||
14 | SRC_URI[sha256sum] = "46f3279fb1a7dfc129b5d00950c6e8389e4aedeb58880e848b88d686483df0b0" | ||
15 | |||
16 | inherit distutils | ||
17 | |||
18 | do_install_append() { | ||
19 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true | ||
20 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true | ||
21 | } | ||
22 | |||
23 | RDEPENDS_${PN} = "python-curses python-textutils \ | ||
24 | python-codecs python-ctypes python-pprint \ | ||
25 | python-shell" | ||
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.4.bb b/meta-oe/recipes-extended/jansson/jansson_2.4.bb new file mode 100644 index 000000000..c235729fe --- /dev/null +++ b/meta-oe/recipes-extended/jansson/jansson_2.4.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data" | ||
2 | HOMEPAGE = "http://www.digip.org/jansson/" | ||
3 | LICENSE = "MIT" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=6946b728e700de875e60ebb453cc3a20" | ||
5 | |||
6 | SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz" | ||
7 | |||
8 | SRC_URI[md5sum] = "c4629b89bf0432f3158c461e88fe0113" | ||
9 | SRC_URI[sha256sum] = "1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41" | ||
10 | |||
11 | inherit autotools pkgconfig | ||
12 | |||
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch new file mode 100644 index 000000000..061cc22f0 --- /dev/null +++ b/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Description: With automake 1.11.3, pkglib_PROGRAMS is not valid anymore, | ||
2 | so work around this by using my_execbin_PROGRAMS. | ||
3 | Author: Andreas Moog <amoog@ubuntu.com> | ||
4 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/934265 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Index: lcdproc-0.5.5/server/drivers/Makefile.am | ||
9 | =================================================================== | ||
10 | --- lcdproc-0.5.5.orig/server/drivers/Makefile.am 2012-02-26 14:04:37.000000000 +0100 | ||
11 | +++ lcdproc-0.5.5/server/drivers/Makefile.am 2012-02-26 14:13:17.764467350 +0100 | ||
12 | @@ -20,7 +20,8 @@ | ||
13 | |||
14 | ## Keep the lists sorted! | ||
15 | |||
16 | -pkglib_PROGRAMS = @DRIVERS@ | ||
17 | +my_execbindir = $(pkglibdir) | ||
18 | +my_execbin_PROGRAMS = @DRIVERS@ | ||
19 | EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans | ||
20 | noinst_LIBRARIES = libLCD.a libbignum.a | ||
21 | |||
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc new file mode 100644 index 000000000..d7e333af6 --- /dev/null +++ b/meta-oe/recipes-extended/lcdproc/lcdproc5.inc | |||
@@ -0,0 +1,81 @@ | |||
1 | DESCRIPTION = "LCDproc is a client/server suite to drive all kinds of LCD (-like) devices. The client \ | ||
2 | shipped with this package can be used to acquire various kinds of system stats." | ||
3 | SUMMARY = "Drivers for character-based LCD displays" | ||
4 | HOMEPAGE = "http://lcdproc.org" | ||
5 | SECTION = "utils" | ||
6 | LICENSE = "GPLv2+" | ||
7 | DEPENDS = "ncurses" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ | ||
10 | file://README;beginline=60;md5=637e042cdd3671ba00e78b58ede45d3b" | ||
11 | |||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${BP}.tar.gz" | ||
13 | |||
14 | inherit autotools update-rc.d | ||
15 | |||
16 | LCD_DRIVERS ?= "all" | ||
17 | LCD_DEFAULT_DRIVER ?= "curses" | ||
18 | |||
19 | PACKAGECONFIG ??= "usb" | ||
20 | PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0" | ||
21 | PACKAGECONFIG[ftdi] = "--enable-libftdi,--disable-libftdi,libftdi" | ||
22 | |||
23 | EXTRA_OECONF = "--enable-drivers=${LCD_DRIVERS}" | ||
24 | |||
25 | do_install () { | ||
26 | # binaries | ||
27 | install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd | ||
28 | install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc | ||
29 | |||
30 | # init scripts | ||
31 | install -d ${D}${sysconfdir}/init.d | ||
32 | # so far, not fixed :-( and now even uglier :-(( | ||
33 | cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd | ||
34 | chmod 0755 ${D}${sysconfdir}/init.d/lcdd | ||
35 | install -m 0755 scripts/init-lcdproc.debian ${D}${sysconfdir}/init.d/lcdproc | ||
36 | sed -i s'/--oknodo//' ${D}${sysconfdir}/init.d/lcdproc | ||
37 | |||
38 | # configuration files | ||
39 | install -m 0644 ${S}/LCDd.conf ${D}${sysconfdir}/LCDd.conf | ||
40 | sed -i 's!^DriverPath=.*!DriverPath=${libdir}/lcdproc/!' ${D}${sysconfdir}/LCDd.conf | ||
41 | sed -i 's!^Driver=.*!Driver=${LCD_DEFAULT_DRIVER}!' ${D}${sysconfdir}/LCDd.conf | ||
42 | install -m 0644 ${S}/clients/lcdproc/lcdproc.conf ${D}${sysconfdir}/lcdproc.conf | ||
43 | |||
44 | # driver library files | ||
45 | install -d ${D}${libdir}/lcdproc | ||
46 | for i in server/drivers/*.so; do | ||
47 | install -m 0644 $i ${D}${libdir}/lcdproc/ | ||
48 | done | ||
49 | } | ||
50 | |||
51 | PACKAGES =+ "lcdd" | ||
52 | |||
53 | RRECOMMENDS_${PN} = "lcdd" | ||
54 | |||
55 | FILES_lcdd = "${sysconfdir}/LCDd.conf \ | ||
56 | ${sbindir}/LCDd \ | ||
57 | ${sysconfdir}/init.d/lcdd" | ||
58 | |||
59 | CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" | ||
60 | CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf" | ||
61 | |||
62 | # Driver packages | ||
63 | |||
64 | # USB / no USB trickery | ||
65 | |||
66 | RCONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" | ||
67 | RCONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" | ||
68 | |||
69 | INITSCRIPT_PACKAGES = "lcdd lcdproc" | ||
70 | INITSCRIPT_NAME_lcdd = "lcdd" | ||
71 | INITSCRIPT_NAME_lcdproc = "lcdproc" | ||
72 | INITSCRIPT_PARAMS_lcdd = "defaults 70 21" | ||
73 | INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" | ||
74 | |||
75 | python populate_packages_prepend() { | ||
76 | plugindir = d.expand('${libdir}/lcdproc') | ||
77 | do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) | ||
78 | } | ||
79 | |||
80 | PACKAGES_DYNAMIC += "^lcdd-driver-.*" | ||
81 | |||
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb new file mode 100644 index 000000000..6d66af65f --- /dev/null +++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb | |||
@@ -0,0 +1,25 @@ | |||
1 | require lcdproc5.inc | ||
2 | |||
3 | SRC_URI += "file://automake-111-fix.patch" | ||
4 | |||
5 | SRC_URI[md5sum] = "c92d4529d36eeec6d9d6fd0a4aa3ec82" | ||
6 | SRC_URI[sha256sum] = "b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42" | ||
7 | |||
8 | PACKAGECONFIG ?= "" | ||
9 | PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," | ||
10 | PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid" | ||
11 | |||
12 | LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" | ||
13 | |||
14 | do_install_append () { | ||
15 | # binaries | ||
16 | install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc | ||
17 | |||
18 | # configuration files | ||
19 | install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf | ||
20 | } | ||
21 | |||
22 | PACKAGES =+ "lcdvc" | ||
23 | CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf" | ||
24 | FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc" | ||
25 | |||
diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch new file mode 100644 index 000000000..4b76dd0c3 --- /dev/null +++ b/meta-oe/recipes-extended/leveldb/leveldb/0001-Explicitly-disable-tcmalloc.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From d6daac04dab4b3acf4b88f16742d1b402cdc3d83 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 1 Oct 2014 18:54:04 +0200 | ||
4 | Subject: [PATCH] Explicitly disable tcmalloc | ||
5 | |||
6 | Without this change leveldb autodetects tcmalloc from sysroot and | ||
7 | sometimes became dependant on gperftools | ||
8 | |||
9 | Disable autodetection without TCMALLOC_ENABLED=true pased to make | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | build_detect_platform | 16 +++++++++------- | ||
15 | 1 file changed, 9 insertions(+), 7 deletions(-) | ||
16 | |||
17 | diff --git a/build_detect_platform b/build_detect_platform | ||
18 | index bb76c4f..a586364 100755 | ||
19 | --- a/build_detect_platform | ||
20 | +++ b/build_detect_platform | ||
21 | @@ -201,15 +201,17 @@ EOF | ||
22 | PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy" | ||
23 | fi | ||
24 | |||
25 | - # Test whether tcmalloc is available | ||
26 | - $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF | ||
27 | - int main() {} | ||
28 | + if [ "$TCMALLOC_ENABLED" = "true" ]; then | ||
29 | + # Test whether tcmalloc is available | ||
30 | + $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF | ||
31 | + int main() {} | ||
32 | EOF | ||
33 | - if [ "$?" = 0 ]; then | ||
34 | - PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" | ||
35 | - fi | ||
36 | + if [ "$?" = 0 ]; then | ||
37 | + PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc" | ||
38 | + fi | ||
39 | |||
40 | - rm -f $CXXOUTPUT 2>/dev/null | ||
41 | + rm -f $CXXOUTPUT 2>/dev/null | ||
42 | + fi | ||
43 | fi | ||
44 | |||
45 | PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS" | ||
46 | -- | ||
47 | 2.1.1 | ||
48 | |||
diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-extended/leveldb/leveldb_git.bb new file mode 100644 index 000000000..a6a302430 --- /dev/null +++ b/meta-oe/recipes-extended/leveldb/leveldb_git.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "LevelDB is a fast key-value storage library" | ||
2 | DESCRIPTION = "LevelDB is a fast key-value storage library that provides an ordered mapping from string keys to string values" | ||
3 | HOMEPAGE = "http://leveldb.googlecode.com" | ||
4 | LICENSE = "BSD-3-Clause" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" | ||
6 | |||
7 | SRCREV = "803d69203a62faf50f1b77897310a3a1fcae712b" | ||
8 | PV = "1.18+git${SRCPV}" | ||
9 | |||
10 | SRC_URI = "git://github.com/google/${BPN}.git \ | ||
11 | file://0001-Explicitly-disable-tcmalloc.patch \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | do_compile() { | ||
17 | # do not use oe_runmake. oe_runmake pass to make compilation arguments and override | ||
18 | # leveldb makefile variable CFLAGS and broke leveldb build. | ||
19 | CFLAGS="${CFLAGS}" make || die | ||
20 | } | ||
21 | |||
22 | do_install() { | ||
23 | install -d ${D}${libdir} | ||
24 | oe_libinstall -C ${S} -so libleveldb ${D}${libdir} | ||
25 | install -d ${D}${includedir}/leveldb | ||
26 | install -m 644 ${S}/include/leveldb/*.h ${D}${includedir}/leveldb/ | ||
27 | } | ||
diff --git a/meta-oe/recipes-extended/libcec/libcec_git.bb b/meta-oe/recipes-extended/libcec/libcec_git.bb new file mode 100644 index 000000000..0f2a64eda --- /dev/null +++ b/meta-oe/recipes-extended/libcec/libcec_git.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "USB CEC Adaptor communication Library" | ||
2 | HOMEPAGE = "http://libcec.pulse-eight.com/" | ||
3 | |||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5e8e16396992369f73f3d28875f846da" | ||
6 | |||
7 | DEPENDS = "udev lockdev" | ||
8 | |||
9 | PV = "2.1.4" | ||
10 | |||
11 | SRCREV = "81e38211724bc6e8bd7a60f484433053ed682635" | ||
12 | SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
17 | |||
18 | # cec-client and xbmc need the .so present to work :( | ||
19 | FILES_${PN} += "${libdir}/*.so" | ||
20 | INSANE_SKIP_${PN} = "dev-so" | ||
21 | |||
22 | # Adapter shows up as a CDC-ACM device | ||
23 | RRECOMMENDS_${PN} = "kernel-module-cdc-acm" | ||
diff --git a/meta-oe/recipes-extended/libconfig/libconfig_1.4.9.bb b/meta-oe/recipes-extended/libconfig/libconfig_1.4.9.bb new file mode 100644 index 000000000..22eecf8a7 --- /dev/null +++ b/meta-oe/recipes-extended/libconfig/libconfig_1.4.9.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | SUMMARY = "C/C++ Configuration File Library" | ||
2 | DESCRIPTION = "Library for manipulating structured configuration files" | ||
3 | HOMEPAGE = "http://www.hyperrealm.com/libconfig/" | ||
4 | SECTION = "libs" | ||
5 | |||
6 | LICENSE = "LGPLv2.1" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29" | ||
8 | |||
9 | SRC_URI = "http://www.hyperrealm.com/${BPN}/${BP}.tar.gz" | ||
10 | |||
11 | inherit autotools-brokensep pkgconfig | ||
12 | |||
13 | SRC_URI[md5sum] = "b6ee0ce2b3ef844bad7cac2803a90634" | ||
14 | SRC_URI[sha256sum] = "09c8979252e60193e2969e9b0e1cd597f7820087867989b2f0939ad164473041" | ||
diff --git a/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch new file mode 100644 index 000000000..cc3f5d478 --- /dev/null +++ b/meta-oe/recipes-extended/libdivecomputer/files/fix-ar.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | --- | ||
2 | configure.ac | 1 + | ||
3 | 1 file changed, 1 insertion(+) | ||
4 | |||
5 | --- git.orig/configure.ac | ||
6 | +++ git/configure.ac | ||
7 | @@ -24,10 +24,11 @@ LT_INIT([win32-dll]) | ||
8 | LT_PROG_RC | ||
9 | |||
10 | # Checks for programs. | ||
11 | AC_PROG_CC | ||
12 | AC_PROG_CC_C99 | ||
13 | +AM_PROG_AR | ||
14 | |||
15 | # Enable automake silent build rules. | ||
16 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) | ||
17 | |||
18 | # Checks for native Windows. | ||
diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb new file mode 100644 index 000000000..6c4f4a072 --- /dev/null +++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESCRIPTION = "Libdivecomputer is a cross-platform and open source library for communication with dive computers from various manufacturers." | ||
2 | HOMEPAGE = "http://www.divesoftware.org/libdc/" | ||
3 | |||
4 | LICENSE = "LGPLv2.1" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" | ||
6 | |||
7 | DEPENDS = "libusb1" | ||
8 | |||
9 | inherit autotools pkgconfig | ||
10 | |||
11 | PV = "0.4.2+gitr${SRCPV}" | ||
12 | |||
13 | SRCREV = "5f765f91430f16932d96b3777404420aa2dd4c7c" | ||
14 | SRC_URI = "git://git.libdivecomputer.org/libdivecomputer.git \ | ||
15 | file://fix-ar.patch \ | ||
16 | " | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | |||
diff --git a/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch new file mode 100644 index 000000000..f6ef6f4f8 --- /dev/null +++ b/meta-oe/recipes-extended/libimobiledevice/files/fix-parallel-make.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | From 335b25febd4c864ad0ac08479f5cd43fc21b7d73 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nikias Bassen | ||
3 | Date: Mon, 09 Jul 2012 21:17:15 +0000 | ||
4 | Subject: Fix building with parallel build makeopts | ||
5 | |||
6 | --- | ||
7 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
8 | index 0bad840..155994e 100644 | ||
9 | --- a/CMakeLists.txt | ||
10 | +++ b/CMakeLists.txt | ||
11 | @@ -57,6 +57,8 @@ ADD_SUBDIRECTORY( plutil ) | ||
12 | ADD_SUBDIRECTORY( include ) | ||
13 | ADD_SUBDIRECTORY( test ) | ||
14 | |||
15 | +ADD_DEPENDENCIES( plist libcnary ) | ||
16 | + | ||
17 | IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) | ||
18 | ADD_SUBDIRECTORY( swig ) | ||
19 | ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) | ||
20 | -- | ||
21 | cgit v0.9.0.2 | ||
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb new file mode 100644 index 000000000..6e8d69f60 --- /dev/null +++ b/meta-oe/recipes-extended/libimobiledevice/libplist_1.8.bb | |||
@@ -0,0 +1,22 @@ | |||
1 | SUMMARY = "A library to handle Apple Property List format whereas it's binary or XML" | ||
2 | |||
3 | LICENSE = "GPLv2 & LGPLv2.1" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07 \ | ||
5 | file://COPYING.LESSER;md5=6ab17b41640564434dda85c06b7124f7" | ||
6 | |||
7 | DEPENDS = "libxml2 glib-2.0 swig python" | ||
8 | |||
9 | inherit cmake pkgconfig | ||
10 | |||
11 | SRC_URI = "http://www.libimobiledevice.org/downloads/libplist-${PV}.tar.bz2 \ | ||
12 | file://fix-parallel-make.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "2a9e0258847d50f9760dc3ece25f4dc6" | ||
16 | SRC_URI[sha256sum] = "a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec" | ||
17 | |||
18 | PACKAGES =+ "${PN}-utils ${PN}++" | ||
19 | FILES_${PN} = "${libdir}/libplist${SOLIBS}" | ||
20 | FILES_${PN}++ = "${libdir}/libplist++${SOLIBS}" | ||
21 | FILES_${PN}-utils = "${bindir}/*" | ||
22 | |||
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch new file mode 100644 index 000000000..ea13e11d2 --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | --- liblockfile-1.05/./configure.in~configure | ||
7 | +++ liblockfile-1.05/./configure.in | ||
8 | @@ -1,4 +1,5 @@ | ||
9 | -AC_INIT(lockfile.c) | ||
10 | +AC_INIT | ||
11 | +AC_CONFIG_SRCDIR([lockfile.c]) | ||
12 | AC_CONFIG_HEADER(autoconf.h) | ||
13 | AC_REVISION($Revision: 1.0 $)dnl | ||
14 | |||
15 | @@ -111,7 +112,8 @@ | ||
16 | AC_SUBST(INSTALL_TARGETS) | ||
17 | AC_SUBST(nfslockdir) | ||
18 | |||
19 | -AC_OUTPUT(\ | ||
20 | +AC_CONFIG_FILES([\ | ||
21 | ./Makefile \ | ||
22 | ./maillock.h \ | ||
23 | -) | ||
24 | +]) | ||
25 | +AC_OUTPUT | ||
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch new file mode 100644 index 000000000..e3c4aaae5 --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/glibc-2.4.patch | |||
@@ -0,0 +1,70 @@ | |||
1 | The local function eaccess conflicts with a glibc function of the same name. | ||
2 | Rename the function so that this can be build under glibc 2.4, and older | ||
3 | revisions, without any problems. | ||
4 | |||
5 | --- liblockfile-1.06/dotlockfile.c 2006/07/10 03:17:40 1.1 | ||
6 | +++ liblockfile-1.06/dotlockfile.c 2006/07/10 03:18:26 | ||
7 | @@ -42,7 +42,7 @@ | ||
8 | extern int optind; | ||
9 | #endif | ||
10 | |||
11 | -extern int eaccess(char *, gid_t, struct stat *); | ||
12 | +extern int xeaccess(char *, gid_t, struct stat *); | ||
13 | |||
14 | /* | ||
15 | * Sleep for an amout of time while regulary checking if | ||
16 | @@ -252,14 +252,14 @@ | ||
17 | return L_ERROR; | ||
18 | } | ||
19 | gid = getgid(); | ||
20 | - if (eaccess(dir, gid, &st) < 0) { | ||
21 | + if (xeaccess(dir, gid, &st) < 0) { | ||
22 | if (errno == ENOENT) { | ||
23 | enoent: | ||
24 | if (!quiet) fprintf(stderr, | ||
25 | "dotlockfile: %s: no such directory\n", dir); | ||
26 | return L_TMPLOCK; | ||
27 | } | ||
28 | - if ((r = eaccess(dir, getegid(), &st) < 0) && errno == ENOENT) | ||
29 | + if ((r = xeaccess(dir, getegid(), &st) < 0) && errno == ENOENT) | ||
30 | goto enoent; | ||
31 | if (r < 0 || !ismaillock(lockfile, pwd->pw_name)) { | ||
32 | if (!quiet) fprintf(stderr, | ||
33 | @@ -272,7 +272,7 @@ | ||
34 | /* | ||
35 | * Now we should be able to chdir() to the lock directory. | ||
36 | * When we stat("."), it should be the same as at the | ||
37 | - * eaccess() check or someone played symlink() games on us. | ||
38 | + * xeaccess() check or someone played symlink() games on us. | ||
39 | */ | ||
40 | if (chdir(dir) < 0 || stat(".", &st2) < 0) { | ||
41 | if (!quiet) fprintf(stderr, | ||
42 | --- liblockfile-1.06/lockfile.c 2006/07/10 03:17:40 1.1 | ||
43 | +++ liblockfile-1.06/lockfile.c 2006/07/10 03:18:26 | ||
44 | @@ -54,7 +54,7 @@ | ||
45 | #ifdef LIB | ||
46 | static | ||
47 | #endif | ||
48 | -int eaccess(char *fn, gid_t gid, struct stat *st) | ||
49 | +int xeaccess(char *fn, gid_t gid, struct stat *st) | ||
50 | { | ||
51 | struct stat tmp; | ||
52 | uid_t uid = geteuid(); | ||
53 | @@ -96,7 +96,7 @@ | ||
54 | *p = 0; | ||
55 | else | ||
56 | strcpy(dir, "."); | ||
57 | - if (eaccess(dir, egid, NULL) >= 0) { | ||
58 | + if (xeaccess(dir, egid, NULL) >= 0) { | ||
59 | free(dir); | ||
60 | return 0; | ||
61 | } | ||
62 | @@ -111,7 +111,7 @@ | ||
63 | return 0; | ||
64 | mailgid = st.st_gid; | ||
65 | } | ||
66 | - ret = eaccess(dir, mailgid, NULL) >= 0; | ||
67 | + ret = xeaccess(dir, mailgid, NULL) >= 0; | ||
68 | free (dir); | ||
69 | return ret; | ||
70 | } | ||
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch new file mode 100644 index 000000000..a9319ff1e --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | --- liblockfile-1.05/Makefile.in~install | ||
7 | +++ liblockfile-1.05/Makefile.in | ||
8 | @@ -20,6 +20,7 @@ | ||
9 | includedir = @includedir@ | ||
10 | |||
11 | MAILGROUP = @MAILGROUP@ | ||
12 | +INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) | ||
13 | |||
14 | all: @TARGETS@ | ||
15 | install: @INSTALL_TARGETS@ | ||
16 | @@ -50,25 +51,27 @@ | ||
17 | $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o | ||
18 | |||
19 | install_static: static install_common | ||
20 | + install -d $(ROOT)$(libdir) | ||
21 | install -m 644 liblockfile.a $(ROOT)$(libdir) | ||
22 | |||
23 | install_shared: shared install_common | ||
24 | + install -d $(ROOT)$(libdir) | ||
25 | install -m 755 liblockfile.so \ | ||
26 | $(ROOT)$(libdir)/liblockfile.so.$(VER) | ||
27 | ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so | ||
28 | if test "$(ROOT)" = ""; then @LDCONFIG@; fi | ||
29 | |||
30 | install_common: | ||
31 | + install -d $(ROOT)$(includedir) | ||
32 | install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) | ||
33 | - if [ "$(MAILGROUP)" != "" ]; then\ | ||
34 | - install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\ | ||
35 | - else \ | ||
36 | - install -g root -m 755 dotlockfile $(ROOT)$(bindir); \ | ||
37 | - fi | ||
38 | + install -d $(ROOT)$(bindir) | ||
39 | + install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) | ||
40 | + install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 | ||
41 | install -m 644 *.1 $(ROOT)$(mandir)/man1 | ||
42 | install -m 644 *.3 $(ROOT)$(mandir)/man3 | ||
43 | |||
44 | install_nfslib: nfslib | ||
45 | + install -d $(ROOT)$(nfslockdir) | ||
46 | install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) | ||
47 | if test "$(ROOT)" = ""; then @LDCONFIG@; fi | ||
48 | |||
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch new file mode 100644 index 000000000..eb1d1478b --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | --- liblockfile-1.05/Makefile.in~ldflags | ||
7 | +++ liblockfile-1.05/Makefile.in | ||
8 | @@ -34,11 +34,11 @@ | ||
9 | |||
10 | liblockfile.so: liblockfile.a | ||
11 | $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ | ||
12 | - -o liblockfile.so lockfile.o -lc | ||
13 | + -o liblockfile.so lockfile.o $(LDFLAGS) -lc | ||
14 | |||
15 | nfslock.so.$(VER): nfslock.o | ||
16 | $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ | ||
17 | - -o nfslock.so.$(NVER) nfslock.o | ||
18 | + -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) | ||
19 | |||
20 | dotlockfile: dotlockfile.o xlockfile.o | ||
21 | $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o | ||
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch new file mode 100644 index 000000000..ffd7a40fa --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Upstream-Status: Inappropriate [no upstream] | ||
2 | |||
3 | * nfslib should use NVER instead of VER | ||
4 | * install the missing soname library | ||
5 | |||
6 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
7 | --- | ||
8 | Makefile.in | 9 ++++++--- | ||
9 | 1 files changed, 5 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/Makefile.in b/Makefile.in | ||
12 | index 836ca9b..a589fb8 100644 | ||
13 | --- a/Makefile.in | ||
14 | +++ b/Makefile.in | ||
15 | @@ -27,7 +27,7 @@ install: @INSTALL_TARGETS@ | ||
16 | |||
17 | static: liblockfile.a dotlockfile | ||
18 | shared: liblockfile.so dotlockfile | ||
19 | -nfslib: nfslock.so.$(VER) | ||
20 | +nfslib: nfslock.so.$(NVER) | ||
21 | |||
22 | liblockfile.a: lockfile.o | ||
23 | $(AR) rv liblockfile.a lockfile.o | ||
24 | @@ -36,7 +36,7 @@ liblockfile.so: liblockfile.a | ||
25 | $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ | ||
26 | -o liblockfile.so lockfile.o $(LDFLAGS) -lc | ||
27 | |||
28 | -nfslock.so.$(VER): nfslock.o | ||
29 | +nfslock.so.$(NVER): nfslock.o | ||
30 | $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ | ||
31 | -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) | ||
32 | |||
33 | @@ -59,6 +59,7 @@ install_shared: shared install_common | ||
34 | install -m 755 liblockfile.so \ | ||
35 | $(ROOT)$(libdir)/liblockfile.so.$(VER) | ||
36 | ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so | ||
37 | + ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.1 | ||
38 | if test "$(ROOT)" = ""; then @LDCONFIG@; fi | ||
39 | |||
40 | install_common: | ||
41 | @@ -72,7 +73,9 @@ install_common: | ||
42 | |||
43 | install_nfslib: nfslib | ||
44 | install -d $(ROOT)$(nfslockdir) | ||
45 | - install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) | ||
46 | + install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir) | ||
47 | + ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so | ||
48 | + ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so.0 | ||
49 | if test "$(ROOT)" = ""; then @LDCONFIG@; fi | ||
50 | |||
51 | clean: | ||
52 | -- | ||
53 | 1.7.9.5 | ||
54 | |||
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb new file mode 100644 index 000000000..38e1915e4 --- /dev/null +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.09.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "File locking library" | ||
2 | SECTION = "libs" | ||
3 | LICENSE = "LGPLv2+ & GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=ac284a60d48eaa4bc811cddc377fa341" | ||
5 | |||
6 | SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz \ | ||
7 | file://install.patch \ | ||
8 | file://configure.patch \ | ||
9 | file://ldflags.patch \ | ||
10 | file://liblockfile-fix-nfslib-and-soname.patch \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[md5sum] = "2aa269e4405ee8235ff17d1b357c6ae8" | ||
14 | SRC_URI[sha256sum] = "16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f" | ||
15 | |||
16 | inherit autotools-brokensep | ||
17 | |||
18 | # set default mailgroup to mail | ||
19 | # --with-libnfslock specify where to install nfslock.so.NVER | ||
20 | EXTRA_OECONF = "--enable-shared \ | ||
21 | --with-mailgroup=mail \ | ||
22 | --with-libnfslock=${libdir} \ | ||
23 | " | ||
24 | |||
25 | # Makefile using ROOT not DESTDIR | ||
26 | EXTRA_OEMAKE += "ROOT=${D}" | ||
27 | |||
28 | FILES_${PN} += "${libdir}/nfslock.so.*" | ||
29 | FILES_${PN}-dev += "${libdir}/nfslock.so" | ||
diff --git a/meta-oe/recipes-extended/liblognorm/liblognorm.inc b/meta-oe/recipes-extended/liblognorm/liblognorm.inc new file mode 100644 index 000000000..dc8abb91f --- /dev/null +++ b/meta-oe/recipes-extended/liblognorm/liblognorm.inc | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "Fast samples-based log normalization library" | ||
2 | DESCRIPTION = "Briefly described, liblognorm is a tool to normalize log data." | ||
3 | |||
4 | HOMEPAGE = "http://www.liblognorm.com" | ||
5 | SECTION = "base" | ||
6 | |||
7 | LICENSE = "LGPL-2.1+" | ||
8 | |||
9 | SRC_URI = "http://www.liblognorm.com/files/download/${BPN}-${PV}.tar.gz\ | ||
10 | " | ||
11 | |||
12 | inherit autotools pkgconfig | ||
13 | |||
14 | DEPENDS += "libee libestr json-c" | ||
15 | |||
16 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," | ||
17 | PACKAGECONFIG[docs] = "--enable-docs,--disable-docs,sphinx," | ||
diff --git a/meta-oe/recipes-extended/liblognorm/liblognorm_1.0.1.bb b/meta-oe/recipes-extended/liblognorm/liblognorm_1.0.1.bb new file mode 100644 index 000000000..5d89e3540 --- /dev/null +++ b/meta-oe/recipes-extended/liblognorm/liblognorm_1.0.1.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require ${BPN}.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "7b9a826542af9686127110deab09d7a1" | ||
4 | SRC_URI[sha256sum] = "1f6cdfd901a8f6a97a3cb74bc6107c6746b3e9381f7889e4cd866a488e0c59a5" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=ca016db57e008528dace002188c73dad" | ||
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.5.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.5.bb new file mode 100644 index 000000000..19ca24c9b --- /dev/null +++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.5.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "A Modbus library" | ||
2 | DESCRIPTION = "libmodbus is a C library designed to provide a fast and robust \ | ||
3 | implementation of the Modbus protocol. It runs on Linux, Mac OS X, FreeBSD, \ | ||
4 | QNX and Windows." | ||
5 | HOMEPAGE = "http://www.libmodbus.org/" | ||
6 | SECTION = "libs" | ||
7 | |||
8 | LICENSE = "LGPLv2.1+" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c" | ||
10 | |||
11 | SRC_URI = "http://libmodbus.org/site_media/build/${BP}.tar.gz" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||
15 | SRC_URI[md5sum] = "18860375a7aa0ca9cba7d6ece54ab666" | ||
16 | SRC_URI[sha256sum] = "19aad5d55fa315602d6e836a858a3802f1608f9d824afba05fa12a58a1b1e656" | ||
diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb new file mode 100644 index 000000000..0142ce746 --- /dev/null +++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "Libuio - helper library for UIO subsystem" | ||
2 | SECTION = "base" | ||
3 | LICENSE = "GPL-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
5 | |||
6 | SRC_URI = "git://git.code.sf.net/p/libuio/code" | ||
7 | |||
8 | inherit autotools | ||
9 | |||
10 | SRCREV = "ed4f07ea147ac403c28105ab44d01bbf524d36f9" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | PACKAGES += "${PN}-tools" | ||
15 | |||
16 | FILES_${PN} = "${libdir}" | ||
17 | FILES_${PN}-tools = "${bindir}" | ||
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch b/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch new file mode 100644 index 000000000..0f133e2e7 --- /dev/null +++ b/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch | |||
@@ -0,0 +1,67 @@ | |||
1 | From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 6 Aug 2014 14:53:03 +0200 | ||
4 | Subject: [PATCH] configure: use pkg-config for freetype | ||
5 | |||
6 | Upstream-status: Pending | ||
7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
8 | --- | ||
9 | configure.ac | 37 ++++++++----------------------------- | ||
10 | 1 file changed, 8 insertions(+), 29 deletions(-) | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 3cfe974..0055a8c 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[ --with-freetype=DIR use freetype2 in DIR],[ | ||
17 | fi | ||
18 | ]) | ||
19 | |||
20 | -if [ test -n "$FREETYPE_DIR" ]; then | ||
21 | - AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH]) | ||
22 | -else | ||
23 | - AC_PATH_PROG(FREETYPE_CONFIG,freetype-config) | ||
24 | -fi | ||
25 | - | ||
26 | -if [ test -n "$FREETYPE_CONFIG" ]; then | ||
27 | - if [ test -n "$FREETYPE_DIR" ]; then | ||
28 | - freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include" | ||
29 | - freetype_libs=`$FREETYPE_CONFIG --libs` | ||
30 | - else | ||
31 | - freetype_cflags=`$FREETYPE_CONFIG --cflags` | ||
32 | - freetype_libs=`$FREETYPE_CONFIG --libs` | ||
33 | - fi | ||
34 | -else | ||
35 | - if [ test -n "$FREETYPE_DIR" ]; then | ||
36 | - freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include" | ||
37 | - freetype_libs="-L$FREETYPE_DIR/lib -lfreetype" | ||
38 | - else | ||
39 | - freetype_cflags="" | ||
40 | - freetype_libs="-lfreetype" | ||
41 | - fi | ||
42 | -fi | ||
43 | - | ||
44 | -CPPFLAGS="$freetype_cflags $CPPFLAGS" | ||
45 | -LDFLAGS="$LDFLAGS $freetype_libs" | ||
46 | +PKG_CHECK_MODULES(FREETYPE2, freetype2, | ||
47 | + CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" | ||
48 | + LDFLAGS="$LDFLAGS $FREETYPE2_LIBS", | ||
49 | + AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) | ||
50 | +) | ||
51 | |||
52 | AC_CHECK_LIB(freetype,FT_Init_FreeType,[ | ||
53 | - WMF_FT_LDFLAGS="$freetype_libs" | ||
54 | + WMF_FT_LDFLAGS="$FREETYPE2_LIBS" | ||
55 | ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) | ||
56 | ]) | ||
57 | AC_CHECK_HEADER(ft2build.h,[ | ||
58 | - WMF_FT_CFLAGS="$freetype_cflags" | ||
59 | - WMF_FT_CONFIG_CFLAGS="$freetype_cflags" | ||
60 | + WMF_FT_CFLAGS="$FREETYPE2_CFLAGS" | ||
61 | + WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS" | ||
62 | ],[ AC_MSG_ERROR([* * * freetype(2) is required * * *]) | ||
63 | ]) | ||
64 | |||
65 | -- | ||
66 | 1.9.0 | ||
67 | |||
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch new file mode 100644 index 000000000..50d915c01 --- /dev/null +++ b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-intoverflow.patch?view=log | ||
2 | |||
3 | CVE-2006-3376 libwmf integer overflow | ||
4 | |||
5 | --- libwmf-0.2.8.4.orig/src/player.c 2002-12-10 19:30:26.000000000 +0000 | ||
6 | +++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100 | ||
7 | @@ -42,6 +42,7 @@ | ||
8 | #include "player/defaults.h" /* Provides: default settings */ | ||
9 | #include "player/record.h" /* Provides: parameter mechanism */ | ||
10 | #include "player/meta.h" /* Provides: record interpreters */ | ||
11 | +#include <stdint.h> | ||
12 | |||
13 | /** | ||
14 | * @internal | ||
15 | @@ -132,8 +134,14 @@ | ||
16 | } | ||
17 | } | ||
18 | |||
19 | -/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); | ||
20 | - */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); | ||
21 | + if (MAX_REC_SIZE(API) > UINT32_MAX / 2) | ||
22 | + { | ||
23 | + API->err = wmf_E_InsMem; | ||
24 | + WMF_DEBUG (API,"bailing..."); | ||
25 | + return (API->err); | ||
26 | + } | ||
27 | + | ||
28 | + P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); | ||
29 | |||
30 | if (ERR (API)) | ||
31 | { WMF_DEBUG (API,"bailing..."); | ||
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch new file mode 100644 index 000000000..4d2d28564 --- /dev/null +++ b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | |||
2 | http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-useafterfree.patch?view=log | ||
3 | Resolves: CVE-2009-1364 | ||
4 | |||
5 | --- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list 2009-04-24 04:06:44.000000000 -0400 | ||
6 | +++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 2009-04-24 04:08:30.000000000 -0400 | ||
7 | @@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe | ||
8 | { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); | ||
9 | if (more == 0) return; | ||
10 | im->clip->max += 8; | ||
11 | + im->clip->list = more; | ||
12 | } | ||
13 | im->clip->list[im->clip->count] = (*rect); | ||
14 | im->clip->count++; | ||
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb new file mode 100644 index 000000000..11e2ba180 --- /dev/null +++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | SUMMARY = "Library for converting WMF files" | ||
2 | HOMEPAGE = "http://wvware.sourceforge.net/libwmf.html" | ||
3 | SECTION = "libs" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
7 | |||
8 | PR = "r3" | ||
9 | |||
10 | DEPENDS_virtclass-native = "freetype-native libpng-native jpeg-native" | ||
11 | DEPENDS = "freetype libpng jpeg expat gtk+" | ||
12 | |||
13 | BBCLASSEXTEND = "native" | ||
14 | |||
15 | inherit autotools pkgconfig | ||
16 | |||
17 | SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \ | ||
18 | file://libwmf-0.2.8.4-intoverflow.patch \ | ||
19 | file://libwmf-0.2.8.4-useafterfree.patch \ | ||
20 | file://0001-configure-use-pkg-config-for-freetype.patch \ | ||
21 | " | ||
22 | |||
23 | SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" | ||
24 | SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" | ||
25 | |||
26 | FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug" | ||
27 | FILES_${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la" | ||
28 | FILES_${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a" | ||
29 | FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/loaders/*.so" | ||
30 | |||
diff --git a/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch b/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch new file mode 100644 index 000000000..3a4c4f4c2 --- /dev/null +++ b/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | --- a/configure.ac 2014-08-22 12:22:54.290884351 +0200 | ||
2 | +++ b/configure.ac 2014-08-22 12:23:15.822306295 +0200 | ||
3 | @@ -42,18 +42,6 @@ | ||
4 | ;; | ||
5 | esac | ||
6 | |||
7 | - | ||
8 | -# Bring additional directories where things might be found into our | ||
9 | -# search path. I don't know why autoconf doesn't do this by default | ||
10 | -if test x"${mingw}" == "xno" ; then | ||
11 | - for spfx in /usr/local /opt/local /sw ; do | ||
12 | - echo checking ${spfx}/include | ||
13 | - if test -d ${spfx}/include; then | ||
14 | - CPPFLAGS="-I${spfx}/include $CPPFLAGS" | ||
15 | - LDFLAGS="-L${spfx}/lib $LDFLAGS" | ||
16 | - fi | ||
17 | - done | ||
18 | -fi | ||
19 | # | ||
20 | # | ||
21 | ################################################################ | ||
22 | @@ -71,7 +59,7 @@ | ||
23 | |||
24 | if test $mingw = "no" ; then | ||
25 | # add the warnings we don't want to do on mingw | ||
26 | - $WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes -Weffc++" | ||
27 | + WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes -Weffc++" | ||
28 | fi | ||
29 | |||
30 | for option in $WARNINGS_TO_TEST | ||
31 | @@ -105,7 +93,7 @@ | ||
32 | |||
33 | if test $mingw = "no" ; then | ||
34 | # add the warnings we don't want to do on mingw | ||
35 | - $WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++" | ||
36 | + WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++" | ||
37 | fi | ||
38 | |||
39 | for option in $WARNINGS_TO_TEST | ||
diff --git a/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb b/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb new file mode 100644 index 000000000..960e00f61 --- /dev/null +++ b/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "md5deep and hashdeep to compute and audit hashsets of amounts of files." | ||
2 | DESCRIPTION = "md5deep is a set of programs to compute MD5, SHA-1, SHA-256, Tiger, or Whirlpool message digests on an arbitrary number of files. This package also includes hashdeep which is also able to audit hashsets." | ||
3 | AUTHOR = "Jesse Kornblum, Simson L. Garfinkel" | ||
4 | HOMEPAGE = "http://md5deep.sourceforge.net" | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=9190f660105b9a56cdb272309bfd5491" | ||
7 | # Release 4.4 | ||
8 | SRCREV = "cd2ed7416685a5e83eb10bb659d6e9bec01244ae" | ||
9 | |||
10 | SRC_URI = "git://github.com/jessek/hashdeep.git \ | ||
11 | file://wrong-variable-expansion.patch \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit autotools | ||
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff new file mode 100644 index 000000000..fcc52c1f4 --- /dev/null +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc43x.diff | |||
@@ -0,0 +1,63 @@ | |||
1 | --- /tmp/mathVariantAux.cc 2008-07-13 15:56:56.000000000 +0200 | ||
2 | +++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-13 15:57:46.893198000 +0200 | ||
3 | @@ -20,6 +20,8 @@ | ||
4 | |||
5 | #include <cassert> | ||
6 | |||
7 | +#include <string.h> | ||
8 | + | ||
9 | #include "mathVariantAux.hh" | ||
10 | |||
11 | static MathVariantAttributes vattr[] = { | ||
12 | --- /tmp/T1_FontDataBase.cc 2008-07-13 16:25:24.000000000 +0200 | ||
13 | +++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-13 16:25:47.123198000 +0200 | ||
14 | @@ -20,6 +20,7 @@ | ||
15 | #include <config.h> | ||
16 | #include <map> | ||
17 | #include <string> | ||
18 | +#include <string.h> | ||
19 | #include <stdlib.h> | ||
20 | #include <iostream> | ||
21 | #include <list> | ||
22 | --- /tmp/SMS.cc 2008-07-13 16:27:23.000000000 +0200 | ||
23 | +++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-13 16:27:41.543198000 +0200 | ||
24 | @@ -19,6 +19,7 @@ | ||
25 | #include <config.h> | ||
26 | |||
27 | #include <sstream> | ||
28 | +#include <string.h> | ||
29 | #include "defs.h" | ||
30 | #include "AbstractLogger.hh" | ||
31 | #include "ValueConversion.hh" | ||
32 | --- /tmp/main.cc 2008-07-13 16:29:11.000000000 +0200 | ||
33 | +++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-13 16:29:28.813198000 +0200 | ||
34 | @@ -20,7 +20,7 @@ | ||
35 | |||
36 | #include <cassert> | ||
37 | #include <fstream> | ||
38 | - | ||
39 | +#include <string.h> | ||
40 | #include <popt.h> | ||
41 | |||
42 | // needed for old versions of GCC, must come before String.hh! | ||
43 | --- /tmp/main.cc 2008-07-13 16:30:11.000000000 +0200 | ||
44 | +++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-13 16:30:33.183198000 +0200 | ||
45 | @@ -20,7 +20,7 @@ | ||
46 | |||
47 | #include <cassert> | ||
48 | #include <fstream> | ||
49 | - | ||
50 | +#include <string.h> | ||
51 | #include <popt.h> | ||
52 | |||
53 | // needed for old versions of GCC, must come before String.hh! | ||
54 | --- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc 2007-08-17 12:02:45.000000000 +0200 | ||
55 | +++ gtkmathview-0.8.0/src/common/AbstractLogger.cc 2010-02-01 10:19:46.000000000 +0100 | ||
56 | @@ -19,6 +19,7 @@ | ||
57 | #include <config.h> | ||
58 | |||
59 | #include <stdarg.h> | ||
60 | +#include <stdio.h> | ||
61 | |||
62 | #include "AbstractLogger.hh" | ||
63 | |||
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff new file mode 100644 index 000000000..11b726004 --- /dev/null +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/mathview-gcc47x.diff | |||
@@ -0,0 +1,48 @@ | |||
1 | ../../../src/frontend/common/TemplateBuilder.hh:50:113: warning: 'linkerAssoc' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive] | ||
2 | ../../../src/frontend/common/TemplateBuilder.hh:50:113: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup | ||
3 | ../../../src/frontend/common/TemplateBuilder.hh:50:113: note: use 'this->linkerAssoc' instead | ||
4 | ../../../src/frontend/common/TemplateBuilder.hh:54:111: error: redeclaration of 'SmartPtr<BoxMLDecorElement> elem' | ||
5 | ../../../src/frontend/common/TemplateBuilder.hh:50:49: error: 'SmartPtr<BoxMLDecorElement> elem' previously declared here | ||
6 | ../../../src/frontend/common/TemplateBuilder.hh:55:2: warning: 'linkerAdd' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive] | ||
7 | ../../../src/frontend/common/TemplateBuilder.hh:55:2: note: declarations in dependent base 'custom_reader_Builder' are not found by unqualified lookup | ||
8 | ../../../src/frontend/common/TemplateBuilder.hh:55:2: note: use 'this->linkerAdd' instead | ||
9 | |||
10 | --- gtkmathview-0.8.0.orig/src/frontend/common/TemplateBuilder.hh 2007-08-17 12:02:34.000000000 +0200 | ||
11 | +++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh 2012-04-30 11:45:07.000000000 +0200 | ||
12 | @@ -47,12 +47,13 @@ | ||
13 | SmartPtr<typename ElementBuilder::type> | ||
14 | getElement(const typename Model::Element& el) const | ||
15 | { | ||
16 | - if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el))) | ||
17 | + SmartPtr<typename ElementBuilder::type> elem = NULL; | ||
18 | + if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el))) | ||
19 | return elem; | ||
20 | else | ||
21 | { | ||
22 | - SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); | ||
23 | - linkerAdd(el, elem); | ||
24 | + elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); | ||
25 | + this->linkerAdd(el, elem); | ||
26 | return elem; | ||
27 | } | ||
28 | } | ||
29 | --- gtkmathview-0.8.0.orig/mathmlsvg/main.cc 2012-04-30 11:35:19.000000000 +0200 | ||
30 | +++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-04-30 11:51:19.000000000 +0200 | ||
31 | @@ -20,6 +20,7 @@ | ||
32 | |||
33 | #include <cassert> | ||
34 | #include <fstream> | ||
35 | +#include <unistd.h> | ||
36 | #include <string.h> | ||
37 | #include <popt.h> | ||
38 | |||
39 | --- gtkmathview-0.8.0.orig/mathmlps/main.cc 2012-04-30 11:35:19.000000000 +0200 | ||
40 | +++ gtkmathview-0.8.0/mathmlps/main.cc 2012-04-30 11:50:57.000000000 +0200 | ||
41 | @@ -20,6 +20,7 @@ | ||
42 | |||
43 | #include <cassert> | ||
44 | #include <fstream> | ||
45 | +#include <unistd.h> | ||
46 | #include <string.h> | ||
47 | #include <popt.h> | ||
48 | |||
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff b/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff new file mode 100644 index 000000000..1d4895045 --- /dev/null +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview/qualify-lookup.diff | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh | ||
2 | =================================================================== | ||
3 | --- gtkmathview-0.8.0.orig/src/frontend/common/TemplateElementIterator.hh | ||
4 | +++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh | ||
5 | @@ -43,7 +43,7 @@ protected: | ||
6 | findValidNodeForward(const typename Model::Node& p0) const | ||
7 | { | ||
8 | for (typename Model::Node p = p0; p; p = Model::getNextSibling(p)) | ||
9 | - if (valid(p)) return Model::asElement(p); | ||
10 | + if (this->valid(p)) return Model::asElement(p); | ||
11 | return typename Model::Element(); | ||
12 | } | ||
13 | |||
diff --git a/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb new file mode 100644 index 000000000..65b07f502 --- /dev/null +++ b/meta-oe/recipes-extended/mml-widget/gtkmathview_0.8.0.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/" | ||
2 | DEPENDS = "t1lib gtk+ popt libxslt libxml2" | ||
3 | |||
4 | LICENSE = "LGPLv3" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" | ||
6 | |||
7 | PR = "r3" | ||
8 | |||
9 | SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${BP}.tar.gz \ | ||
10 | file://mathview-gcc43x.diff \ | ||
11 | file://mathview-gcc47x.diff \ | ||
12 | file://qualify-lookup.diff \ | ||
13 | " | ||
14 | SRC_URI[md5sum] = "b53564e553728d4b69f7d366dfeb5299" | ||
15 | SRC_URI[sha256sum] = "1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43" | ||
16 | |||
17 | inherit autotools-brokensep pkgconfig | ||
18 | |||
19 | do_configure_prepend() { | ||
20 | sed -i -e s:AM_BINRELOC::g ${S}/configure.ac | ||
21 | } | ||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch new file mode 100644 index 000000000..bc141d9d5 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 0a61b0b98c152f10404ccbdeeac583a486638a7a Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 6 Jun 2013 18:36:01 +0200 | ||
4 | Subject: [PATCH] js.pc.in: do not include RequiredDefines.h for depending | ||
5 | packages | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | in our cross environment the would fail with: | ||
11 | |||
12 | | cc1: fatal error: /usr/include/js-17.0/js/RequiredDefines.h: No such file or directory | ||
13 | |||
14 | and currently it only defines __STDC_LIMIT_MACROS | ||
15 | |||
16 | Upstream-Status: Inappropriate [embedded specific] | ||
17 | |||
18 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
19 | --- | ||
20 | js.pc.in | 2 +- | ||
21 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
22 | |||
23 | diff --git a/js.pc.in b/js.pc.in | ||
24 | index 13d761d..a95a7bd 100644 | ||
25 | --- a/js.pc.in | ||
26 | +++ b/js.pc.in | ||
27 | @@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript | ||
28 | Version: @MOZILLA_VERSION@ | ||
29 | Requires.private: @NSPR_PKGCONF_CHECK@ | ||
30 | Libs: -L${libdir} -l@LIBRARY_NAME@ | ||
31 | -Cflags: -include ${includedir}/@MODULE@/js/RequiredDefines.h -I${includedir}/@MODULE@ | ||
32 | +Cflags: -I${includedir}/@MODULE@ | ||
33 | -- | ||
34 | 1.7.6.5 | ||
35 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch new file mode 100644 index 000000000..de72d4f9a --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From da3929a96d9c74e11bf37d128890e18fcb745365 Mon Sep 17 00:00:00 2001 | ||
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
3 | Date: Mon, 26 Jan 2015 08:53:19 +0900 | ||
4 | Subject: [PATCH] mozjs17.0.0: fix the compile bug of powerpc | ||
5 | |||
6 | To fix the bug as following | ||
7 | |||
8 | error: cannot convert '__va_list_tag**' to '__va_list_tag (*)[1]' for | ||
9 | argument '5' to 'JSBool TryArgumentFormatter(JSContext*, const char**, | ||
10 | JSBool, jsval**, __va_list_tag (*)[1])' | ||
11 | |||
12 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | ||
13 | --- | ||
14 | jscpucfg.h | 6 ++++++ | ||
15 | 1 file changed, 6 insertions(+) | ||
16 | |||
17 | diff --git a/jscpucfg.h b/jscpucfg.h | ||
18 | index dfb1c14..8683491 100644 | ||
19 | --- a/jscpucfg.h | ||
20 | +++ b/jscpucfg.h | ||
21 | @@ -47,6 +47,12 @@ | ||
22 | #elif defined(JS_HAVE_ENDIAN_H) | ||
23 | # include <endian.h> | ||
24 | |||
25 | +#if defined(_POWER) || defined(__powerpc__) || \ | ||
26 | + defined(__ppc__) | ||
27 | +# define HAVE_VA_LIST_AS_ARRAY 1 | ||
28 | +# endif | ||
29 | + | ||
30 | + | ||
31 | # if defined(__BYTE_ORDER) | ||
32 | # if __BYTE_ORDER == __LITTLE_ENDIAN | ||
33 | # define IS_LITTLE_ENDIAN 1 | ||
34 | -- | ||
35 | 1.8.4.2 | ||
36 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch b/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch new file mode 100644 index 000000000..fa413ea9f --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0001-regenerate-configure.patch | |||
@@ -0,0 +1,3238 @@ | |||
1 | From 6440b4901c6f4bcc69686ff10806e311cc5a927b Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Tue, 3 Mar 2015 19:12:17 +0800 | ||
4 | Subject: [PATCH] regenerate configure with autoconf-2.13 | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> | ||
7 | Upstream-status: Inappropriate [generated file] | ||
8 | |||
9 | --- | ||
10 | js/src/configure | 838 ++++++++++++++++++++++++++----------------------------- | ||
11 | 1 file changed, 389 insertions(+), 449 deletions(-) | ||
12 | |||
13 | diff --git a/js/src/configure b/js/src/configure | ||
14 | index cb6b41b..b05298f 100755 | ||
15 | --- a/js/src/configure | ||
16 | +++ b/js/src/configure | ||
17 | @@ -5757,6 +5757,10 @@ arm*) | ||
18 | CPU_ARCH=arm | ||
19 | ;; | ||
20 | |||
21 | +aarch64*) | ||
22 | + CPU_ARCH=aarch64 | ||
23 | + ;; | ||
24 | + | ||
25 | mips|mipsel) | ||
26 | CPU_ARCH="mips" | ||
27 | ;; | ||
28 | @@ -5893,14 +5897,14 @@ no) | ||
29 | _SAVE_CFLAGS="$CFLAGS" | ||
30 | CFLAGS="$arch_flag" | ||
31 | cat > conftest.$ac_ext <<EOF | ||
32 | -#line 5897 "configure" | ||
33 | +#line 5901 "configure" | ||
34 | #include "confdefs.h" | ||
35 | |||
36 | int main() { | ||
37 | return sizeof(__thumb2__); | ||
38 | ; return 0; } | ||
39 | EOF | ||
40 | -if { (eval echo configure:5904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
41 | +if { (eval echo configure:5908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
42 | rm -rf conftest* | ||
43 | MOZ_THUMB2=1 | ||
44 | else | ||
45 | @@ -5972,16 +5976,16 @@ if test -n "$all_flags"; then | ||
46 | _SAVE_CFLAGS="$CFLAGS" | ||
47 | CFLAGS="$all_flags" | ||
48 | echo $ac_n "checking whether the chosen combination of compiler flags ($all_flags) works""... $ac_c" 1>&6 | ||
49 | -echo "configure:5976: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 | ||
50 | +echo "configure:5980: checking whether the chosen combination of compiler flags ($all_flags) works" >&5 | ||
51 | cat > conftest.$ac_ext <<EOF | ||
52 | -#line 5978 "configure" | ||
53 | +#line 5982 "configure" | ||
54 | #include "confdefs.h" | ||
55 | |||
56 | int main() { | ||
57 | return 0; | ||
58 | ; return 0; } | ||
59 | EOF | ||
60 | -if { (eval echo configure:5985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
61 | +if { (eval echo configure:5989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
62 | rm -rf conftest* | ||
63 | echo "$ac_t""yes" 1>&6 | ||
64 | else | ||
65 | @@ -6004,18 +6008,18 @@ fi | ||
66 | |||
67 | if test "$CPU_ARCH" = "arm"; then | ||
68 | echo $ac_n "checking for ARM SIMD support in compiler""... $ac_c" 1>&6 | ||
69 | -echo "configure:6008: checking for ARM SIMD support in compiler" >&5 | ||
70 | +echo "configure:6012: checking for ARM SIMD support in compiler" >&5 | ||
71 | # We try to link so that this also fails when | ||
72 | # building with LTO. | ||
73 | cat > conftest.$ac_ext <<EOF | ||
74 | -#line 6012 "configure" | ||
75 | +#line 6016 "configure" | ||
76 | #include "confdefs.h" | ||
77 | |||
78 | int main() { | ||
79 | asm("uqadd8 r1, r1, r2"); | ||
80 | ; return 0; } | ||
81 | EOF | ||
82 | -if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
83 | +if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
84 | rm -rf conftest* | ||
85 | result="yes" | ||
86 | else | ||
87 | @@ -6038,18 +6042,18 @@ EOF | ||
88 | fi | ||
89 | |||
90 | echo $ac_n "checking for ARM NEON support in compiler""... $ac_c" 1>&6 | ||
91 | -echo "configure:6042: checking for ARM NEON support in compiler" >&5 | ||
92 | +echo "configure:6046: checking for ARM NEON support in compiler" >&5 | ||
93 | # We try to link so that this also fails when | ||
94 | # building with LTO. | ||
95 | cat > conftest.$ac_ext <<EOF | ||
96 | -#line 6046 "configure" | ||
97 | +#line 6050 "configure" | ||
98 | #include "confdefs.h" | ||
99 | |||
100 | int main() { | ||
101 | asm(".fpu neon\n vadd.i8 d0, d0, d0"); | ||
102 | ; return 0; } | ||
103 | EOF | ||
104 | -if { (eval echo configure:6053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
105 | +if { (eval echo configure:6057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
106 | rm -rf conftest* | ||
107 | result="yes" | ||
108 | else | ||
109 | @@ -6094,7 +6098,7 @@ configure_static_assert_macros=' | ||
110 | ' | ||
111 | |||
112 | echo $ac_n "checking that static assertion macros used in autoconf tests work""... $ac_c" 1>&6 | ||
113 | -echo "configure:6098: checking that static assertion macros used in autoconf tests work" >&5 | ||
114 | +echo "configure:6102: checking that static assertion macros used in autoconf tests work" >&5 | ||
115 | if eval "test \"`echo '$''{'ac_cv_static_assertion_macros_work'+set}'`\" = set"; then | ||
116 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
117 | else | ||
118 | @@ -6108,14 +6112,14 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
119 | |||
120 | ac_cv_static_assertion_macros_work="yes" | ||
121 | cat > conftest.$ac_ext <<EOF | ||
122 | -#line 6112 "configure" | ||
123 | +#line 6116 "configure" | ||
124 | #include "confdefs.h" | ||
125 | $configure_static_assert_macros | ||
126 | int main() { | ||
127 | CONFIGURE_STATIC_ASSERT(1) | ||
128 | ; return 0; } | ||
129 | EOF | ||
130 | -if { (eval echo configure:6119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
131 | +if { (eval echo configure:6123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
132 | : | ||
133 | else | ||
134 | echo "configure: failed program was:" >&5 | ||
135 | @@ -6125,14 +6129,14 @@ else | ||
136 | fi | ||
137 | rm -f conftest* | ||
138 | cat > conftest.$ac_ext <<EOF | ||
139 | -#line 6129 "configure" | ||
140 | +#line 6133 "configure" | ||
141 | #include "confdefs.h" | ||
142 | $configure_static_assert_macros | ||
143 | int main() { | ||
144 | CONFIGURE_STATIC_ASSERT(0) | ||
145 | ; return 0; } | ||
146 | EOF | ||
147 | -if { (eval echo configure:6136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
148 | +if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
149 | rm -rf conftest* | ||
150 | ac_cv_static_assertion_macros_work="no" | ||
151 | else | ||
152 | @@ -6148,14 +6152,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
153 | cross_compiling=$ac_cv_prog_cxx_cross | ||
154 | |||
155 | cat > conftest.$ac_ext <<EOF | ||
156 | -#line 6152 "configure" | ||
157 | +#line 6156 "configure" | ||
158 | #include "confdefs.h" | ||
159 | $configure_static_assert_macros | ||
160 | int main() { | ||
161 | CONFIGURE_STATIC_ASSERT(1) | ||
162 | ; return 0; } | ||
163 | EOF | ||
164 | -if { (eval echo configure:6159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
165 | +if { (eval echo configure:6163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
166 | : | ||
167 | else | ||
168 | echo "configure: failed program was:" >&5 | ||
169 | @@ -6165,14 +6169,14 @@ else | ||
170 | fi | ||
171 | rm -f conftest* | ||
172 | cat > conftest.$ac_ext <<EOF | ||
173 | -#line 6169 "configure" | ||
174 | +#line 6173 "configure" | ||
175 | #include "confdefs.h" | ||
176 | $configure_static_assert_macros | ||
177 | int main() { | ||
178 | CONFIGURE_STATIC_ASSERT(0) | ||
179 | ; return 0; } | ||
180 | EOF | ||
181 | -if { (eval echo configure:6176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
182 | +if { (eval echo configure:6180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
183 | rm -rf conftest* | ||
184 | ac_cv_static_assertion_macros_work="no" | ||
185 | else | ||
186 | @@ -6317,7 +6321,7 @@ if test "$GNU_CC"; then | ||
187 | _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wall -Wpointer-arith -Wdeclaration-after-statement" | ||
188 | |||
189 | echo $ac_n "checking whether the C compiler supports -Werror=return-type""... $ac_c" 1>&6 | ||
190 | -echo "configure:6321: checking whether the C compiler supports -Werror=return-type" >&5 | ||
191 | +echo "configure:6325: checking whether the C compiler supports -Werror=return-type" >&5 | ||
192 | if eval "test \"`echo '$''{'ac_c_has_werror_return_type'+set}'`\" = set"; then | ||
193 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
194 | else | ||
195 | @@ -6333,14 +6337,14 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
196 | _SAVE_CFLAGS="$CFLAGS" | ||
197 | CFLAGS="$CFLAGS -Werror -Werror=return-type" | ||
198 | cat > conftest.$ac_ext <<EOF | ||
199 | -#line 6337 "configure" | ||
200 | +#line 6341 "configure" | ||
201 | #include "confdefs.h" | ||
202 | |||
203 | int main() { | ||
204 | return(0); | ||
205 | ; return 0; } | ||
206 | EOF | ||
207 | -if { (eval echo configure:6344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
208 | +if { (eval echo configure:6348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
209 | rm -rf conftest* | ||
210 | ac_c_has_werror_return_type="yes" | ||
211 | else | ||
212 | @@ -6368,7 +6372,7 @@ echo "$ac_t""$ac_c_has_werror_return_type" 1>&6 | ||
213 | |||
214 | |||
215 | echo $ac_n "checking whether the C compiler supports -Wtype-limits""... $ac_c" 1>&6 | ||
216 | -echo "configure:6372: checking whether the C compiler supports -Wtype-limits" >&5 | ||
217 | +echo "configure:6376: checking whether the C compiler supports -Wtype-limits" >&5 | ||
218 | if eval "test \"`echo '$''{'ac_c_has_wtype_limits'+set}'`\" = set"; then | ||
219 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
220 | else | ||
221 | @@ -6384,14 +6388,14 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
222 | _SAVE_CFLAGS="$CFLAGS" | ||
223 | CFLAGS="$CFLAGS -Werror -Wtype-limits" | ||
224 | cat > conftest.$ac_ext <<EOF | ||
225 | -#line 6388 "configure" | ||
226 | +#line 6392 "configure" | ||
227 | #include "confdefs.h" | ||
228 | |||
229 | int main() { | ||
230 | return(0); | ||
231 | ; return 0; } | ||
232 | EOF | ||
233 | -if { (eval echo configure:6395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
234 | +if { (eval echo configure:6399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
235 | rm -rf conftest* | ||
236 | ac_c_has_wtype_limits="yes" | ||
237 | else | ||
238 | @@ -6419,7 +6423,7 @@ echo "$ac_t""$ac_c_has_wtype_limits" 1>&6 | ||
239 | |||
240 | |||
241 | echo $ac_n "checking whether the C compiler supports -Wempty-body""... $ac_c" 1>&6 | ||
242 | -echo "configure:6423: checking whether the C compiler supports -Wempty-body" >&5 | ||
243 | +echo "configure:6427: checking whether the C compiler supports -Wempty-body" >&5 | ||
244 | if eval "test \"`echo '$''{'ac_c_has_wempty_body'+set}'`\" = set"; then | ||
245 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
246 | else | ||
247 | @@ -6435,14 +6439,14 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
248 | _SAVE_CFLAGS="$CFLAGS" | ||
249 | CFLAGS="$CFLAGS -Werror -Wempty-body" | ||
250 | cat > conftest.$ac_ext <<EOF | ||
251 | -#line 6439 "configure" | ||
252 | +#line 6443 "configure" | ||
253 | #include "confdefs.h" | ||
254 | |||
255 | int main() { | ||
256 | return(0); | ||
257 | ; return 0; } | ||
258 | EOF | ||
259 | -if { (eval echo configure:6446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
260 | +if { (eval echo configure:6450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
261 | rm -rf conftest* | ||
262 | ac_c_has_wempty_body="yes" | ||
263 | else | ||
264 | @@ -6476,7 +6480,7 @@ echo "$ac_t""$ac_c_has_wempty_body" 1>&6 | ||
265 | _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -Wno-unused" | ||
266 | |||
267 | echo $ac_n "checking whether the C compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 | ||
268 | -echo "configure:6480: checking whether the C compiler supports -Wno-overlength-strings" >&5 | ||
269 | +echo "configure:6484: checking whether the C compiler supports -Wno-overlength-strings" >&5 | ||
270 | if eval "test \"`echo '$''{'ac_c_has_wno_overlength_strings'+set}'`\" = set"; then | ||
271 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
272 | else | ||
273 | @@ -6492,14 +6496,14 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
274 | _SAVE_CFLAGS="$CFLAGS" | ||
275 | CFLAGS="$CFLAGS -Werror -Woverlength-strings" | ||
276 | cat > conftest.$ac_ext <<EOF | ||
277 | -#line 6496 "configure" | ||
278 | +#line 6500 "configure" | ||
279 | #include "confdefs.h" | ||
280 | |||
281 | int main() { | ||
282 | return(0); | ||
283 | ; return 0; } | ||
284 | EOF | ||
285 | -if { (eval echo configure:6503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
286 | +if { (eval echo configure:6507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
287 | rm -rf conftest* | ||
288 | ac_c_has_wno_overlength_strings="yes" | ||
289 | else | ||
290 | @@ -6580,7 +6584,7 @@ if test "$GNU_CXX"; then | ||
291 | _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wall -Wpointer-arith -Woverloaded-virtual" | ||
292 | |||
293 | echo $ac_n "checking whether the C++ compiler supports -Werror=return-type""... $ac_c" 1>&6 | ||
294 | -echo "configure:6584: checking whether the C++ compiler supports -Werror=return-type" >&5 | ||
295 | +echo "configure:6588: checking whether the C++ compiler supports -Werror=return-type" >&5 | ||
296 | if eval "test \"`echo '$''{'ac_cxx_has_werror_return_type'+set}'`\" = set"; then | ||
297 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
298 | else | ||
299 | @@ -6596,14 +6600,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
300 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
301 | CXXFLAGS="$CXXFLAGS -Werror -Werror=return-type" | ||
302 | cat > conftest.$ac_ext <<EOF | ||
303 | -#line 6600 "configure" | ||
304 | +#line 6604 "configure" | ||
305 | #include "confdefs.h" | ||
306 | |||
307 | int main() { | ||
308 | return(0); | ||
309 | ; return 0; } | ||
310 | EOF | ||
311 | -if { (eval echo configure:6607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
312 | +if { (eval echo configure:6611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
313 | rm -rf conftest* | ||
314 | ac_cxx_has_werror_return_type="yes" | ||
315 | else | ||
316 | @@ -6631,7 +6635,7 @@ echo "$ac_t""$ac_cxx_has_werror_return_type" 1>&6 | ||
317 | |||
318 | |||
319 | echo $ac_n "checking whether the C++ compiler supports -Wtype-limits""... $ac_c" 1>&6 | ||
320 | -echo "configure:6635: checking whether the C++ compiler supports -Wtype-limits" >&5 | ||
321 | +echo "configure:6639: checking whether the C++ compiler supports -Wtype-limits" >&5 | ||
322 | if eval "test \"`echo '$''{'ac_cxx_has_wtype_limits'+set}'`\" = set"; then | ||
323 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
324 | else | ||
325 | @@ -6647,14 +6651,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
326 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
327 | CXXFLAGS="$CXXFLAGS -Werror -Wtype-limits" | ||
328 | cat > conftest.$ac_ext <<EOF | ||
329 | -#line 6651 "configure" | ||
330 | +#line 6655 "configure" | ||
331 | #include "confdefs.h" | ||
332 | |||
333 | int main() { | ||
334 | return(0); | ||
335 | ; return 0; } | ||
336 | EOF | ||
337 | -if { (eval echo configure:6658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
338 | +if { (eval echo configure:6662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
339 | rm -rf conftest* | ||
340 | ac_cxx_has_wtype_limits="yes" | ||
341 | else | ||
342 | @@ -6682,7 +6686,7 @@ echo "$ac_t""$ac_cxx_has_wtype_limits" 1>&6 | ||
343 | |||
344 | |||
345 | echo $ac_n "checking whether the C++ compiler supports -Wempty-body""... $ac_c" 1>&6 | ||
346 | -echo "configure:6686: checking whether the C++ compiler supports -Wempty-body" >&5 | ||
347 | +echo "configure:6690: checking whether the C++ compiler supports -Wempty-body" >&5 | ||
348 | if eval "test \"`echo '$''{'ac_cxx_has_wempty_body'+set}'`\" = set"; then | ||
349 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
350 | else | ||
351 | @@ -6698,14 +6702,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
352 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
353 | CXXFLAGS="$CXXFLAGS -Werror -Wempty-body" | ||
354 | cat > conftest.$ac_ext <<EOF | ||
355 | -#line 6702 "configure" | ||
356 | +#line 6706 "configure" | ||
357 | #include "confdefs.h" | ||
358 | |||
359 | int main() { | ||
360 | return(0); | ||
361 | ; return 0; } | ||
362 | EOF | ||
363 | -if { (eval echo configure:6709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
364 | +if { (eval echo configure:6713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
365 | rm -rf conftest* | ||
366 | ac_cxx_has_wempty_body="yes" | ||
367 | else | ||
368 | @@ -6741,7 +6745,7 @@ echo "$ac_t""$ac_cxx_has_wempty_body" 1>&6 | ||
369 | _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-ctor-dtor-privacy" | ||
370 | |||
371 | echo $ac_n "checking whether the C++ compiler supports -Wno-overlength-strings""... $ac_c" 1>&6 | ||
372 | -echo "configure:6745: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 | ||
373 | +echo "configure:6749: checking whether the C++ compiler supports -Wno-overlength-strings" >&5 | ||
374 | if eval "test \"`echo '$''{'ac_cxx_has_wno_overlength_strings'+set}'`\" = set"; then | ||
375 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
376 | else | ||
377 | @@ -6757,14 +6761,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
378 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
379 | CXXFLAGS="$CXXFLAGS -Werror -Woverlength-strings" | ||
380 | cat > conftest.$ac_ext <<EOF | ||
381 | -#line 6761 "configure" | ||
382 | +#line 6765 "configure" | ||
383 | #include "confdefs.h" | ||
384 | |||
385 | int main() { | ||
386 | return(0); | ||
387 | ; return 0; } | ||
388 | EOF | ||
389 | -if { (eval echo configure:6768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
390 | +if { (eval echo configure:6772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
391 | rm -rf conftest* | ||
392 | ac_cxx_has_wno_overlength_strings="yes" | ||
393 | else | ||
394 | @@ -6792,7 +6796,7 @@ echo "$ac_t""$ac_cxx_has_wno_overlength_strings" 1>&6 | ||
395 | |||
396 | |||
397 | echo $ac_n "checking whether the C++ compiler supports -Wno-invalid-offsetof""... $ac_c" 1>&6 | ||
398 | -echo "configure:6796: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 | ||
399 | +echo "configure:6800: checking whether the C++ compiler supports -Wno-invalid-offsetof" >&5 | ||
400 | if eval "test \"`echo '$''{'ac_cxx_has_wno_invalid_offsetof'+set}'`\" = set"; then | ||
401 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
402 | else | ||
403 | @@ -6808,14 +6812,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
404 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
405 | CXXFLAGS="$CXXFLAGS -Werror -Winvalid-offsetof" | ||
406 | cat > conftest.$ac_ext <<EOF | ||
407 | -#line 6812 "configure" | ||
408 | +#line 6816 "configure" | ||
409 | #include "confdefs.h" | ||
410 | |||
411 | int main() { | ||
412 | return(0); | ||
413 | ; return 0; } | ||
414 | EOF | ||
415 | -if { (eval echo configure:6819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
416 | +if { (eval echo configure:6823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
417 | rm -rf conftest* | ||
418 | ac_cxx_has_wno_invalid_offsetof="yes" | ||
419 | else | ||
420 | @@ -6843,7 +6847,7 @@ echo "$ac_t""$ac_cxx_has_wno_invalid_offsetof" 1>&6 | ||
421 | |||
422 | |||
423 | echo $ac_n "checking whether the C++ compiler supports -Wno-variadic-macros""... $ac_c" 1>&6 | ||
424 | -echo "configure:6847: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 | ||
425 | +echo "configure:6851: checking whether the C++ compiler supports -Wno-variadic-macros" >&5 | ||
426 | if eval "test \"`echo '$''{'ac_cxx_has_wno_variadic_macros'+set}'`\" = set"; then | ||
427 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
428 | else | ||
429 | @@ -6859,14 +6863,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
430 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
431 | CXXFLAGS="$CXXFLAGS -Werror -Wvariadic-macros" | ||
432 | cat > conftest.$ac_ext <<EOF | ||
433 | -#line 6863 "configure" | ||
434 | +#line 6867 "configure" | ||
435 | #include "confdefs.h" | ||
436 | |||
437 | int main() { | ||
438 | return(0); | ||
439 | ; return 0; } | ||
440 | EOF | ||
441 | -if { (eval echo configure:6870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
442 | +if { (eval echo configure:6874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
443 | rm -rf conftest* | ||
444 | ac_cxx_has_wno_variadic_macros="yes" | ||
445 | else | ||
446 | @@ -6918,7 +6922,7 @@ echo "$ac_t""$ac_cxx_has_wno_variadic_macros" 1>&6 | ||
447 | _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} -Wno-c++0x-extensions" | ||
448 | |||
449 | echo $ac_n "checking whether the C++ compiler supports -Wno-extended-offsetof""... $ac_c" 1>&6 | ||
450 | -echo "configure:6922: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 | ||
451 | +echo "configure:6926: checking whether the C++ compiler supports -Wno-extended-offsetof" >&5 | ||
452 | if eval "test \"`echo '$''{'ac_cxx_has_wno_extended_offsetof'+set}'`\" = set"; then | ||
453 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
454 | else | ||
455 | @@ -6934,14 +6938,14 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
456 | _SAVE_CXXFLAGS="$CXXFLAGS" | ||
457 | CXXFLAGS="$CXXFLAGS -Werror -Wextended-offsetof" | ||
458 | cat > conftest.$ac_ext <<EOF | ||
459 | -#line 6938 "configure" | ||
460 | +#line 6942 "configure" | ||
461 | #include "confdefs.h" | ||
462 | |||
463 | int main() { | ||
464 | return(0); | ||
465 | ; return 0; } | ||
466 | EOF | ||
467 | -if { (eval echo configure:6945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
468 | +if { (eval echo configure:6949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
469 | rm -rf conftest* | ||
470 | ac_cxx_has_wno_extended_offsetof="yes" | ||
471 | else | ||
472 | @@ -6979,7 +6983,7 @@ MKSHLIB_UNFORCE_ALL= | ||
473 | if test "$COMPILE_ENVIRONMENT"; then | ||
474 | if test "$GNU_CC"; then | ||
475 | echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 | ||
476 | -echo "configure:6983: checking whether ld has archive extraction flags" >&5 | ||
477 | +echo "configure:6987: checking whether ld has archive extraction flags" >&5 | ||
478 | if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then | ||
479 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
480 | else | ||
481 | @@ -6996,14 +7000,14 @@ LOOP_INPUT | ||
482 | LDFLAGS=$force | ||
483 | LIBS=$unforce | ||
484 | cat > conftest.$ac_ext <<EOF | ||
485 | -#line 7000 "configure" | ||
486 | +#line 7004 "configure" | ||
487 | #include "confdefs.h" | ||
488 | |||
489 | int main() { | ||
490 | |||
491 | ; return 0; } | ||
492 | EOF | ||
493 | -if { (eval echo configure:7007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
494 | +if { (eval echo configure:7011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
495 | rm -rf conftest* | ||
496 | ac_cv_mkshlib_force_and_unforce=$line; break | ||
497 | else | ||
498 | @@ -7038,16 +7042,16 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a | ||
499 | cross_compiling=$ac_cv_prog_cc_cross | ||
500 | |||
501 | echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 | ||
502 | -echo "configure:7042: checking for 64-bit OS" >&5 | ||
503 | +echo "configure:7046: checking for 64-bit OS" >&5 | ||
504 | cat > conftest.$ac_ext <<EOF | ||
505 | -#line 7044 "configure" | ||
506 | +#line 7048 "configure" | ||
507 | #include "confdefs.h" | ||
508 | $configure_static_assert_macros | ||
509 | int main() { | ||
510 | CONFIGURE_STATIC_ASSERT(sizeof(void*) == 8) | ||
511 | ; return 0; } | ||
512 | EOF | ||
513 | -if { (eval echo configure:7051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
514 | +if { (eval echo configure:7055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
515 | rm -rf conftest* | ||
516 | result="yes" | ||
517 | else | ||
518 | @@ -7170,7 +7174,7 @@ case "$host" in | ||
519 | esac | ||
520 | |||
521 | echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6 | ||
522 | -echo "configure:7174: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 | ||
523 | +echo "configure:7178: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 | ||
524 | |||
525 | $PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION | ||
526 | _python_res=$? | ||
527 | @@ -7181,7 +7185,7 @@ fi | ||
528 | echo "$ac_t""yes" 1>&6 | ||
529 | |||
530 | echo $ac_n "checking for custom <stdint.h> implementation""... $ac_c" 1>&6 | ||
531 | -echo "configure:7185: checking for custom <stdint.h> implementation" >&5 | ||
532 | +echo "configure:7189: checking for custom <stdint.h> implementation" >&5 | ||
533 | if test "$MOZ_CUSTOM_STDINT_H"; then | ||
534 | cat >> confdefs.pytmp <<EOF | ||
535 | (''' MOZ_CUSTOM_STDINT_H ''', r''' "$MOZ_CUSTOM_STDINT_H" ''') | ||
536 | @@ -7249,9 +7253,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
537 | cross_compiling=$ac_cv_prog_cxx_cross | ||
538 | |||
539 | echo $ac_n "checking for IBM XLC/C++ compiler version >= 9.0.0.7""... $ac_c" 1>&6 | ||
540 | -echo "configure:7253: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 | ||
541 | +echo "configure:7257: checking for IBM XLC/C++ compiler version >= 9.0.0.7" >&5 | ||
542 | cat > conftest.$ac_ext <<EOF | ||
543 | -#line 7255 "configure" | ||
544 | +#line 7259 "configure" | ||
545 | #include "confdefs.h" | ||
546 | |||
547 | int main() { | ||
548 | @@ -7260,7 +7264,7 @@ int main() { | ||
549 | #endif | ||
550 | ; return 0; } | ||
551 | EOF | ||
552 | -if { (eval echo configure:7264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
553 | +if { (eval echo configure:7268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
554 | rm -rf conftest* | ||
555 | _BAD_COMPILER= | ||
556 | else | ||
557 | @@ -7298,12 +7302,12 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
558 | do | ||
559 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
560 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
561 | -echo "configure:7302: checking for $ac_hdr" >&5 | ||
562 | +echo "configure:7306: checking for $ac_hdr" >&5 | ||
563 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
564 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
565 | else | ||
566 | cat > conftest.$ac_ext <<EOF | ||
567 | -#line 7307 "configure" | ||
568 | +#line 7311 "configure" | ||
569 | #include "confdefs.h" | ||
570 | |||
571 | #include <$ac_hdr> | ||
572 | @@ -7311,7 +7315,7 @@ int main() { | ||
573 | |||
574 | ; return 0; } | ||
575 | EOF | ||
576 | -if { (eval echo configure:7315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
577 | +if { (eval echo configure:7319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
578 | rm -rf conftest* | ||
579 | eval "ac_cv_header_$ac_safe=yes" | ||
580 | else | ||
581 | @@ -7394,17 +7398,17 @@ EOF | ||
582 | # builds. | ||
583 | _SAVE_LDFLAGS=$LDFLAGS | ||
584 | echo $ac_n "checking for -framework ExceptionHandling""... $ac_c" 1>&6 | ||
585 | -echo "configure:7398: checking for -framework ExceptionHandling" >&5 | ||
586 | +echo "configure:7402: checking for -framework ExceptionHandling" >&5 | ||
587 | LDFLAGS="$LDFLAGS -framework ExceptionHandling" | ||
588 | cat > conftest.$ac_ext <<EOF | ||
589 | -#line 7401 "configure" | ||
590 | +#line 7405 "configure" | ||
591 | #include "confdefs.h" | ||
592 | |||
593 | int main() { | ||
594 | return 0; | ||
595 | ; return 0; } | ||
596 | EOF | ||
597 | -if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
598 | +if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
599 | rm -rf conftest* | ||
600 | ac_cv_have_framework_exceptionhandling="yes" | ||
601 | else | ||
602 | @@ -7426,18 +7430,18 @@ rm -f conftest* | ||
603 | echo "Skipping -dead_strip because DTrace is enabled. See bug 403132." | ||
604 | else | ||
605 | echo $ac_n "checking for -dead_strip option to ld""... $ac_c" 1>&6 | ||
606 | -echo "configure:7430: checking for -dead_strip option to ld" >&5 | ||
607 | +echo "configure:7434: checking for -dead_strip option to ld" >&5 | ||
608 | _SAVE_LDFLAGS=$LDFLAGS | ||
609 | LDFLAGS="$LDFLAGS -Wl,-dead_strip" | ||
610 | cat > conftest.$ac_ext <<EOF | ||
611 | -#line 7434 "configure" | ||
612 | +#line 7438 "configure" | ||
613 | #include "confdefs.h" | ||
614 | |||
615 | int main() { | ||
616 | return 0; | ||
617 | ; return 0; } | ||
618 | EOF | ||
619 | -if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
620 | +if { (eval echo configure:7445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
621 | rm -rf conftest* | ||
622 | _HAVE_DEAD_STRIP=1 | ||
623 | else | ||
624 | @@ -7783,12 +7787,12 @@ EOF | ||
625 | do | ||
626 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
627 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
628 | -echo "configure:7787: checking for $ac_hdr" >&5 | ||
629 | +echo "configure:7791: checking for $ac_hdr" >&5 | ||
630 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
631 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
632 | else | ||
633 | cat > conftest.$ac_ext <<EOF | ||
634 | -#line 7792 "configure" | ||
635 | +#line 7796 "configure" | ||
636 | #include "confdefs.h" | ||
637 | |||
638 | #include <$ac_hdr> | ||
639 | @@ -7796,7 +7800,7 @@ int main() { | ||
640 | |||
641 | ; return 0; } | ||
642 | EOF | ||
643 | -if { (eval echo configure:7800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
644 | +if { (eval echo configure:7804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
645 | rm -rf conftest* | ||
646 | eval "ac_cv_header_$ac_safe=yes" | ||
647 | else | ||
648 | @@ -7989,19 +7993,19 @@ EOF | ||
649 | _DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__" | ||
650 | |||
651 | echo $ac_n "checking for __declspec(dllexport)""... $ac_c" 1>&6 | ||
652 | -echo "configure:7993: checking for __declspec(dllexport)" >&5 | ||
653 | +echo "configure:7997: checking for __declspec(dllexport)" >&5 | ||
654 | if eval "test \"`echo '$''{'ac_os2_declspec'+set}'`\" = set"; then | ||
655 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
656 | else | ||
657 | cat > conftest.$ac_ext <<EOF | ||
658 | -#line 7998 "configure" | ||
659 | +#line 8002 "configure" | ||
660 | #include "confdefs.h" | ||
661 | __declspec(dllexport) void ac_os2_declspec(void) {} | ||
662 | int main() { | ||
663 | return 0; | ||
664 | ; return 0; } | ||
665 | EOF | ||
666 | -if { (eval echo configure:8005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
667 | +if { (eval echo configure:8009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
668 | rm -rf conftest* | ||
669 | ac_os2_declspec="yes" | ||
670 | else | ||
671 | @@ -8054,14 +8058,14 @@ EOF | ||
672 | _SAVE_LDFLAGS=$LDFLAGS | ||
673 | LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" | ||
674 | cat > conftest.$ac_ext <<EOF | ||
675 | -#line 8058 "configure" | ||
676 | +#line 8062 "configure" | ||
677 | #include "confdefs.h" | ||
678 | #include <stdio.h> | ||
679 | int main() { | ||
680 | printf("Hello World\n"); | ||
681 | ; return 0; } | ||
682 | EOF | ||
683 | -if { (eval echo configure:8065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
684 | +if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
685 | : | ||
686 | else | ||
687 | echo "configure: failed program was:" >&5 | ||
688 | @@ -8089,7 +8093,7 @@ rm -f conftest* | ||
689 | CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` | ||
690 | CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` | ||
691 | echo $ac_n "checking for Sun C++ compiler version >= 5.9""... $ac_c" 1>&6 | ||
692 | -echo "configure:8093: checking for Sun C++ compiler version >= 5.9" >&5 | ||
693 | +echo "configure:8097: checking for Sun C++ compiler version >= 5.9" >&5 | ||
694 | |||
695 | ac_ext=C | ||
696 | # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. | ||
697 | @@ -8099,7 +8103,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
698 | cross_compiling=$ac_cv_prog_cxx_cross | ||
699 | |||
700 | cat > conftest.$ac_ext <<EOF | ||
701 | -#line 8103 "configure" | ||
702 | +#line 8107 "configure" | ||
703 | #include "confdefs.h" | ||
704 | |||
705 | int main() { | ||
706 | @@ -8108,7 +8112,7 @@ int main() { | ||
707 | #endif | ||
708 | ; return 0; } | ||
709 | EOF | ||
710 | -if { (eval echo configure:8112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
711 | +if { (eval echo configure:8116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
712 | rm -rf conftest* | ||
713 | _BAD_COMPILER= | ||
714 | else | ||
715 | @@ -8125,7 +8129,7 @@ rm -f conftest* | ||
716 | _res="yes" | ||
717 | fi | ||
718 | cat > conftest.$ac_ext <<EOF | ||
719 | -#line 8129 "configure" | ||
720 | +#line 8133 "configure" | ||
721 | #include "confdefs.h" | ||
722 | |||
723 | int main() { | ||
724 | @@ -8134,7 +8138,7 @@ int main() { | ||
725 | #endif | ||
726 | ; return 0; } | ||
727 | EOF | ||
728 | -if { (eval echo configure:8138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
729 | +if { (eval echo configure:8142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
730 | rm -rf conftest* | ||
731 | _ABOVE_SS12U1= | ||
732 | else | ||
733 | @@ -8535,7 +8539,7 @@ fi | ||
734 | |||
735 | if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -z "$MOZ_DISABLE_ICF"; then | ||
736 | echo $ac_n "checking whether the linker supports Identical Code Folding""... $ac_c" 1>&6 | ||
737 | -echo "configure:8539: checking whether the linker supports Identical Code Folding" >&5 | ||
738 | +echo "configure:8543: checking whether the linker supports Identical Code Folding" >&5 | ||
739 | if eval "test \"`echo '$''{'LD_SUPPORTS_ICF'+set}'`\" = set"; then | ||
740 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
741 | else | ||
742 | @@ -8544,7 +8548,7 @@ else | ||
743 | 'int main() {return foo() - bar();}' > conftest.${ac_ext} | ||
744 | # If the linker supports ICF, foo and bar symbols will have | ||
745 | # the same address | ||
746 | - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
747 | + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS -Wl,--icf=safe -ffunction-sections conftest.${ac_ext} $LIBS 1>&2'; { (eval echo configure:8552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
748 | test -s conftest${ac_exeext} && | ||
749 | objdump -t conftest${ac_exeext} | awk '{a[$6] = $1} END {if (a["foo"] && (a["foo"] != a["bar"])) { exit 1 }}'; then | ||
750 | LD_SUPPORTS_ICF=yes | ||
751 | @@ -8559,14 +8563,14 @@ echo "$ac_t""$LD_SUPPORTS_ICF" 1>&6 | ||
752 | _SAVE_LDFLAGS="$LDFLAGS -Wl,--icf=safe" | ||
753 | LDFLAGS="$LDFLAGS -Wl,--icf=safe -Wl,--print-icf-sections" | ||
754 | cat > conftest.$ac_ext <<EOF | ||
755 | -#line 8563 "configure" | ||
756 | +#line 8567 "configure" | ||
757 | #include "confdefs.h" | ||
758 | |||
759 | int main() { | ||
760 | |||
761 | ; return 0; } | ||
762 | EOF | ||
763 | -if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
764 | +if { (eval echo configure:8574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
765 | rm -rf conftest* | ||
766 | LD_PRINT_ICF_SECTIONS=-Wl,--print-icf-sections | ||
767 | else | ||
768 | @@ -8584,15 +8588,15 @@ fi | ||
769 | |||
770 | if test "$GNU_CC" -a "$GCC_USE_GNU_LD" -a -n "$MOZ_DEBUG_FLAGS"; then | ||
771 | echo $ac_n "checking whether removing dead symbols breaks debugging""... $ac_c" 1>&6 | ||
772 | -echo "configure:8588: checking whether removing dead symbols breaks debugging" >&5 | ||
773 | +echo "configure:8592: checking whether removing dead symbols breaks debugging" >&5 | ||
774 | if eval "test \"`echo '$''{'GC_SECTIONS_BREAKS_DEBUG_RANGES'+set}'`\" = set"; then | ||
775 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
776 | else | ||
777 | echo 'int foo() {return 42;}' \ | ||
778 | 'int bar() {return 1;}' \ | ||
779 | 'int main() {return foo();}' > conftest.${ac_ext} | ||
780 | - if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
781 | - { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
782 | + if { ac_try='${CC-cc} -o conftest.${ac_objext} $CFLAGS $MOZ_DEBUG_FLAGS -c conftest.${ac_ext} 1>&2'; { (eval echo configure:8599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
783 | + { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS $MOZ_DEBUG_FLAGS -Wl,--gc-sections conftest.${ac_objext} $LIBS 1>&2'; { (eval echo configure:8600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && | ||
784 | test -s conftest${ac_exeext} -a -s conftest.${ac_objext}; then | ||
785 | if test "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest.${ac_objext} conftest.${ac_ext}`" = \ | ||
786 | "`$PYTHON "$_topsrcdir"/build/autoconf/check_debug_ranges.py conftest${ac_exeext} conftest.${ac_ext}`"; then | ||
787 | @@ -8615,12 +8619,12 @@ fi | ||
788 | |||
789 | if test -z "$SKIP_COMPILER_CHECKS"; then | ||
790 | echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 | ||
791 | -echo "configure:8619: checking for ANSI C header files" >&5 | ||
792 | +echo "configure:8623: checking for ANSI C header files" >&5 | ||
793 | if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then | ||
794 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
795 | else | ||
796 | cat > conftest.$ac_ext <<EOF | ||
797 | -#line 8624 "configure" | ||
798 | +#line 8628 "configure" | ||
799 | #include "confdefs.h" | ||
800 | #include <stdlib.h> | ||
801 | #include <stdarg.h> | ||
802 | @@ -8628,7 +8632,7 @@ else | ||
803 | #include <float.h> | ||
804 | EOF | ||
805 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | ||
806 | -{ (eval echo configure:8632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
807 | +{ (eval echo configure:8636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | ||
808 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | ||
809 | if test -z "$ac_err"; then | ||
810 | rm -rf conftest* | ||
811 | @@ -8645,7 +8649,7 @@ rm -f conftest* | ||
812 | if test $ac_cv_header_stdc = yes; then | ||
813 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. | ||
814 | cat > conftest.$ac_ext <<EOF | ||
815 | -#line 8649 "configure" | ||
816 | +#line 8653 "configure" | ||
817 | #include "confdefs.h" | ||
818 | #include <string.h> | ||
819 | EOF | ||
820 | @@ -8663,7 +8667,7 @@ fi | ||
821 | if test $ac_cv_header_stdc = yes; then | ||
822 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. | ||
823 | cat > conftest.$ac_ext <<EOF | ||
824 | -#line 8667 "configure" | ||
825 | +#line 8671 "configure" | ||
826 | #include "confdefs.h" | ||
827 | #include <stdlib.h> | ||
828 | EOF | ||
829 | @@ -8684,7 +8688,7 @@ if test "$cross_compiling" = yes; then | ||
830 | : | ||
831 | else | ||
832 | cat > conftest.$ac_ext <<EOF | ||
833 | -#line 8688 "configure" | ||
834 | +#line 8692 "configure" | ||
835 | #include "confdefs.h" | ||
836 | #include <ctype.h> | ||
837 | #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') | ||
838 | @@ -8695,7 +8699,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); | ||
839 | exit (0); } | ||
840 | |||
841 | EOF | ||
842 | -if { (eval echo configure:8699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
843 | +if { (eval echo configure:8703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
844 | then | ||
845 | : | ||
846 | else | ||
847 | @@ -8722,12 +8726,12 @@ EOF | ||
848 | fi | ||
849 | |||
850 | echo $ac_n "checking for working const""... $ac_c" 1>&6 | ||
851 | -echo "configure:8726: checking for working const" >&5 | ||
852 | +echo "configure:8730: checking for working const" >&5 | ||
853 | if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then | ||
854 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
855 | else | ||
856 | cat > conftest.$ac_ext <<EOF | ||
857 | -#line 8731 "configure" | ||
858 | +#line 8735 "configure" | ||
859 | #include "confdefs.h" | ||
860 | |||
861 | int main() { | ||
862 | @@ -8776,7 +8780,7 @@ ccp = (char const *const *) p; | ||
863 | |||
864 | ; return 0; } | ||
865 | EOF | ||
866 | -if { (eval echo configure:8780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
867 | +if { (eval echo configure:8784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
868 | rm -rf conftest* | ||
869 | ac_cv_c_const=yes | ||
870 | else | ||
871 | @@ -8800,12 +8804,12 @@ EOF | ||
872 | fi | ||
873 | |||
874 | echo $ac_n "checking for mode_t""... $ac_c" 1>&6 | ||
875 | -echo "configure:8804: checking for mode_t" >&5 | ||
876 | +echo "configure:8808: checking for mode_t" >&5 | ||
877 | if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then | ||
878 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
879 | else | ||
880 | cat > conftest.$ac_ext <<EOF | ||
881 | -#line 8809 "configure" | ||
882 | +#line 8813 "configure" | ||
883 | #include "confdefs.h" | ||
884 | #include <sys/types.h> | ||
885 | #if STDC_HEADERS | ||
886 | @@ -8836,12 +8840,12 @@ EOF | ||
887 | fi | ||
888 | |||
889 | echo $ac_n "checking for off_t""... $ac_c" 1>&6 | ||
890 | -echo "configure:8840: checking for off_t" >&5 | ||
891 | +echo "configure:8844: checking for off_t" >&5 | ||
892 | if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then | ||
893 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
894 | else | ||
895 | cat > conftest.$ac_ext <<EOF | ||
896 | -#line 8845 "configure" | ||
897 | +#line 8849 "configure" | ||
898 | #include "confdefs.h" | ||
899 | #include <sys/types.h> | ||
900 | #if STDC_HEADERS | ||
901 | @@ -8872,12 +8876,12 @@ EOF | ||
902 | fi | ||
903 | |||
904 | echo $ac_n "checking for pid_t""... $ac_c" 1>&6 | ||
905 | -echo "configure:8876: checking for pid_t" >&5 | ||
906 | +echo "configure:8880: checking for pid_t" >&5 | ||
907 | if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then | ||
908 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
909 | else | ||
910 | cat > conftest.$ac_ext <<EOF | ||
911 | -#line 8881 "configure" | ||
912 | +#line 8885 "configure" | ||
913 | #include "confdefs.h" | ||
914 | #include <sys/types.h> | ||
915 | #if STDC_HEADERS | ||
916 | @@ -8908,12 +8912,12 @@ EOF | ||
917 | fi | ||
918 | |||
919 | echo $ac_n "checking for size_t""... $ac_c" 1>&6 | ||
920 | -echo "configure:8912: checking for size_t" >&5 | ||
921 | +echo "configure:8916: checking for size_t" >&5 | ||
922 | if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then | ||
923 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
924 | else | ||
925 | cat > conftest.$ac_ext <<EOF | ||
926 | -#line 8917 "configure" | ||
927 | +#line 8921 "configure" | ||
928 | #include "confdefs.h" | ||
929 | #include <sys/types.h> | ||
930 | #if STDC_HEADERS | ||
931 | @@ -8951,12 +8955,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
932 | cross_compiling=$ac_cv_prog_cxx_cross | ||
933 | |||
934 | echo $ac_n "checking for __stdcall""... $ac_c" 1>&6 | ||
935 | -echo "configure:8955: checking for __stdcall" >&5 | ||
936 | +echo "configure:8959: checking for __stdcall" >&5 | ||
937 | if eval "test \"`echo '$''{'ac_cv___stdcall'+set}'`\" = set"; then | ||
938 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
939 | else | ||
940 | cat > conftest.$ac_ext <<EOF | ||
941 | -#line 8960 "configure" | ||
942 | +#line 8964 "configure" | ||
943 | #include "confdefs.h" | ||
944 | template <typename Method> struct foo; | ||
945 | template <> struct foo<void (*)()> {}; | ||
946 | @@ -8965,7 +8969,7 @@ int main() { | ||
947 | |||
948 | ; return 0; } | ||
949 | EOF | ||
950 | -if { (eval echo configure:8969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
951 | +if { (eval echo configure:8973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
952 | rm -rf conftest* | ||
953 | ac_cv___stdcall=true | ||
954 | else | ||
955 | @@ -8997,12 +9001,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a | ||
956 | cross_compiling=$ac_cv_prog_cc_cross | ||
957 | |||
958 | echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 | ||
959 | -echo "configure:9001: checking for ssize_t" >&5 | ||
960 | +echo "configure:9005: checking for ssize_t" >&5 | ||
961 | if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then | ||
962 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
963 | else | ||
964 | cat > conftest.$ac_ext <<EOF | ||
965 | -#line 9006 "configure" | ||
966 | +#line 9010 "configure" | ||
967 | #include "confdefs.h" | ||
968 | #include <stdio.h> | ||
969 | #include <sys/types.h> | ||
970 | @@ -9010,7 +9014,7 @@ int main() { | ||
971 | ssize_t foo = 0; | ||
972 | ; return 0; } | ||
973 | EOF | ||
974 | -if { (eval echo configure:9014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
975 | +if { (eval echo configure:9018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
976 | rm -rf conftest* | ||
977 | ac_cv_type_ssize_t=true | ||
978 | else | ||
979 | @@ -9035,12 +9039,12 @@ else | ||
980 | echo "$ac_t""no" 1>&6 | ||
981 | fi | ||
982 | echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 | ||
983 | -echo "configure:9039: checking for st_blksize in struct stat" >&5 | ||
984 | +echo "configure:9043: checking for st_blksize in struct stat" >&5 | ||
985 | if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then | ||
986 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
987 | else | ||
988 | cat > conftest.$ac_ext <<EOF | ||
989 | -#line 9044 "configure" | ||
990 | +#line 9048 "configure" | ||
991 | #include "confdefs.h" | ||
992 | #include <sys/types.h> | ||
993 | #include <sys/stat.h> | ||
994 | @@ -9048,7 +9052,7 @@ int main() { | ||
995 | struct stat s; s.st_blksize; | ||
996 | ; return 0; } | ||
997 | EOF | ||
998 | -if { (eval echo configure:9052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
999 | +if { (eval echo configure:9056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1000 | rm -rf conftest* | ||
1001 | ac_cv_struct_st_blksize=yes | ||
1002 | else | ||
1003 | @@ -9072,12 +9076,12 @@ EOF | ||
1004 | fi | ||
1005 | |||
1006 | echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 | ||
1007 | -echo "configure:9076: checking for siginfo_t" >&5 | ||
1008 | +echo "configure:9080: checking for siginfo_t" >&5 | ||
1009 | if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then | ||
1010 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1011 | else | ||
1012 | cat > conftest.$ac_ext <<EOF | ||
1013 | -#line 9081 "configure" | ||
1014 | +#line 9085 "configure" | ||
1015 | #include "confdefs.h" | ||
1016 | #define _POSIX_C_SOURCE 199506L | ||
1017 | #include <signal.h> | ||
1018 | @@ -9085,7 +9089,7 @@ int main() { | ||
1019 | siginfo_t* info; | ||
1020 | ; return 0; } | ||
1021 | EOF | ||
1022 | -if { (eval echo configure:9089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1023 | +if { (eval echo configure:9093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1024 | rm -rf conftest* | ||
1025 | ac_cv_siginfo_t=true | ||
1026 | else | ||
1027 | @@ -9111,72 +9115,8 @@ else | ||
1028 | fi | ||
1029 | |||
1030 | |||
1031 | -echo $ac_n "checking for the size of void*""... $ac_c" 1>&6 | ||
1032 | -echo "configure:9116: checking for the size of void*" >&5 | ||
1033 | -if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_WORD'+set}'`\" = set"; then | ||
1034 | - echo $ac_n "(cached) $ac_c" 1>&6 | ||
1035 | -else | ||
1036 | - | ||
1037 | - moz_cv_size_of_JS_BYTES_PER_WORD= | ||
1038 | - for size in 4 8; do | ||
1039 | - cat > conftest.$ac_ext <<EOF | ||
1040 | -#line 9124 "configure" | ||
1041 | -#include "confdefs.h" | ||
1042 | - | ||
1043 | -int main() { | ||
1044 | - | ||
1045 | - int a[sizeof (void*) == $size ? 1 : -1]; | ||
1046 | - return 0; | ||
1047 | - | ||
1048 | -; return 0; } | ||
1049 | -EOF | ||
1050 | -if { (eval echo configure:9134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1051 | - rm -rf conftest* | ||
1052 | - moz_cv_size_of_JS_BYTES_PER_WORD=$size; break | ||
1053 | -else | ||
1054 | - echo "configure: failed program was:" >&5 | ||
1055 | - cat conftest.$ac_ext >&5 | ||
1056 | -fi | ||
1057 | -rm -f conftest* | ||
1058 | - done | ||
1059 | - if test ! "$moz_cv_size_of_JS_BYTES_PER_WORD"; then | ||
1060 | - { echo "configure: error: No size found for void*" 1>&2; exit 1; } | ||
1061 | - fi | ||
1062 | - | ||
1063 | -fi | ||
1064 | - | ||
1065 | -echo "$ac_t""$moz_cv_size_of_JS_BYTES_PER_WORD" 1>&6 | ||
1066 | -cat >> confdefs.pytmp <<EOF | ||
1067 | - (''' JS_BYTES_PER_WORD ''', r''' $moz_cv_size_of_JS_BYTES_PER_WORD ''') | ||
1068 | -EOF | ||
1069 | -cat >> confdefs.h <<EOF | ||
1070 | -#define JS_BYTES_PER_WORD $moz_cv_size_of_JS_BYTES_PER_WORD | ||
1071 | -EOF | ||
1072 | - | ||
1073 | - | ||
1074 | -if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then | ||
1075 | - cat >> confdefs.pytmp <<\EOF | ||
1076 | - (''' JS_BITS_PER_WORD_LOG2 ''', r''' 5 ''') | ||
1077 | -EOF | ||
1078 | -cat >> confdefs.h <<\EOF | ||
1079 | -#define JS_BITS_PER_WORD_LOG2 5 | ||
1080 | -EOF | ||
1081 | - | ||
1082 | -elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then | ||
1083 | - cat >> confdefs.pytmp <<\EOF | ||
1084 | - (''' JS_BITS_PER_WORD_LOG2 ''', r''' 6 ''') | ||
1085 | -EOF | ||
1086 | -cat >> confdefs.h <<\EOF | ||
1087 | -#define JS_BITS_PER_WORD_LOG2 6 | ||
1088 | -EOF | ||
1089 | - | ||
1090 | -else | ||
1091 | - { echo "configure: error: Unexpected JS_BYTES_PER_WORD" 1>&2; exit 1; } | ||
1092 | -fi | ||
1093 | - | ||
1094 | - | ||
1095 | echo $ac_n "checking for the alignment of void*""... $ac_c" 1>&6 | ||
1096 | -echo "configure:9180: checking for the alignment of void*" >&5 | ||
1097 | +echo "configure:9120: checking for the alignment of void*" >&5 | ||
1098 | if eval "test \"`echo '$''{'moz_cv_align_of_JS_ALIGN_OF_POINTER'+set}'`\" = set"; then | ||
1099 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1100 | else | ||
1101 | @@ -9184,7 +9124,7 @@ else | ||
1102 | moz_cv_align_of_JS_ALIGN_OF_POINTER= | ||
1103 | for align in 2 4 8 16; do | ||
1104 | cat > conftest.$ac_ext <<EOF | ||
1105 | -#line 9188 "configure" | ||
1106 | +#line 9128 "configure" | ||
1107 | #include "confdefs.h" | ||
1108 | |||
1109 | #include <stddef.h> | ||
1110 | @@ -9197,7 +9137,7 @@ int main() { | ||
1111 | |||
1112 | ; return 0; } | ||
1113 | EOF | ||
1114 | -if { (eval echo configure:9201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1115 | +if { (eval echo configure:9141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1116 | rm -rf conftest* | ||
1117 | moz_cv_align_of_JS_ALIGN_OF_POINTER=$align; break | ||
1118 | else | ||
1119 | @@ -9223,7 +9163,7 @@ EOF | ||
1120 | |||
1121 | |||
1122 | echo $ac_n "checking for the size of double""... $ac_c" 1>&6 | ||
1123 | -echo "configure:9227: checking for the size of double" >&5 | ||
1124 | +echo "configure:9167: checking for the size of double" >&5 | ||
1125 | if eval "test \"`echo '$''{'moz_cv_size_of_JS_BYTES_PER_DOUBLE'+set}'`\" = set"; then | ||
1126 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1127 | else | ||
1128 | @@ -9231,7 +9171,7 @@ else | ||
1129 | moz_cv_size_of_JS_BYTES_PER_DOUBLE= | ||
1130 | for size in 6 8 10 12 14; do | ||
1131 | cat > conftest.$ac_ext <<EOF | ||
1132 | -#line 9235 "configure" | ||
1133 | +#line 9175 "configure" | ||
1134 | #include "confdefs.h" | ||
1135 | |||
1136 | int main() { | ||
1137 | @@ -9241,7 +9181,7 @@ int main() { | ||
1138 | |||
1139 | ; return 0; } | ||
1140 | EOF | ||
1141 | -if { (eval echo configure:9245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1142 | +if { (eval echo configure:9185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1143 | rm -rf conftest* | ||
1144 | moz_cv_size_of_JS_BYTES_PER_DOUBLE=$size; break | ||
1145 | else | ||
1146 | @@ -9270,12 +9210,12 @@ EOF | ||
1147 | do | ||
1148 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1149 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1150 | -echo "configure:9274: checking for $ac_hdr" >&5 | ||
1151 | +echo "configure:9214: checking for $ac_hdr" >&5 | ||
1152 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1153 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1154 | else | ||
1155 | cat > conftest.$ac_ext <<EOF | ||
1156 | -#line 9279 "configure" | ||
1157 | +#line 9219 "configure" | ||
1158 | #include "confdefs.h" | ||
1159 | |||
1160 | #include <$ac_hdr> | ||
1161 | @@ -9283,7 +9223,7 @@ int main() { | ||
1162 | |||
1163 | ; return 0; } | ||
1164 | EOF | ||
1165 | -if { (eval echo configure:9287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1166 | +if { (eval echo configure:9227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1167 | rm -rf conftest* | ||
1168 | eval "ac_cv_header_$ac_safe=yes" | ||
1169 | else | ||
1170 | @@ -9326,12 +9266,12 @@ fi | ||
1171 | do | ||
1172 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1173 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1174 | -echo "configure:9330: checking for $ac_hdr" >&5 | ||
1175 | +echo "configure:9270: checking for $ac_hdr" >&5 | ||
1176 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1177 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1178 | else | ||
1179 | cat > conftest.$ac_ext <<EOF | ||
1180 | -#line 9335 "configure" | ||
1181 | +#line 9275 "configure" | ||
1182 | #include "confdefs.h" | ||
1183 | #include <sys/types.h> | ||
1184 | #include <$ac_hdr> | ||
1185 | @@ -9339,7 +9279,7 @@ int main() { | ||
1186 | |||
1187 | ; return 0; } | ||
1188 | EOF | ||
1189 | -if { (eval echo configure:9343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1190 | +if { (eval echo configure:9283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1191 | rm -rf conftest* | ||
1192 | eval "ac_cv_header_$ac_safe=yes" | ||
1193 | else | ||
1194 | @@ -9382,12 +9322,12 @@ fi | ||
1195 | do | ||
1196 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1197 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1198 | -echo "configure:9386: checking for $ac_hdr" >&5 | ||
1199 | +echo "configure:9326: checking for $ac_hdr" >&5 | ||
1200 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1201 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1202 | else | ||
1203 | cat > conftest.$ac_ext <<EOF | ||
1204 | -#line 9391 "configure" | ||
1205 | +#line 9331 "configure" | ||
1206 | #include "confdefs.h" | ||
1207 | |||
1208 | #include <$ac_hdr> | ||
1209 | @@ -9395,7 +9335,7 @@ int main() { | ||
1210 | |||
1211 | ; return 0; } | ||
1212 | EOF | ||
1213 | -if { (eval echo configure:9399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1214 | +if { (eval echo configure:9339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1215 | rm -rf conftest* | ||
1216 | eval "ac_cv_header_$ac_safe=yes" | ||
1217 | else | ||
1218 | @@ -9435,12 +9375,12 @@ EOF | ||
1219 | fi | ||
1220 | |||
1221 | echo $ac_n "checking for uint""... $ac_c" 1>&6 | ||
1222 | -echo "configure:9439: checking for uint" >&5 | ||
1223 | +echo "configure:9379: checking for uint" >&5 | ||
1224 | if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then | ||
1225 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1226 | else | ||
1227 | cat > conftest.$ac_ext <<EOF | ||
1228 | -#line 9444 "configure" | ||
1229 | +#line 9384 "configure" | ||
1230 | #include "confdefs.h" | ||
1231 | #include <stdio.h> | ||
1232 | #include <sys/types.h> | ||
1233 | @@ -9448,7 +9388,7 @@ int main() { | ||
1234 | uint foo = 0; | ||
1235 | ; return 0; } | ||
1236 | EOF | ||
1237 | -if { (eval echo configure:9452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1238 | +if { (eval echo configure:9392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1239 | rm -rf conftest* | ||
1240 | ac_cv_uint=true | ||
1241 | else | ||
1242 | @@ -9473,12 +9413,12 @@ else | ||
1243 | echo "$ac_t""no" 1>&6 | ||
1244 | fi | ||
1245 | echo $ac_n "checking for uint_t""... $ac_c" 1>&6 | ||
1246 | -echo "configure:9477: checking for uint_t" >&5 | ||
1247 | +echo "configure:9417: checking for uint_t" >&5 | ||
1248 | if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then | ||
1249 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1250 | else | ||
1251 | cat > conftest.$ac_ext <<EOF | ||
1252 | -#line 9482 "configure" | ||
1253 | +#line 9422 "configure" | ||
1254 | #include "confdefs.h" | ||
1255 | #include <stdio.h> | ||
1256 | #include <sys/types.h> | ||
1257 | @@ -9486,7 +9426,7 @@ int main() { | ||
1258 | uint_t foo = 0; | ||
1259 | ; return 0; } | ||
1260 | EOF | ||
1261 | -if { (eval echo configure:9490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1262 | +if { (eval echo configure:9430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1263 | rm -rf conftest* | ||
1264 | ac_cv_uint_t=true | ||
1265 | else | ||
1266 | @@ -9520,12 +9460,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
1267 | |||
1268 | |||
1269 | echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 | ||
1270 | -echo "configure:9524: checking for uname.domainname" >&5 | ||
1271 | +echo "configure:9464: checking for uname.domainname" >&5 | ||
1272 | if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then | ||
1273 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1274 | else | ||
1275 | cat > conftest.$ac_ext <<EOF | ||
1276 | -#line 9529 "configure" | ||
1277 | +#line 9469 "configure" | ||
1278 | #include "confdefs.h" | ||
1279 | #include <sys/utsname.h> | ||
1280 | int main() { | ||
1281 | @@ -9533,7 +9473,7 @@ int main() { | ||
1282 | (void)uname(res); if (res != 0) { domain = res->domainname; } | ||
1283 | ; return 0; } | ||
1284 | EOF | ||
1285 | -if { (eval echo configure:9537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1286 | +if { (eval echo configure:9477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1287 | rm -rf conftest* | ||
1288 | ac_cv_have_uname_domainname_field=true | ||
1289 | else | ||
1290 | @@ -9560,12 +9500,12 @@ else | ||
1291 | fi | ||
1292 | |||
1293 | echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 | ||
1294 | -echo "configure:9564: checking for uname.__domainname" >&5 | ||
1295 | +echo "configure:9504: checking for uname.__domainname" >&5 | ||
1296 | if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then | ||
1297 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1298 | else | ||
1299 | cat > conftest.$ac_ext <<EOF | ||
1300 | -#line 9569 "configure" | ||
1301 | +#line 9509 "configure" | ||
1302 | #include "confdefs.h" | ||
1303 | #include <sys/utsname.h> | ||
1304 | int main() { | ||
1305 | @@ -9573,7 +9513,7 @@ int main() { | ||
1306 | (void)uname(res); if (res != 0) { domain = res->__domainname; } | ||
1307 | ; return 0; } | ||
1308 | EOF | ||
1309 | -if { (eval echo configure:9577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1310 | +if { (eval echo configure:9517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1311 | rm -rf conftest* | ||
1312 | ac_cv_have_uname_us_domainname_field=true | ||
1313 | else | ||
1314 | @@ -9609,7 +9549,7 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
1315 | |||
1316 | if test "$GNU_CC"; then | ||
1317 | echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 | ||
1318 | -echo "configure:9613: checking for visibility(hidden) attribute" >&5 | ||
1319 | +echo "configure:9553: checking for visibility(hidden) attribute" >&5 | ||
1320 | if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then | ||
1321 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1322 | else | ||
1323 | @@ -9637,7 +9577,7 @@ EOF | ||
1324 | |||
1325 | |||
1326 | echo $ac_n "checking for visibility(default) attribute""... $ac_c" 1>&6 | ||
1327 | -echo "configure:9641: checking for visibility(default) attribute" >&5 | ||
1328 | +echo "configure:9581: checking for visibility(default) attribute" >&5 | ||
1329 | if eval "test \"`echo '$''{'ac_cv_visibility_default'+set}'`\" = set"; then | ||
1330 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1331 | else | ||
1332 | @@ -9665,7 +9605,7 @@ EOF | ||
1333 | |||
1334 | |||
1335 | echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 | ||
1336 | -echo "configure:9669: checking for visibility pragma support" >&5 | ||
1337 | +echo "configure:9609: checking for visibility pragma support" >&5 | ||
1338 | if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then | ||
1339 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1340 | else | ||
1341 | @@ -9690,7 +9630,7 @@ fi | ||
1342 | echo "$ac_t""$ac_cv_visibility_pragma" 1>&6 | ||
1343 | if test "$ac_cv_visibility_pragma" = "yes"; then | ||
1344 | echo $ac_n "checking For gcc visibility bug with class-level attributes (GCC bug 26905)""... $ac_c" 1>&6 | ||
1345 | -echo "configure:9694: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 | ||
1346 | +echo "configure:9634: checking For gcc visibility bug with class-level attributes (GCC bug 26905)" >&5 | ||
1347 | if eval "test \"`echo '$''{'ac_cv_have_visibility_class_bug'+set}'`\" = set"; then | ||
1348 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1349 | else | ||
1350 | @@ -9718,7 +9658,7 @@ fi | ||
1351 | echo "$ac_t""$ac_cv_have_visibility_class_bug" 1>&6 | ||
1352 | |||
1353 | echo $ac_n "checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)""... $ac_c" 1>&6 | ||
1354 | -echo "configure:9722: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 | ||
1355 | +echo "configure:9662: checking For x86_64 gcc visibility bug with builtins (GCC bug 20297)" >&5 | ||
1356 | if eval "test \"`echo '$''{'ac_cv_have_visibility_builtin_bug'+set}'`\" = set"; then | ||
1357 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1358 | else | ||
1359 | @@ -9770,7 +9710,7 @@ fi # Sun Studio on Solaris | ||
1360 | if test "$GNU_CC"; then | ||
1361 | |||
1362 | echo $ac_n "checking for gcc PR49911""... $ac_c" 1>&6 | ||
1363 | -echo "configure:9774: checking for gcc PR49911" >&5 | ||
1364 | +echo "configure:9714: checking for gcc PR49911" >&5 | ||
1365 | ac_have_gcc_pr49911="no" | ||
1366 | |||
1367 | ac_ext=C | ||
1368 | @@ -9787,7 +9727,7 @@ if test "$cross_compiling" = yes; then | ||
1369 | true | ||
1370 | else | ||
1371 | cat > conftest.$ac_ext <<EOF | ||
1372 | -#line 9791 "configure" | ||
1373 | +#line 9731 "configure" | ||
1374 | #include "confdefs.h" | ||
1375 | |||
1376 | extern "C" void abort(void); | ||
1377 | @@ -9828,7 +9768,7 @@ int main(void) { | ||
1378 | } | ||
1379 | |||
1380 | EOF | ||
1381 | -if { (eval echo configure:9832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
1382 | +if { (eval echo configure:9772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
1383 | then | ||
1384 | true | ||
1385 | else | ||
1386 | @@ -9865,12 +9805,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h | ||
1387 | do | ||
1388 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1389 | echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 | ||
1390 | -echo "configure:9869: checking for $ac_hdr that defines DIR" >&5 | ||
1391 | +echo "configure:9809: checking for $ac_hdr that defines DIR" >&5 | ||
1392 | if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then | ||
1393 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1394 | else | ||
1395 | cat > conftest.$ac_ext <<EOF | ||
1396 | -#line 9874 "configure" | ||
1397 | +#line 9814 "configure" | ||
1398 | #include "confdefs.h" | ||
1399 | #include <sys/types.h> | ||
1400 | #include <$ac_hdr> | ||
1401 | @@ -9878,7 +9818,7 @@ int main() { | ||
1402 | DIR *dirp = 0; | ||
1403 | ; return 0; } | ||
1404 | EOF | ||
1405 | -if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1406 | +if { (eval echo configure:9822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1407 | rm -rf conftest* | ||
1408 | eval "ac_cv_header_dirent_$ac_safe=yes" | ||
1409 | else | ||
1410 | @@ -9906,7 +9846,7 @@ done | ||
1411 | # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. | ||
1412 | if test $ac_header_dirent = dirent.h; then | ||
1413 | echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 | ||
1414 | -echo "configure:9910: checking for opendir in -ldir" >&5 | ||
1415 | +echo "configure:9850: checking for opendir in -ldir" >&5 | ||
1416 | ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` | ||
1417 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1418 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1419 | @@ -9914,7 +9854,7 @@ else | ||
1420 | ac_save_LIBS="$LIBS" | ||
1421 | LIBS="-ldir $LIBS" | ||
1422 | cat > conftest.$ac_ext <<EOF | ||
1423 | -#line 9918 "configure" | ||
1424 | +#line 9858 "configure" | ||
1425 | #include "confdefs.h" | ||
1426 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1427 | /* We use char because int might match the return type of a gcc2 | ||
1428 | @@ -9925,7 +9865,7 @@ int main() { | ||
1429 | opendir() | ||
1430 | ; return 0; } | ||
1431 | EOF | ||
1432 | -if { (eval echo configure:9929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1433 | +if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1434 | rm -rf conftest* | ||
1435 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1436 | else | ||
1437 | @@ -9947,7 +9887,7 @@ fi | ||
1438 | |||
1439 | else | ||
1440 | echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 | ||
1441 | -echo "configure:9951: checking for opendir in -lx" >&5 | ||
1442 | +echo "configure:9891: checking for opendir in -lx" >&5 | ||
1443 | ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` | ||
1444 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1445 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1446 | @@ -9955,7 +9895,7 @@ else | ||
1447 | ac_save_LIBS="$LIBS" | ||
1448 | LIBS="-lx $LIBS" | ||
1449 | cat > conftest.$ac_ext <<EOF | ||
1450 | -#line 9959 "configure" | ||
1451 | +#line 9899 "configure" | ||
1452 | #include "confdefs.h" | ||
1453 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1454 | /* We use char because int might match the return type of a gcc2 | ||
1455 | @@ -9966,7 +9906,7 @@ int main() { | ||
1456 | opendir() | ||
1457 | ; return 0; } | ||
1458 | EOF | ||
1459 | -if { (eval echo configure:9970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1460 | +if { (eval echo configure:9910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1461 | rm -rf conftest* | ||
1462 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1463 | else | ||
1464 | @@ -10000,12 +9940,12 @@ esac | ||
1465 | do | ||
1466 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1467 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1468 | -echo "configure:10004: checking for $ac_hdr" >&5 | ||
1469 | +echo "configure:9944: checking for $ac_hdr" >&5 | ||
1470 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1471 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1472 | else | ||
1473 | cat > conftest.$ac_ext <<EOF | ||
1474 | -#line 10009 "configure" | ||
1475 | +#line 9949 "configure" | ||
1476 | #include "confdefs.h" | ||
1477 | |||
1478 | #include <$ac_hdr> | ||
1479 | @@ -10013,7 +9953,7 @@ int main() { | ||
1480 | |||
1481 | ; return 0; } | ||
1482 | EOF | ||
1483 | -if { (eval echo configure:10017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1484 | +if { (eval echo configure:9957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1485 | rm -rf conftest* | ||
1486 | eval "ac_cv_header_$ac_safe=yes" | ||
1487 | else | ||
1488 | @@ -10048,12 +9988,12 @@ EOF | ||
1489 | do | ||
1490 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1491 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1492 | -echo "configure:10052: checking for $ac_hdr" >&5 | ||
1493 | +echo "configure:9992: checking for $ac_hdr" >&5 | ||
1494 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1495 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1496 | else | ||
1497 | cat > conftest.$ac_ext <<EOF | ||
1498 | -#line 10057 "configure" | ||
1499 | +#line 9997 "configure" | ||
1500 | #include "confdefs.h" | ||
1501 | |||
1502 | #include <$ac_hdr> | ||
1503 | @@ -10061,7 +10001,7 @@ int main() { | ||
1504 | |||
1505 | ; return 0; } | ||
1506 | EOF | ||
1507 | -if { (eval echo configure:10065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1508 | +if { (eval echo configure:10005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1509 | rm -rf conftest* | ||
1510 | eval "ac_cv_header_$ac_safe=yes" | ||
1511 | else | ||
1512 | @@ -10095,12 +10035,12 @@ EOF | ||
1513 | do | ||
1514 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1515 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1516 | -echo "configure:10099: checking for $ac_hdr" >&5 | ||
1517 | +echo "configure:10039: checking for $ac_hdr" >&5 | ||
1518 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1519 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1520 | else | ||
1521 | cat > conftest.$ac_ext <<EOF | ||
1522 | -#line 10104 "configure" | ||
1523 | +#line 10044 "configure" | ||
1524 | #include "confdefs.h" | ||
1525 | |||
1526 | #include <$ac_hdr> | ||
1527 | @@ -10108,7 +10048,7 @@ int main() { | ||
1528 | |||
1529 | ; return 0; } | ||
1530 | EOF | ||
1531 | -if { (eval echo configure:10112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1532 | +if { (eval echo configure:10052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1533 | rm -rf conftest* | ||
1534 | eval "ac_cv_header_$ac_safe=yes" | ||
1535 | else | ||
1536 | @@ -10141,12 +10081,12 @@ EOF | ||
1537 | do | ||
1538 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1539 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1540 | -echo "configure:10145: checking for $ac_hdr" >&5 | ||
1541 | +echo "configure:10085: checking for $ac_hdr" >&5 | ||
1542 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1543 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1544 | else | ||
1545 | cat > conftest.$ac_ext <<EOF | ||
1546 | -#line 10150 "configure" | ||
1547 | +#line 10090 "configure" | ||
1548 | #include "confdefs.h" | ||
1549 | |||
1550 | #include <$ac_hdr> | ||
1551 | @@ -10154,7 +10094,7 @@ int main() { | ||
1552 | |||
1553 | ; return 0; } | ||
1554 | EOF | ||
1555 | -if { (eval echo configure:10158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1556 | +if { (eval echo configure:10098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1557 | rm -rf conftest* | ||
1558 | eval "ac_cv_header_$ac_safe=yes" | ||
1559 | else | ||
1560 | @@ -10188,12 +10128,12 @@ EOF | ||
1561 | do | ||
1562 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1563 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1564 | -echo "configure:10192: checking for $ac_hdr" >&5 | ||
1565 | +echo "configure:10132: checking for $ac_hdr" >&5 | ||
1566 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1567 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1568 | else | ||
1569 | cat > conftest.$ac_ext <<EOF | ||
1570 | -#line 10197 "configure" | ||
1571 | +#line 10137 "configure" | ||
1572 | #include "confdefs.h" | ||
1573 | |||
1574 | #include <$ac_hdr> | ||
1575 | @@ -10201,7 +10141,7 @@ int main() { | ||
1576 | |||
1577 | ; return 0; } | ||
1578 | EOF | ||
1579 | -if { (eval echo configure:10205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1580 | +if { (eval echo configure:10145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1581 | rm -rf conftest* | ||
1582 | eval "ac_cv_header_$ac_safe=yes" | ||
1583 | else | ||
1584 | @@ -10241,12 +10181,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
1585 | NEW_H=new.h | ||
1586 | ac_safe=`echo "new" | sed 'y%./+-%__p_%'` | ||
1587 | echo $ac_n "checking for new""... $ac_c" 1>&6 | ||
1588 | -echo "configure:10245: checking for new" >&5 | ||
1589 | +echo "configure:10185: checking for new" >&5 | ||
1590 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1591 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1592 | else | ||
1593 | cat > conftest.$ac_ext <<EOF | ||
1594 | -#line 10250 "configure" | ||
1595 | +#line 10190 "configure" | ||
1596 | #include "confdefs.h" | ||
1597 | |||
1598 | #include <new> | ||
1599 | @@ -10254,7 +10194,7 @@ int main() { | ||
1600 | |||
1601 | ; return 0; } | ||
1602 | EOF | ||
1603 | -if { (eval echo configure:10258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1604 | +if { (eval echo configure:10198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1605 | rm -rf conftest* | ||
1606 | eval "ac_cv_header_$ac_safe=yes" | ||
1607 | else | ||
1608 | @@ -10298,12 +10238,12 @@ fi | ||
1609 | if test "x$enable_dtrace" = "xyes"; then | ||
1610 | ac_safe=`echo "sys/sdt.h" | sed 'y%./+-%__p_%'` | ||
1611 | echo $ac_n "checking for sys/sdt.h""... $ac_c" 1>&6 | ||
1612 | -echo "configure:10302: checking for sys/sdt.h" >&5 | ||
1613 | +echo "configure:10242: checking for sys/sdt.h" >&5 | ||
1614 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1615 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1616 | else | ||
1617 | cat > conftest.$ac_ext <<EOF | ||
1618 | -#line 10307 "configure" | ||
1619 | +#line 10247 "configure" | ||
1620 | #include "confdefs.h" | ||
1621 | |||
1622 | #include <sys/sdt.h> | ||
1623 | @@ -10311,7 +10251,7 @@ int main() { | ||
1624 | |||
1625 | ; return 0; } | ||
1626 | EOF | ||
1627 | -if { (eval echo configure:10315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1628 | +if { (eval echo configure:10255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1629 | rm -rf conftest* | ||
1630 | eval "ac_cv_header_$ac_safe=yes" | ||
1631 | else | ||
1632 | @@ -10353,12 +10293,12 @@ case $target in | ||
1633 | do | ||
1634 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | ||
1635 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | ||
1636 | -echo "configure:10357: checking for $ac_hdr" >&5 | ||
1637 | +echo "configure:10297: checking for $ac_hdr" >&5 | ||
1638 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1639 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1640 | else | ||
1641 | cat > conftest.$ac_ext <<EOF | ||
1642 | -#line 10362 "configure" | ||
1643 | +#line 10302 "configure" | ||
1644 | #include "confdefs.h" | ||
1645 | |||
1646 | #include <$ac_hdr> | ||
1647 | @@ -10366,7 +10306,7 @@ int main() { | ||
1648 | |||
1649 | ; return 0; } | ||
1650 | EOF | ||
1651 | -if { (eval echo configure:10370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1652 | +if { (eval echo configure:10310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1653 | rm -rf conftest* | ||
1654 | eval "ac_cv_header_$ac_safe=yes" | ||
1655 | else | ||
1656 | @@ -10418,12 +10358,12 @@ CFLAGS="$CFLAGS $LINUX_HEADERS_INCLUDES" | ||
1657 | |||
1658 | ac_safe=`echo "linux/perf_event.h" | sed 'y%./+-%__p_%'` | ||
1659 | echo $ac_n "checking for linux/perf_event.h""... $ac_c" 1>&6 | ||
1660 | -echo "configure:10422: checking for linux/perf_event.h" >&5 | ||
1661 | +echo "configure:10362: checking for linux/perf_event.h" >&5 | ||
1662 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1663 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1664 | else | ||
1665 | cat > conftest.$ac_ext <<EOF | ||
1666 | -#line 10427 "configure" | ||
1667 | +#line 10367 "configure" | ||
1668 | #include "confdefs.h" | ||
1669 | |||
1670 | #include <linux/perf_event.h> | ||
1671 | @@ -10431,7 +10371,7 @@ int main() { | ||
1672 | |||
1673 | ; return 0; } | ||
1674 | EOF | ||
1675 | -if { (eval echo configure:10435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1676 | +if { (eval echo configure:10375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1677 | rm -rf conftest* | ||
1678 | eval "ac_cv_header_$ac_safe=yes" | ||
1679 | else | ||
1680 | @@ -10446,19 +10386,19 @@ fi | ||
1681 | if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | ||
1682 | echo "$ac_t""yes" 1>&6 | ||
1683 | echo $ac_n "checking for perf_event_open system call""... $ac_c" 1>&6 | ||
1684 | -echo "configure:10450: checking for perf_event_open system call" >&5 | ||
1685 | +echo "configure:10390: checking for perf_event_open system call" >&5 | ||
1686 | if eval "test \"`echo '$''{'ac_cv_perf_event_open'+set}'`\" = set"; then | ||
1687 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1688 | else | ||
1689 | cat > conftest.$ac_ext <<EOF | ||
1690 | -#line 10455 "configure" | ||
1691 | +#line 10395 "configure" | ||
1692 | #include "confdefs.h" | ||
1693 | #include <asm/unistd.h> | ||
1694 | int main() { | ||
1695 | return sizeof(__NR_perf_event_open); | ||
1696 | ; return 0; } | ||
1697 | EOF | ||
1698 | -if { (eval echo configure:10462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1699 | +if { (eval echo configure:10402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1700 | rm -rf conftest* | ||
1701 | ac_cv_perf_event_open=yes | ||
1702 | else | ||
1703 | @@ -10494,7 +10434,7 @@ case $target in | ||
1704 | ;; | ||
1705 | *) | ||
1706 | echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 | ||
1707 | -echo "configure:10498: checking for gethostbyname_r in -lc_r" >&5 | ||
1708 | +echo "configure:10438: checking for gethostbyname_r in -lc_r" >&5 | ||
1709 | ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` | ||
1710 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1711 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1712 | @@ -10502,7 +10442,7 @@ else | ||
1713 | ac_save_LIBS="$LIBS" | ||
1714 | LIBS="-lc_r $LIBS" | ||
1715 | cat > conftest.$ac_ext <<EOF | ||
1716 | -#line 10506 "configure" | ||
1717 | +#line 10446 "configure" | ||
1718 | #include "confdefs.h" | ||
1719 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1720 | /* We use char because int might match the return type of a gcc2 | ||
1721 | @@ -10513,7 +10453,7 @@ int main() { | ||
1722 | gethostbyname_r() | ||
1723 | ; return 0; } | ||
1724 | EOF | ||
1725 | -if { (eval echo configure:10517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1726 | +if { (eval echo configure:10457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1727 | rm -rf conftest* | ||
1728 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1729 | else | ||
1730 | @@ -10554,14 +10494,14 @@ case $target in | ||
1731 | *) | ||
1732 | |||
1733 | echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 | ||
1734 | -echo "configure:10558: checking for library containing dlopen" >&5 | ||
1735 | +echo "configure:10498: checking for library containing dlopen" >&5 | ||
1736 | if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then | ||
1737 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1738 | else | ||
1739 | ac_func_search_save_LIBS="$LIBS" | ||
1740 | ac_cv_search_dlopen="no" | ||
1741 | cat > conftest.$ac_ext <<EOF | ||
1742 | -#line 10565 "configure" | ||
1743 | +#line 10505 "configure" | ||
1744 | #include "confdefs.h" | ||
1745 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1746 | /* We use char because int might match the return type of a gcc2 | ||
1747 | @@ -10572,7 +10512,7 @@ int main() { | ||
1748 | dlopen() | ||
1749 | ; return 0; } | ||
1750 | EOF | ||
1751 | -if { (eval echo configure:10576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1752 | +if { (eval echo configure:10516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1753 | rm -rf conftest* | ||
1754 | ac_cv_search_dlopen="none required" | ||
1755 | else | ||
1756 | @@ -10583,7 +10523,7 @@ rm -f conftest* | ||
1757 | test "$ac_cv_search_dlopen" = "no" && for i in dl; do | ||
1758 | LIBS="-l$i $ac_func_search_save_LIBS" | ||
1759 | cat > conftest.$ac_ext <<EOF | ||
1760 | -#line 10587 "configure" | ||
1761 | +#line 10527 "configure" | ||
1762 | #include "confdefs.h" | ||
1763 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1764 | /* We use char because int might match the return type of a gcc2 | ||
1765 | @@ -10594,7 +10534,7 @@ int main() { | ||
1766 | dlopen() | ||
1767 | ; return 0; } | ||
1768 | EOF | ||
1769 | -if { (eval echo configure:10598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1770 | +if { (eval echo configure:10538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1771 | rm -rf conftest* | ||
1772 | ac_cv_search_dlopen="-l$i" | ||
1773 | break | ||
1774 | @@ -10612,12 +10552,12 @@ if test "$ac_cv_search_dlopen" != "no"; then | ||
1775 | test "$ac_cv_search_dlopen" = "none required" || LIBS="$ac_cv_search_dlopen $LIBS" | ||
1776 | ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` | ||
1777 | echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 | ||
1778 | -echo "configure:10616: checking for dlfcn.h" >&5 | ||
1779 | +echo "configure:10556: checking for dlfcn.h" >&5 | ||
1780 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
1781 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1782 | else | ||
1783 | cat > conftest.$ac_ext <<EOF | ||
1784 | -#line 10621 "configure" | ||
1785 | +#line 10561 "configure" | ||
1786 | #include "confdefs.h" | ||
1787 | |||
1788 | #include <dlfcn.h> | ||
1789 | @@ -10625,7 +10565,7 @@ int main() { | ||
1790 | |||
1791 | ; return 0; } | ||
1792 | EOF | ||
1793 | -if { (eval echo configure:10629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1794 | +if { (eval echo configure:10569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
1795 | rm -rf conftest* | ||
1796 | eval "ac_cv_header_$ac_safe=yes" | ||
1797 | else | ||
1798 | @@ -10662,12 +10602,12 @@ CFLAGS="$CFLAGS -D_GNU_SOURCE" | ||
1799 | for ac_func in dladdr | ||
1800 | do | ||
1801 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
1802 | -echo "configure:10666: checking for $ac_func" >&5 | ||
1803 | +echo "configure:10606: checking for $ac_func" >&5 | ||
1804 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
1805 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1806 | else | ||
1807 | cat > conftest.$ac_ext <<EOF | ||
1808 | -#line 10671 "configure" | ||
1809 | +#line 10611 "configure" | ||
1810 | #include "confdefs.h" | ||
1811 | /* System header to define __stub macros and hopefully few prototypes, | ||
1812 | which can conflict with char $ac_func(); below. */ | ||
1813 | @@ -10690,7 +10630,7 @@ $ac_func(); | ||
1814 | |||
1815 | ; return 0; } | ||
1816 | EOF | ||
1817 | -if { (eval echo configure:10694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1818 | +if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1819 | rm -rf conftest* | ||
1820 | eval "ac_cv_func_$ac_func=yes" | ||
1821 | else | ||
1822 | @@ -10724,7 +10664,7 @@ if test ! "$GNU_CXX"; then | ||
1823 | case $target in | ||
1824 | *-aix*) | ||
1825 | echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 | ||
1826 | -echo "configure:10728: checking for demangle in -lC_r" >&5 | ||
1827 | +echo "configure:10668: checking for demangle in -lC_r" >&5 | ||
1828 | ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` | ||
1829 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1830 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1831 | @@ -10732,7 +10672,7 @@ else | ||
1832 | ac_save_LIBS="$LIBS" | ||
1833 | LIBS="-lC_r $LIBS" | ||
1834 | cat > conftest.$ac_ext <<EOF | ||
1835 | -#line 10736 "configure" | ||
1836 | +#line 10676 "configure" | ||
1837 | #include "confdefs.h" | ||
1838 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1839 | /* We use char because int might match the return type of a gcc2 | ||
1840 | @@ -10743,7 +10683,7 @@ int main() { | ||
1841 | demangle() | ||
1842 | ; return 0; } | ||
1843 | EOF | ||
1844 | -if { (eval echo configure:10747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1845 | +if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1846 | rm -rf conftest* | ||
1847 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1848 | else | ||
1849 | @@ -10776,7 +10716,7 @@ fi | ||
1850 | ;; | ||
1851 | *) | ||
1852 | echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 | ||
1853 | -echo "configure:10780: checking for demangle in -lC" >&5 | ||
1854 | +echo "configure:10720: checking for demangle in -lC" >&5 | ||
1855 | ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` | ||
1856 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1857 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1858 | @@ -10784,7 +10724,7 @@ else | ||
1859 | ac_save_LIBS="$LIBS" | ||
1860 | LIBS="-lC $LIBS" | ||
1861 | cat > conftest.$ac_ext <<EOF | ||
1862 | -#line 10788 "configure" | ||
1863 | +#line 10728 "configure" | ||
1864 | #include "confdefs.h" | ||
1865 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1866 | /* We use char because int might match the return type of a gcc2 | ||
1867 | @@ -10795,7 +10735,7 @@ int main() { | ||
1868 | demangle() | ||
1869 | ; return 0; } | ||
1870 | EOF | ||
1871 | -if { (eval echo configure:10799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1872 | +if { (eval echo configure:10739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1873 | rm -rf conftest* | ||
1874 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1875 | else | ||
1876 | @@ -10834,7 +10774,7 @@ case $target in | ||
1877 | ;; | ||
1878 | *) | ||
1879 | echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 | ||
1880 | -echo "configure:10838: checking for socket in -lsocket" >&5 | ||
1881 | +echo "configure:10778: checking for socket in -lsocket" >&5 | ||
1882 | ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` | ||
1883 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
1884 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1885 | @@ -10842,7 +10782,7 @@ else | ||
1886 | ac_save_LIBS="$LIBS" | ||
1887 | LIBS="-lsocket $LIBS" | ||
1888 | cat > conftest.$ac_ext <<EOF | ||
1889 | -#line 10846 "configure" | ||
1890 | +#line 10786 "configure" | ||
1891 | #include "confdefs.h" | ||
1892 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
1893 | /* We use char because int might match the return type of a gcc2 | ||
1894 | @@ -10853,7 +10793,7 @@ int main() { | ||
1895 | socket() | ||
1896 | ; return 0; } | ||
1897 | EOF | ||
1898 | -if { (eval echo configure:10857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1899 | +if { (eval echo configure:10797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
1900 | rm -rf conftest* | ||
1901 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
1902 | else | ||
1903 | @@ -10892,7 +10832,7 @@ darwin*) | ||
1904 | *) | ||
1905 | |||
1906 | echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 | ||
1907 | -echo "configure:10896: checking for pthread_create in -lpthreads" >&5 | ||
1908 | +echo "configure:10836: checking for pthread_create in -lpthreads" >&5 | ||
1909 | echo " | ||
1910 | #include <pthread.h> | ||
1911 | #include <stdlib.h> | ||
1912 | @@ -10915,7 +10855,7 @@ echo " | ||
1913 | echo "$ac_t""no" 1>&6 | ||
1914 | |||
1915 | echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 | ||
1916 | -echo "configure:10919: checking for pthread_create in -lpthread" >&5 | ||
1917 | +echo "configure:10859: checking for pthread_create in -lpthread" >&5 | ||
1918 | echo " | ||
1919 | #include <pthread.h> | ||
1920 | #include <stdlib.h> | ||
1921 | @@ -10938,7 +10878,7 @@ echo " | ||
1922 | echo "$ac_t""no" 1>&6 | ||
1923 | |||
1924 | echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 | ||
1925 | -echo "configure:10942: checking for pthread_create in -lc_r" >&5 | ||
1926 | +echo "configure:10882: checking for pthread_create in -lc_r" >&5 | ||
1927 | echo " | ||
1928 | #include <pthread.h> | ||
1929 | #include <stdlib.h> | ||
1930 | @@ -10961,7 +10901,7 @@ echo " | ||
1931 | echo "$ac_t""no" 1>&6 | ||
1932 | |||
1933 | echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 | ||
1934 | -echo "configure:10965: checking for pthread_create in -lc" >&5 | ||
1935 | +echo "configure:10905: checking for pthread_create in -lc" >&5 | ||
1936 | echo " | ||
1937 | #include <pthread.h> | ||
1938 | #include <stdlib.h> | ||
1939 | @@ -11020,7 +10960,7 @@ then | ||
1940 | rm -f conftest* | ||
1941 | ac_cv_have_dash_pthread=no | ||
1942 | echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 | ||
1943 | -echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 | ||
1944 | +echo "configure:10964: checking whether ${CC-cc} accepts -pthread" >&5 | ||
1945 | echo 'int main() { return 0; }' | cat > conftest.c | ||
1946 | ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 | ||
1947 | if test $? -eq 0; then | ||
1948 | @@ -11043,7 +10983,7 @@ echo "configure:11024: checking whether ${CC-cc} accepts -pthread" >&5 | ||
1949 | ac_cv_have_dash_pthreads=no | ||
1950 | if test "$ac_cv_have_dash_pthread" = "no"; then | ||
1951 | echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 | ||
1952 | -echo "configure:11047: checking whether ${CC-cc} accepts -pthreads" >&5 | ||
1953 | +echo "configure:10987: checking whether ${CC-cc} accepts -pthreads" >&5 | ||
1954 | echo 'int main() { return 0; }' | cat > conftest.c | ||
1955 | ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 | ||
1956 | if test $? -eq 0; then | ||
1957 | @@ -11148,13 +11088,13 @@ fi | ||
1958 | |||
1959 | if test $ac_cv_prog_gcc = yes; then | ||
1960 | echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 | ||
1961 | -echo "configure:11152: checking whether ${CC-cc} needs -traditional" >&5 | ||
1962 | +echo "configure:11092: checking whether ${CC-cc} needs -traditional" >&5 | ||
1963 | if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then | ||
1964 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1965 | else | ||
1966 | ac_pattern="Autoconf.*'x'" | ||
1967 | cat > conftest.$ac_ext <<EOF | ||
1968 | -#line 11158 "configure" | ||
1969 | +#line 11098 "configure" | ||
1970 | #include "confdefs.h" | ||
1971 | #include <sgtty.h> | ||
1972 | Autoconf TIOCGETP | ||
1973 | @@ -11172,7 +11112,7 @@ rm -f conftest* | ||
1974 | |||
1975 | if test $ac_cv_prog_gcc_traditional = no; then | ||
1976 | cat > conftest.$ac_ext <<EOF | ||
1977 | -#line 11176 "configure" | ||
1978 | +#line 11116 "configure" | ||
1979 | #include "confdefs.h" | ||
1980 | #include <termio.h> | ||
1981 | Autoconf TCGETA | ||
1982 | @@ -11194,7 +11134,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 | ||
1983 | fi | ||
1984 | |||
1985 | echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 | ||
1986 | -echo "configure:11198: checking for 8-bit clean memcmp" >&5 | ||
1987 | +echo "configure:11138: checking for 8-bit clean memcmp" >&5 | ||
1988 | if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then | ||
1989 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
1990 | else | ||
1991 | @@ -11202,7 +11142,7 @@ else | ||
1992 | ac_cv_func_memcmp_clean=no | ||
1993 | else | ||
1994 | cat > conftest.$ac_ext <<EOF | ||
1995 | -#line 11206 "configure" | ||
1996 | +#line 11146 "configure" | ||
1997 | #include "confdefs.h" | ||
1998 | |||
1999 | main() | ||
2000 | @@ -11212,7 +11152,7 @@ main() | ||
2001 | } | ||
2002 | |||
2003 | EOF | ||
2004 | -if { (eval echo configure:11216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2005 | +if { (eval echo configure:11156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2006 | then | ||
2007 | ac_cv_func_memcmp_clean=yes | ||
2008 | else | ||
2009 | @@ -11234,12 +11174,12 @@ for ac_func in fchmod flockfile getc_unlocked _getc_nolock getpagesize \ | ||
2010 | stat64 statvfs statvfs64 strerror strtok_r truncate64 | ||
2011 | do | ||
2012 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
2013 | -echo "configure:11238: checking for $ac_func" >&5 | ||
2014 | +echo "configure:11178: checking for $ac_func" >&5 | ||
2015 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
2016 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2017 | else | ||
2018 | cat > conftest.$ac_ext <<EOF | ||
2019 | -#line 11243 "configure" | ||
2020 | +#line 11183 "configure" | ||
2021 | #include "confdefs.h" | ||
2022 | /* System header to define __stub macros and hopefully few prototypes, | ||
2023 | which can conflict with char $ac_func(); below. */ | ||
2024 | @@ -11262,7 +11202,7 @@ $ac_func(); | ||
2025 | |||
2026 | ; return 0; } | ||
2027 | EOF | ||
2028 | -if { (eval echo configure:11266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2029 | +if { (eval echo configure:11206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2030 | rm -rf conftest* | ||
2031 | eval "ac_cv_func_$ac_func=yes" | ||
2032 | else | ||
2033 | @@ -11291,14 +11231,14 @@ done | ||
2034 | |||
2035 | |||
2036 | cat > conftest.$ac_ext <<EOF | ||
2037 | -#line 11295 "configure" | ||
2038 | +#line 11235 "configure" | ||
2039 | #include "confdefs.h" | ||
2040 | #include <windows.h> | ||
2041 | int main() { | ||
2042 | SYSTEMTIME st;FILETIME ft;SystemTimeToFileTime(&st,&ft); | ||
2043 | ; return 0; } | ||
2044 | EOF | ||
2045 | -if { (eval echo configure:11302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2046 | +if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2047 | rm -rf conftest* | ||
2048 | ac_cv_have_systemtimetofiletime="yes" | ||
2049 | else | ||
2050 | @@ -11318,14 +11258,14 @@ EOF | ||
2051 | |||
2052 | fi | ||
2053 | cat > conftest.$ac_ext <<EOF | ||
2054 | -#line 11322 "configure" | ||
2055 | +#line 11262 "configure" | ||
2056 | #include "confdefs.h" | ||
2057 | #include <windows.h> | ||
2058 | int main() { | ||
2059 | FILETIME ft;GetSystemTimeAsFileTime(&ft); | ||
2060 | ; return 0; } | ||
2061 | EOF | ||
2062 | -if { (eval echo configure:11329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2063 | +if { (eval echo configure:11269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2064 | rm -rf conftest* | ||
2065 | ac_cv_have_getsystemtimeasfiletime="yes" | ||
2066 | else | ||
2067 | @@ -11355,19 +11295,19 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
2068 | cross_compiling=$ac_cv_prog_cxx_cross | ||
2069 | |||
2070 | echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 | ||
2071 | -echo "configure:11359: checking for wcrtomb" >&5 | ||
2072 | +echo "configure:11299: checking for wcrtomb" >&5 | ||
2073 | if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then | ||
2074 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2075 | else | ||
2076 | cat > conftest.$ac_ext <<EOF | ||
2077 | -#line 11364 "configure" | ||
2078 | +#line 11304 "configure" | ||
2079 | #include "confdefs.h" | ||
2080 | #include <wchar.h> | ||
2081 | int main() { | ||
2082 | mbstate_t ps={0};wcrtomb(0,'f',&ps); | ||
2083 | ; return 0; } | ||
2084 | EOF | ||
2085 | -if { (eval echo configure:11371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2086 | +if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2087 | rm -rf conftest* | ||
2088 | ac_cv_have_wcrtomb="yes" | ||
2089 | else | ||
2090 | @@ -11390,19 +11330,19 @@ EOF | ||
2091 | |||
2092 | fi | ||
2093 | echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 | ||
2094 | -echo "configure:11394: checking for mbrtowc" >&5 | ||
2095 | +echo "configure:11334: checking for mbrtowc" >&5 | ||
2096 | if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then | ||
2097 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2098 | else | ||
2099 | cat > conftest.$ac_ext <<EOF | ||
2100 | -#line 11399 "configure" | ||
2101 | +#line 11339 "configure" | ||
2102 | #include "confdefs.h" | ||
2103 | #include <wchar.h> | ||
2104 | int main() { | ||
2105 | mbstate_t ps={0};mbrtowc(0,0,0,&ps); | ||
2106 | ; return 0; } | ||
2107 | EOF | ||
2108 | -if { (eval echo configure:11406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2109 | +if { (eval echo configure:11346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2110 | rm -rf conftest* | ||
2111 | ac_cv_have_mbrtowc="yes" | ||
2112 | else | ||
2113 | @@ -11434,12 +11374,12 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
2114 | fi | ||
2115 | |||
2116 | echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 | ||
2117 | -echo "configure:11438: checking for res_ninit()" >&5 | ||
2118 | +echo "configure:11378: checking for res_ninit()" >&5 | ||
2119 | if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then | ||
2120 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2121 | else | ||
2122 | cat > conftest.$ac_ext <<EOF | ||
2123 | -#line 11443 "configure" | ||
2124 | +#line 11383 "configure" | ||
2125 | #include "confdefs.h" | ||
2126 | |||
2127 | #ifdef linux | ||
2128 | @@ -11451,7 +11391,7 @@ int main() { | ||
2129 | int foo = res_ninit(&_res); | ||
2130 | ; return 0; } | ||
2131 | EOF | ||
2132 | -if { (eval echo configure:11455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2133 | +if { (eval echo configure:11395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2134 | rm -rf conftest* | ||
2135 | ac_cv_func_res_ninit=yes | ||
2136 | else | ||
2137 | @@ -11484,12 +11424,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes | ||
2138 | cross_compiling=$ac_cv_prog_cxx_cross | ||
2139 | |||
2140 | echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 | ||
2141 | -echo "configure:11488: checking for gnu_get_libc_version()" >&5 | ||
2142 | +echo "configure:11428: checking for gnu_get_libc_version()" >&5 | ||
2143 | if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then | ||
2144 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2145 | else | ||
2146 | cat > conftest.$ac_ext <<EOF | ||
2147 | -#line 11493 "configure" | ||
2148 | +#line 11433 "configure" | ||
2149 | #include "confdefs.h" | ||
2150 | |||
2151 | #ifdef HAVE_GNU_LIBC_VERSION_H | ||
2152 | @@ -11500,7 +11440,7 @@ int main() { | ||
2153 | const char *glibc_version = gnu_get_libc_version(); | ||
2154 | ; return 0; } | ||
2155 | EOF | ||
2156 | -if { (eval echo configure:11504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2157 | +if { (eval echo configure:11444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2158 | rm -rf conftest* | ||
2159 | ac_cv_func_gnu_get_libc_version=yes | ||
2160 | else | ||
2161 | @@ -11534,7 +11474,7 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
2162 | |||
2163 | |||
2164 | echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 | ||
2165 | -echo "configure:11538: checking for an implementation of va_copy()" >&5 | ||
2166 | +echo "configure:11478: checking for an implementation of va_copy()" >&5 | ||
2167 | if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then | ||
2168 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2169 | else | ||
2170 | @@ -11544,7 +11484,7 @@ else | ||
2171 | |||
2172 | else | ||
2173 | cat > conftest.$ac_ext <<EOF | ||
2174 | -#line 11548 "configure" | ||
2175 | +#line 11488 "configure" | ||
2176 | #include "confdefs.h" | ||
2177 | |||
2178 | #include <stdarg.h> | ||
2179 | @@ -11558,7 +11498,7 @@ else | ||
2180 | } | ||
2181 | int main() { f (0, 42); return 0; } | ||
2182 | EOF | ||
2183 | -if { (eval echo configure:11562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2184 | +if { (eval echo configure:11502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2185 | then | ||
2186 | ac_cv_va_copy=yes | ||
2187 | else | ||
2188 | @@ -11575,7 +11515,7 @@ fi | ||
2189 | |||
2190 | echo "$ac_t""$ac_cv_va_copy" 1>&6 | ||
2191 | echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 | ||
2192 | -echo "configure:11579: checking for an implementation of __va_copy()" >&5 | ||
2193 | +echo "configure:11519: checking for an implementation of __va_copy()" >&5 | ||
2194 | if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then | ||
2195 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2196 | else | ||
2197 | @@ -11585,7 +11525,7 @@ else | ||
2198 | |||
2199 | else | ||
2200 | cat > conftest.$ac_ext <<EOF | ||
2201 | -#line 11589 "configure" | ||
2202 | +#line 11529 "configure" | ||
2203 | #include "confdefs.h" | ||
2204 | |||
2205 | #include <stdarg.h> | ||
2206 | @@ -11599,7 +11539,7 @@ else | ||
2207 | } | ||
2208 | int main() { f (0, 42); return 0; } | ||
2209 | EOF | ||
2210 | -if { (eval echo configure:11603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2211 | +if { (eval echo configure:11543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2212 | then | ||
2213 | ac_cv___va_copy=yes | ||
2214 | else | ||
2215 | @@ -11616,7 +11556,7 @@ fi | ||
2216 | |||
2217 | echo "$ac_t""$ac_cv___va_copy" 1>&6 | ||
2218 | echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 | ||
2219 | -echo "configure:11620: checking whether va_lists can be copied by value" >&5 | ||
2220 | +echo "configure:11560: checking whether va_lists can be copied by value" >&5 | ||
2221 | if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then | ||
2222 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2223 | else | ||
2224 | @@ -11626,7 +11566,7 @@ else | ||
2225 | |||
2226 | else | ||
2227 | cat > conftest.$ac_ext <<EOF | ||
2228 | -#line 11630 "configure" | ||
2229 | +#line 11570 "configure" | ||
2230 | #include "confdefs.h" | ||
2231 | |||
2232 | #include <stdarg.h> | ||
2233 | @@ -11640,7 +11580,7 @@ else | ||
2234 | } | ||
2235 | int main() { f (0, 42); return 0; } | ||
2236 | EOF | ||
2237 | -if { (eval echo configure:11644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2238 | +if { (eval echo configure:11584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2239 | then | ||
2240 | ac_cv_va_val_copy=yes | ||
2241 | else | ||
2242 | @@ -11710,12 +11650,12 @@ ARM_ABI_PREFIX= | ||
2243 | if test "$GNU_CC"; then | ||
2244 | if test "$CPU_ARCH" = "arm" ; then | ||
2245 | echo $ac_n "checking for ARM EABI""... $ac_c" 1>&6 | ||
2246 | -echo "configure:11714: checking for ARM EABI" >&5 | ||
2247 | +echo "configure:11654: checking for ARM EABI" >&5 | ||
2248 | if eval "test \"`echo '$''{'ac_cv_gcc_arm_eabi'+set}'`\" = set"; then | ||
2249 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2250 | else | ||
2251 | cat > conftest.$ac_ext <<EOF | ||
2252 | -#line 11719 "configure" | ||
2253 | +#line 11659 "configure" | ||
2254 | #include "confdefs.h" | ||
2255 | |||
2256 | int main() { | ||
2257 | @@ -11728,7 +11668,7 @@ int main() { | ||
2258 | |||
2259 | ; return 0; } | ||
2260 | EOF | ||
2261 | -if { (eval echo configure:11732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2262 | +if { (eval echo configure:11672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2263 | rm -rf conftest* | ||
2264 | ac_cv_gcc_arm_eabi="yes" | ||
2265 | else | ||
2266 | @@ -11753,12 +11693,12 @@ echo "$ac_t""$ac_cv_gcc_arm_eabi" 1>&6 | ||
2267 | fi | ||
2268 | |||
2269 | echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 | ||
2270 | -echo "configure:11757: checking for modern C++ template specialization syntax support" >&5 | ||
2271 | +echo "configure:11697: checking for modern C++ template specialization syntax support" >&5 | ||
2272 | if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then | ||
2273 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2274 | else | ||
2275 | cat > conftest.$ac_ext <<EOF | ||
2276 | -#line 11762 "configure" | ||
2277 | +#line 11702 "configure" | ||
2278 | #include "confdefs.h" | ||
2279 | template <class T> struct X { int a; }; | ||
2280 | class Y {}; | ||
2281 | @@ -11768,7 +11708,7 @@ X<int> int_x; | ||
2282 | X<Y> y_x; | ||
2283 | ; return 0; } | ||
2284 | EOF | ||
2285 | -if { (eval echo configure:11772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2286 | +if { (eval echo configure:11712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2287 | rm -rf conftest* | ||
2288 | ac_cv_cpp_modern_specialize_template_syntax=yes | ||
2289 | else | ||
2290 | @@ -11786,12 +11726,12 @@ if test "$ac_cv_cpp_modern_specialize_template_syntax" = no ; then | ||
2291 | fi | ||
2292 | |||
2293 | echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 | ||
2294 | -echo "configure:11790: checking whether partial template specialization works" >&5 | ||
2295 | +echo "configure:11730: checking whether partial template specialization works" >&5 | ||
2296 | if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then | ||
2297 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2298 | else | ||
2299 | cat > conftest.$ac_ext <<EOF | ||
2300 | -#line 11795 "configure" | ||
2301 | +#line 11735 "configure" | ||
2302 | #include "confdefs.h" | ||
2303 | template <class T> class Foo {}; | ||
2304 | template <class T> class Foo<T*> {}; | ||
2305 | @@ -11799,7 +11739,7 @@ int main() { | ||
2306 | return 0; | ||
2307 | ; return 0; } | ||
2308 | EOF | ||
2309 | -if { (eval echo configure:11803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2310 | +if { (eval echo configure:11743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2311 | rm -rf conftest* | ||
2312 | ac_cv_cpp_partial_specialization=yes | ||
2313 | else | ||
2314 | @@ -11823,12 +11763,12 @@ EOF | ||
2315 | fi | ||
2316 | |||
2317 | echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 | ||
2318 | -echo "configure:11827: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 | ||
2319 | +echo "configure:11767: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 | ||
2320 | if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then | ||
2321 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2322 | else | ||
2323 | cat > conftest.$ac_ext <<EOF | ||
2324 | -#line 11832 "configure" | ||
2325 | +#line 11772 "configure" | ||
2326 | #include "confdefs.h" | ||
2327 | class X { | ||
2328 | public: int go(const X&) {return 3;} | ||
2329 | @@ -11844,7 +11784,7 @@ int main() { | ||
2330 | X x; Y y; y.jo(x); | ||
2331 | ; return 0; } | ||
2332 | EOF | ||
2333 | -if { (eval echo configure:11848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2334 | +if { (eval echo configure:11788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2335 | rm -rf conftest* | ||
2336 | ac_cv_cpp_ambiguity_resolving_using=yes | ||
2337 | else | ||
2338 | @@ -11868,7 +11808,7 @@ EOF | ||
2339 | fi | ||
2340 | |||
2341 | echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 | ||
2342 | -echo "configure:11872: checking for C++ dynamic_cast to void*" >&5 | ||
2343 | +echo "configure:11812: checking for C++ dynamic_cast to void*" >&5 | ||
2344 | if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then | ||
2345 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2346 | else | ||
2347 | @@ -11876,7 +11816,7 @@ else | ||
2348 | ac_cv_cpp_dynamic_cast_void_ptr=no | ||
2349 | else | ||
2350 | cat > conftest.$ac_ext <<EOF | ||
2351 | -#line 11880 "configure" | ||
2352 | +#line 11820 "configure" | ||
2353 | #include "confdefs.h" | ||
2354 | class X { int i; public: virtual ~X() { } }; | ||
2355 | class Y { int j; public: virtual ~Y() { } }; | ||
2356 | @@ -11892,7 +11832,7 @@ class X { int i; public: virtual ~X() { } }; | ||
2357 | ((void*)&mdo == dynamic_cast<void*>(suby)))); | ||
2358 | } | ||
2359 | EOF | ||
2360 | -if { (eval echo configure:11896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2361 | +if { (eval echo configure:11836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2362 | then | ||
2363 | ac_cv_cpp_dynamic_cast_void_ptr=yes | ||
2364 | else | ||
2365 | @@ -11919,19 +11859,19 @@ fi | ||
2366 | |||
2367 | |||
2368 | echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 | ||
2369 | -echo "configure:11923: checking whether C++ requires implementation of unused virtual methods" >&5 | ||
2370 | +echo "configure:11863: checking whether C++ requires implementation of unused virtual methods" >&5 | ||
2371 | if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then | ||
2372 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2373 | else | ||
2374 | cat > conftest.$ac_ext <<EOF | ||
2375 | -#line 11928 "configure" | ||
2376 | +#line 11868 "configure" | ||
2377 | #include "confdefs.h" | ||
2378 | class X {private: virtual void never_called();}; | ||
2379 | int main() { | ||
2380 | X x; | ||
2381 | ; return 0; } | ||
2382 | EOF | ||
2383 | -if { (eval echo configure:11935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2384 | +if { (eval echo configure:11875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2385 | rm -rf conftest* | ||
2386 | ac_cv_cpp_unused_required=no | ||
2387 | else | ||
2388 | @@ -11957,12 +11897,12 @@ fi | ||
2389 | |||
2390 | |||
2391 | echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 | ||
2392 | -echo "configure:11961: checking for trouble comparing to zero near std::operator!=()" >&5 | ||
2393 | +echo "configure:11901: checking for trouble comparing to zero near std::operator!=()" >&5 | ||
2394 | if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then | ||
2395 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2396 | else | ||
2397 | cat > conftest.$ac_ext <<EOF | ||
2398 | -#line 11966 "configure" | ||
2399 | +#line 11906 "configure" | ||
2400 | #include "confdefs.h" | ||
2401 | #include <algorithm> | ||
2402 | template <class T> class Foo {}; | ||
2403 | @@ -11973,7 +11913,7 @@ int main() { | ||
2404 | Foo<int> f; return (0 != f); | ||
2405 | ; return 0; } | ||
2406 | EOF | ||
2407 | -if { (eval echo configure:11977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2408 | +if { (eval echo configure:11917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2409 | rm -rf conftest* | ||
2410 | ac_cv_trouble_comparing_to_zero=no | ||
2411 | else | ||
2412 | @@ -12003,19 +11943,19 @@ fi | ||
2413 | _SAVE_LDFLAGS=$LDFLAGS | ||
2414 | LDFLAGS="$LDFLAGS $DSO_PIC_CFLAGS $DSO_LDOPTS $MOZ_OPTIMIZE_LDFLAGS" | ||
2415 | echo $ac_n "checking for __thread keyword for TLS variables""... $ac_c" 1>&6 | ||
2416 | -echo "configure:12007: checking for __thread keyword for TLS variables" >&5 | ||
2417 | +echo "configure:11947: checking for __thread keyword for TLS variables" >&5 | ||
2418 | if eval "test \"`echo '$''{'ac_cv_thread_keyword'+set}'`\" = set"; then | ||
2419 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2420 | else | ||
2421 | cat > conftest.$ac_ext <<EOF | ||
2422 | -#line 12012 "configure" | ||
2423 | +#line 11952 "configure" | ||
2424 | #include "confdefs.h" | ||
2425 | __thread bool tlsIsMainThread = false; | ||
2426 | int main() { | ||
2427 | return tlsIsMainThread; | ||
2428 | ; return 0; } | ||
2429 | EOF | ||
2430 | -if { (eval echo configure:12019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2431 | +if { (eval echo configure:11959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2432 | rm -rf conftest* | ||
2433 | ac_cv_thread_keyword=yes | ||
2434 | else | ||
2435 | @@ -12055,12 +11995,12 @@ fi | ||
2436 | MALLOC_H= | ||
2437 | ac_safe=`echo "malloc.h" | sed 'y%./+-%__p_%'` | ||
2438 | echo $ac_n "checking for malloc.h""... $ac_c" 1>&6 | ||
2439 | -echo "configure:12059: checking for malloc.h" >&5 | ||
2440 | +echo "configure:11999: checking for malloc.h" >&5 | ||
2441 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2442 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2443 | else | ||
2444 | cat > conftest.$ac_ext <<EOF | ||
2445 | -#line 12064 "configure" | ||
2446 | +#line 12004 "configure" | ||
2447 | #include "confdefs.h" | ||
2448 | |||
2449 | #include <malloc.h> | ||
2450 | @@ -12068,7 +12008,7 @@ int main() { | ||
2451 | |||
2452 | ; return 0; } | ||
2453 | EOF | ||
2454 | -if { (eval echo configure:12072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2455 | +if { (eval echo configure:12012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2456 | rm -rf conftest* | ||
2457 | eval "ac_cv_header_$ac_safe=yes" | ||
2458 | else | ||
2459 | @@ -12091,12 +12031,12 @@ fi | ||
2460 | if test "$MALLOC_H" = ""; then | ||
2461 | ac_safe=`echo "malloc/malloc.h" | sed 'y%./+-%__p_%'` | ||
2462 | echo $ac_n "checking for malloc/malloc.h""... $ac_c" 1>&6 | ||
2463 | -echo "configure:12095: checking for malloc/malloc.h" >&5 | ||
2464 | +echo "configure:12035: checking for malloc/malloc.h" >&5 | ||
2465 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2466 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2467 | else | ||
2468 | cat > conftest.$ac_ext <<EOF | ||
2469 | -#line 12100 "configure" | ||
2470 | +#line 12040 "configure" | ||
2471 | #include "confdefs.h" | ||
2472 | |||
2473 | #include <malloc/malloc.h> | ||
2474 | @@ -12104,7 +12044,7 @@ int main() { | ||
2475 | |||
2476 | ; return 0; } | ||
2477 | EOF | ||
2478 | -if { (eval echo configure:12108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2479 | +if { (eval echo configure:12048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2480 | rm -rf conftest* | ||
2481 | eval "ac_cv_header_$ac_safe=yes" | ||
2482 | else | ||
2483 | @@ -12127,12 +12067,12 @@ fi | ||
2484 | if test "$MALLOC_H" = ""; then | ||
2485 | ac_safe=`echo "sys/malloc.h" | sed 'y%./+-%__p_%'` | ||
2486 | echo $ac_n "checking for sys/malloc.h""... $ac_c" 1>&6 | ||
2487 | -echo "configure:12131: checking for sys/malloc.h" >&5 | ||
2488 | +echo "configure:12071: checking for sys/malloc.h" >&5 | ||
2489 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2490 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2491 | else | ||
2492 | cat > conftest.$ac_ext <<EOF | ||
2493 | -#line 12136 "configure" | ||
2494 | +#line 12076 "configure" | ||
2495 | #include "confdefs.h" | ||
2496 | |||
2497 | #include <sys/malloc.h> | ||
2498 | @@ -12140,7 +12080,7 @@ int main() { | ||
2499 | |||
2500 | ; return 0; } | ||
2501 | EOF | ||
2502 | -if { (eval echo configure:12144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2503 | +if { (eval echo configure:12084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2504 | rm -rf conftest* | ||
2505 | eval "ac_cv_header_$ac_safe=yes" | ||
2506 | else | ||
2507 | @@ -12176,12 +12116,12 @@ MOZ_ALLOCATING_FUNCS="strndup posix_memalign memalign valloc" | ||
2508 | for ac_func in strndup posix_memalign memalign valloc | ||
2509 | do | ||
2510 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
2511 | -echo "configure:12180: checking for $ac_func" >&5 | ||
2512 | +echo "configure:12120: checking for $ac_func" >&5 | ||
2513 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
2514 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2515 | else | ||
2516 | cat > conftest.$ac_ext <<EOF | ||
2517 | -#line 12185 "configure" | ||
2518 | +#line 12125 "configure" | ||
2519 | #include "confdefs.h" | ||
2520 | /* System header to define __stub macros and hopefully few prototypes, | ||
2521 | which can conflict with char $ac_func(); below. */ | ||
2522 | @@ -12207,7 +12147,7 @@ $ac_func(); | ||
2523 | |||
2524 | ; return 0; } | ||
2525 | EOF | ||
2526 | -if { (eval echo configure:12211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2527 | +if { (eval echo configure:12151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2528 | rm -rf conftest* | ||
2529 | eval "ac_cv_func_$ac_func=yes" | ||
2530 | else | ||
2531 | @@ -12237,19 +12177,19 @@ done | ||
2532 | |||
2533 | |||
2534 | echo $ac_n "checking for __attribute__((always_inline))""... $ac_c" 1>&6 | ||
2535 | -echo "configure:12241: checking for __attribute__((always_inline))" >&5 | ||
2536 | +echo "configure:12181: checking for __attribute__((always_inline))" >&5 | ||
2537 | if eval "test \"`echo '$''{'ac_cv_attribute_always_inline'+set}'`\" = set"; then | ||
2538 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2539 | else | ||
2540 | cat > conftest.$ac_ext <<EOF | ||
2541 | -#line 12246 "configure" | ||
2542 | +#line 12186 "configure" | ||
2543 | #include "confdefs.h" | ||
2544 | inline void f(void) __attribute__((always_inline)); | ||
2545 | int main() { | ||
2546 | |||
2547 | ; return 0; } | ||
2548 | EOF | ||
2549 | -if { (eval echo configure:12253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2550 | +if { (eval echo configure:12193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2551 | rm -rf conftest* | ||
2552 | ac_cv_attribute_always_inline=yes | ||
2553 | else | ||
2554 | @@ -12264,19 +12204,19 @@ fi | ||
2555 | echo "$ac_t""$ac_cv_attribute_always_inline" 1>&6 | ||
2556 | |||
2557 | echo $ac_n "checking for __attribute__((malloc))""... $ac_c" 1>&6 | ||
2558 | -echo "configure:12268: checking for __attribute__((malloc))" >&5 | ||
2559 | +echo "configure:12208: checking for __attribute__((malloc))" >&5 | ||
2560 | if eval "test \"`echo '$''{'ac_cv_attribute_malloc'+set}'`\" = set"; then | ||
2561 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2562 | else | ||
2563 | cat > conftest.$ac_ext <<EOF | ||
2564 | -#line 12273 "configure" | ||
2565 | +#line 12213 "configure" | ||
2566 | #include "confdefs.h" | ||
2567 | void* f(int) __attribute__((malloc)); | ||
2568 | int main() { | ||
2569 | |||
2570 | ; return 0; } | ||
2571 | EOF | ||
2572 | -if { (eval echo configure:12280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2573 | +if { (eval echo configure:12220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2574 | rm -rf conftest* | ||
2575 | ac_cv_attribute_malloc=yes | ||
2576 | else | ||
2577 | @@ -12291,19 +12231,19 @@ fi | ||
2578 | echo "$ac_t""$ac_cv_attribute_malloc" 1>&6 | ||
2579 | |||
2580 | echo $ac_n "checking for __attribute__((warn_unused_result))""... $ac_c" 1>&6 | ||
2581 | -echo "configure:12295: checking for __attribute__((warn_unused_result))" >&5 | ||
2582 | +echo "configure:12235: checking for __attribute__((warn_unused_result))" >&5 | ||
2583 | if eval "test \"`echo '$''{'ac_cv_attribute_warn_unused'+set}'`\" = set"; then | ||
2584 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2585 | else | ||
2586 | cat > conftest.$ac_ext <<EOF | ||
2587 | -#line 12300 "configure" | ||
2588 | +#line 12240 "configure" | ||
2589 | #include "confdefs.h" | ||
2590 | int f(void) __attribute__((warn_unused_result)); | ||
2591 | int main() { | ||
2592 | |||
2593 | ; return 0; } | ||
2594 | EOF | ||
2595 | -if { (eval echo configure:12307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2596 | +if { (eval echo configure:12247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2597 | rm -rf conftest* | ||
2598 | ac_cv_attribute_warn_unused=yes | ||
2599 | else | ||
2600 | @@ -12327,19 +12267,19 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
2601 | |||
2602 | |||
2603 | echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 | ||
2604 | -echo "configure:12331: checking for LC_MESSAGES" >&5 | ||
2605 | +echo "configure:12271: checking for LC_MESSAGES" >&5 | ||
2606 | if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then | ||
2607 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2608 | else | ||
2609 | cat > conftest.$ac_ext <<EOF | ||
2610 | -#line 12336 "configure" | ||
2611 | +#line 12276 "configure" | ||
2612 | #include "confdefs.h" | ||
2613 | #include <locale.h> | ||
2614 | int main() { | ||
2615 | int category = LC_MESSAGES; | ||
2616 | ; return 0; } | ||
2617 | EOF | ||
2618 | -if { (eval echo configure:12343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2619 | +if { (eval echo configure:12283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2620 | rm -rf conftest* | ||
2621 | ac_cv_i18n_lc_messages=yes | ||
2622 | else | ||
2623 | @@ -12365,12 +12305,12 @@ fi | ||
2624 | for ac_func in localeconv | ||
2625 | do | ||
2626 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
2627 | -echo "configure:12369: checking for $ac_func" >&5 | ||
2628 | +echo "configure:12309: checking for $ac_func" >&5 | ||
2629 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
2630 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2631 | else | ||
2632 | cat > conftest.$ac_ext <<EOF | ||
2633 | -#line 12374 "configure" | ||
2634 | +#line 12314 "configure" | ||
2635 | #include "confdefs.h" | ||
2636 | /* System header to define __stub macros and hopefully few prototypes, | ||
2637 | which can conflict with char $ac_func(); below. */ | ||
2638 | @@ -12393,7 +12333,7 @@ $ac_func(); | ||
2639 | |||
2640 | ; return 0; } | ||
2641 | EOF | ||
2642 | -if { (eval echo configure:12397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2643 | +if { (eval echo configure:12337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2644 | rm -rf conftest* | ||
2645 | eval "ac_cv_func_$ac_func=yes" | ||
2646 | else | ||
2647 | @@ -12580,7 +12520,7 @@ fi | ||
2648 | # Extract the first word of "nspr-config", so it can be a program name with args. | ||
2649 | set dummy nspr-config; ac_word=$2 | ||
2650 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
2651 | -echo "configure:12584: checking for $ac_word" >&5 | ||
2652 | +echo "configure:12524: checking for $ac_word" >&5 | ||
2653 | if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then | ||
2654 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2655 | else | ||
2656 | @@ -12615,7 +12555,7 @@ fi | ||
2657 | |||
2658 | min_nspr_version=$NSPR_MINVER | ||
2659 | echo $ac_n "checking for NSPR - version >= $min_nspr_version""... $ac_c" 1>&6 | ||
2660 | -echo "configure:12619: checking for NSPR - version >= $min_nspr_version" >&5 | ||
2661 | +echo "configure:12559: checking for NSPR - version >= $min_nspr_version" >&5 | ||
2662 | |||
2663 | no_nspr="" | ||
2664 | if test "$NSPR_CONFIG" != "no"; then | ||
2665 | @@ -12678,7 +12618,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then | ||
2666 | _SAVE_CFLAGS=$CFLAGS | ||
2667 | CFLAGS="$CFLAGS $NSPR_CFLAGS" | ||
2668 | cat > conftest.$ac_ext <<EOF | ||
2669 | -#line 12682 "configure" | ||
2670 | +#line 12622 "configure" | ||
2671 | #include "confdefs.h" | ||
2672 | #include "prlog.h" | ||
2673 | int main() { | ||
2674 | @@ -12687,7 +12627,7 @@ int main() { | ||
2675 | #endif | ||
2676 | ; return 0; } | ||
2677 | EOF | ||
2678 | -if { (eval echo configure:12691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2679 | +if { (eval echo configure:12631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2680 | rm -rf conftest* | ||
2681 | MOZ_NATIVE_NSPR=1 | ||
2682 | else | ||
2683 | @@ -12729,7 +12669,7 @@ if test -z "$MOZ_ZLIB_LIBS$MOZ_ZLIB_CFLAGS$SKIP_LIBRARY_CHECKS"; then | ||
2684 | MOZ_NATIVE_ZLIB= | ||
2685 | else | ||
2686 | echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 | ||
2687 | -echo "configure:12733: checking for gzread in -lz" >&5 | ||
2688 | +echo "configure:12673: checking for gzread in -lz" >&5 | ||
2689 | ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` | ||
2690 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
2691 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2692 | @@ -12737,7 +12677,7 @@ else | ||
2693 | ac_save_LIBS="$LIBS" | ||
2694 | LIBS="-lz $LIBS" | ||
2695 | cat > conftest.$ac_ext <<EOF | ||
2696 | -#line 12741 "configure" | ||
2697 | +#line 12681 "configure" | ||
2698 | #include "confdefs.h" | ||
2699 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
2700 | /* We use char because int might match the return type of a gcc2 | ||
2701 | @@ -12748,7 +12688,7 @@ int main() { | ||
2702 | gzread() | ||
2703 | ; return 0; } | ||
2704 | EOF | ||
2705 | -if { (eval echo configure:12752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2706 | +if { (eval echo configure:12692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2707 | rm -rf conftest* | ||
2708 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
2709 | else | ||
2710 | @@ -12772,7 +12712,7 @@ fi | ||
2711 | if test "$MOZ_NATIVE_ZLIB" = 1; then | ||
2712 | MOZZLIBNUM=`echo $MOZZLIB | awk -F. '{printf "0x%x\n", ((($1 * 16 + $2) * 16) + $3) * 16 + $4}'` | ||
2713 | cat > conftest.$ac_ext <<EOF | ||
2714 | -#line 12776 "configure" | ||
2715 | +#line 12716 "configure" | ||
2716 | #include "confdefs.h" | ||
2717 | #include <stdio.h> | ||
2718 | #include <string.h> | ||
2719 | @@ -12783,7 +12723,7 @@ int main() { | ||
2720 | #endif | ||
2721 | ; return 0; } | ||
2722 | EOF | ||
2723 | -if { (eval echo configure:12787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2724 | +if { (eval echo configure:12727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2725 | rm -rf conftest* | ||
2726 | MOZ_NATIVE_ZLIB=1 | ||
2727 | else | ||
2728 | @@ -12829,7 +12769,7 @@ if test -n "$MOZ_NATIVE_FFI"; then | ||
2729 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
2730 | set dummy pkg-config; ac_word=$2 | ||
2731 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
2732 | -echo "configure:12833: checking for $ac_word" >&5 | ||
2733 | +echo "configure:12773: checking for $ac_word" >&5 | ||
2734 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
2735 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2736 | else | ||
2737 | @@ -12873,19 +12813,19 @@ fi | ||
2738 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2739 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
2740 | echo $ac_n "checking for libffi > 3.0.9""... $ac_c" 1>&6 | ||
2741 | -echo "configure:12877: checking for libffi > 3.0.9" >&5 | ||
2742 | +echo "configure:12817: checking for libffi > 3.0.9" >&5 | ||
2743 | |||
2744 | if $PKG_CONFIG --exists "libffi > 3.0.9" ; then | ||
2745 | echo "$ac_t""yes" 1>&6 | ||
2746 | succeeded=yes | ||
2747 | |||
2748 | echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 | ||
2749 | -echo "configure:12884: checking MOZ_FFI_CFLAGS" >&5 | ||
2750 | +echo "configure:12824: checking MOZ_FFI_CFLAGS" >&5 | ||
2751 | MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi > 3.0.9"` | ||
2752 | echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 | ||
2753 | |||
2754 | echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 | ||
2755 | -echo "configure:12889: checking MOZ_FFI_LIBS" >&5 | ||
2756 | +echo "configure:12829: checking MOZ_FFI_LIBS" >&5 | ||
2757 | ## Remove evil flags like -Wl,--export-dynamic | ||
2758 | MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi > 3.0.9\" |sed s/-Wl,--export-dynamic//g`" | ||
2759 | echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 | ||
2760 | @@ -12921,7 +12861,7 @@ echo "configure:12889: checking MOZ_FFI_LIBS" >&5 | ||
2761 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
2762 | set dummy pkg-config; ac_word=$2 | ||
2763 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
2764 | -echo "configure:12925: checking for $ac_word" >&5 | ||
2765 | +echo "configure:12865: checking for $ac_word" >&5 | ||
2766 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then | ||
2767 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2768 | else | ||
2769 | @@ -12965,19 +12905,19 @@ fi | ||
2770 | PKG_CONFIG_MIN_VERSION=0.9.0 | ||
2771 | if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | ||
2772 | echo $ac_n "checking for libffi >= 3.0.9""... $ac_c" 1>&6 | ||
2773 | -echo "configure:12969: checking for libffi >= 3.0.9" >&5 | ||
2774 | +echo "configure:12909: checking for libffi >= 3.0.9" >&5 | ||
2775 | |||
2776 | if $PKG_CONFIG --exists "libffi >= 3.0.9" ; then | ||
2777 | echo "$ac_t""yes" 1>&6 | ||
2778 | succeeded=yes | ||
2779 | |||
2780 | echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6 | ||
2781 | -echo "configure:12976: checking MOZ_FFI_CFLAGS" >&5 | ||
2782 | +echo "configure:12916: checking MOZ_FFI_CFLAGS" >&5 | ||
2783 | MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.9"` | ||
2784 | echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6 | ||
2785 | |||
2786 | echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6 | ||
2787 | -echo "configure:12981: checking MOZ_FFI_LIBS" >&5 | ||
2788 | +echo "configure:12921: checking MOZ_FFI_LIBS" >&5 | ||
2789 | ## Remove evil flags like -Wl,--export-dynamic | ||
2790 | MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi >= 3.0.9\" |sed s/-Wl,--export-dynamic//g`" | ||
2791 | echo "$ac_t""$MOZ_FFI_LIBS" 1>&6 | ||
2792 | @@ -13112,18 +13052,18 @@ MOZ_DEBUG_DISABLE_DEFS="-DNDEBUG -DTRIMMED" | ||
2793 | |||
2794 | if test -n "$MOZ_DEBUG"; then | ||
2795 | echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 | ||
2796 | -echo "configure:13116: checking for valid debug flags" >&5 | ||
2797 | +echo "configure:13056: checking for valid debug flags" >&5 | ||
2798 | _SAVE_CFLAGS=$CFLAGS | ||
2799 | CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" | ||
2800 | cat > conftest.$ac_ext <<EOF | ||
2801 | -#line 13120 "configure" | ||
2802 | +#line 13060 "configure" | ||
2803 | #include "confdefs.h" | ||
2804 | #include <stdio.h> | ||
2805 | int main() { | ||
2806 | printf("Hello World\n"); | ||
2807 | ; return 0; } | ||
2808 | EOF | ||
2809 | -if { (eval echo configure:13127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2810 | +if { (eval echo configure:13067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2811 | rm -rf conftest* | ||
2812 | _results=yes | ||
2813 | else | ||
2814 | @@ -13201,18 +13141,18 @@ fi | ||
2815 | if test "$COMPILE_ENVIRONMENT"; then | ||
2816 | if test -n "$MOZ_OPTIMIZE"; then | ||
2817 | echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 | ||
2818 | -echo "configure:13205: checking for valid optimization flags" >&5 | ||
2819 | +echo "configure:13145: checking for valid optimization flags" >&5 | ||
2820 | _SAVE_CFLAGS=$CFLAGS | ||
2821 | CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" | ||
2822 | cat > conftest.$ac_ext <<EOF | ||
2823 | -#line 13209 "configure" | ||
2824 | +#line 13149 "configure" | ||
2825 | #include "confdefs.h" | ||
2826 | #include <stdio.h> | ||
2827 | int main() { | ||
2828 | printf("Hello World\n"); | ||
2829 | ; return 0; } | ||
2830 | EOF | ||
2831 | -if { (eval echo configure:13216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2832 | +if { (eval echo configure:13156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2833 | rm -rf conftest* | ||
2834 | _results=yes | ||
2835 | else | ||
2836 | @@ -13364,7 +13304,7 @@ EOF | ||
2837 | fi | ||
2838 | else | ||
2839 | echo $ac_n "checking size of int *""... $ac_c" 1>&6 | ||
2840 | -echo "configure:13368: checking size of int *" >&5 | ||
2841 | +echo "configure:13308: checking size of int *" >&5 | ||
2842 | if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then | ||
2843 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2844 | else | ||
2845 | @@ -13372,7 +13312,7 @@ else | ||
2846 | ac_cv_sizeof_int_p=4 | ||
2847 | else | ||
2848 | cat > conftest.$ac_ext <<EOF | ||
2849 | -#line 13376 "configure" | ||
2850 | +#line 13316 "configure" | ||
2851 | #include "confdefs.h" | ||
2852 | #include <stdio.h> | ||
2853 | int main() | ||
2854 | @@ -13383,7 +13323,7 @@ int main() | ||
2855 | return(0); | ||
2856 | } | ||
2857 | EOF | ||
2858 | -if { (eval echo configure:13387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2859 | +if { (eval echo configure:13327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | ||
2860 | then | ||
2861 | ac_cv_sizeof_int_p=`cat conftestval` | ||
2862 | else | ||
2863 | @@ -13687,12 +13627,12 @@ fi | ||
2864 | if test -n "$MOZ_VALGRIND"; then | ||
2865 | ac_safe=`echo "valgrind/valgrind.h" | sed 'y%./+-%__p_%'` | ||
2866 | echo $ac_n "checking for valgrind/valgrind.h""... $ac_c" 1>&6 | ||
2867 | -echo "configure:13691: checking for valgrind/valgrind.h" >&5 | ||
2868 | +echo "configure:13631: checking for valgrind/valgrind.h" >&5 | ||
2869 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2870 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2871 | else | ||
2872 | cat > conftest.$ac_ext <<EOF | ||
2873 | -#line 13696 "configure" | ||
2874 | +#line 13636 "configure" | ||
2875 | #include "confdefs.h" | ||
2876 | |||
2877 | #include <valgrind/valgrind.h> | ||
2878 | @@ -13700,7 +13640,7 @@ int main() { | ||
2879 | |||
2880 | ; return 0; } | ||
2881 | EOF | ||
2882 | -if { (eval echo configure:13704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2883 | +if { (eval echo configure:13644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2884 | rm -rf conftest* | ||
2885 | eval "ac_cv_header_$ac_safe=yes" | ||
2886 | else | ||
2887 | @@ -13973,7 +13913,7 @@ do | ||
2888 | # Extract the first word of "$ac_prog", so it can be a program name with args. | ||
2889 | set dummy $ac_prog; ac_word=$2 | ||
2890 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | ||
2891 | -echo "configure:13977: checking for $ac_word" >&5 | ||
2892 | +echo "configure:13917: checking for $ac_word" >&5 | ||
2893 | if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then | ||
2894 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2895 | else | ||
2896 | @@ -14099,12 +14039,12 @@ cross_compiling=$ac_cv_prog_cxx_cross | ||
2897 | for ac_func in __cxa_demangle | ||
2898 | do | ||
2899 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
2900 | -echo "configure:14103: checking for $ac_func" >&5 | ||
2901 | +echo "configure:14043: checking for $ac_func" >&5 | ||
2902 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
2903 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2904 | else | ||
2905 | cat > conftest.$ac_ext <<EOF | ||
2906 | -#line 14108 "configure" | ||
2907 | +#line 14048 "configure" | ||
2908 | #include "confdefs.h" | ||
2909 | /* System header to define __stub macros and hopefully few prototypes, | ||
2910 | which can conflict with char $ac_func(); below. */ | ||
2911 | @@ -14130,7 +14070,7 @@ $ac_func(); | ||
2912 | |||
2913 | ; return 0; } | ||
2914 | EOF | ||
2915 | -if { (eval echo configure:14134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2916 | +if { (eval echo configure:14074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2917 | rm -rf conftest* | ||
2918 | eval "ac_cv_func_$ac_func=yes" | ||
2919 | else | ||
2920 | @@ -14184,12 +14124,12 @@ fi | ||
2921 | if test -z "$SKIP_LIBRARY_CHECKS"; then | ||
2922 | ac_safe=`echo "unwind.h" | sed 'y%./+-%__p_%'` | ||
2923 | echo $ac_n "checking for unwind.h""... $ac_c" 1>&6 | ||
2924 | -echo "configure:14188: checking for unwind.h" >&5 | ||
2925 | +echo "configure:14128: checking for unwind.h" >&5 | ||
2926 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | ||
2927 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2928 | else | ||
2929 | cat > conftest.$ac_ext <<EOF | ||
2930 | -#line 14193 "configure" | ||
2931 | +#line 14133 "configure" | ||
2932 | #include "confdefs.h" | ||
2933 | |||
2934 | #include <unwind.h> | ||
2935 | @@ -14197,7 +14137,7 @@ int main() { | ||
2936 | |||
2937 | ; return 0; } | ||
2938 | EOF | ||
2939 | -if { (eval echo configure:14201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2940 | +if { (eval echo configure:14141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2941 | rm -rf conftest* | ||
2942 | eval "ac_cv_header_$ac_safe=yes" | ||
2943 | else | ||
2944 | @@ -14214,12 +14154,12 @@ fi | ||
2945 | for ac_func in _Unwind_Backtrace | ||
2946 | do | ||
2947 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
2948 | -echo "configure:14218: checking for $ac_func" >&5 | ||
2949 | +echo "configure:14158: checking for $ac_func" >&5 | ||
2950 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
2951 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
2952 | else | ||
2953 | cat > conftest.$ac_ext <<EOF | ||
2954 | -#line 14223 "configure" | ||
2955 | +#line 14163 "configure" | ||
2956 | #include "confdefs.h" | ||
2957 | /* System header to define __stub macros and hopefully few prototypes, | ||
2958 | which can conflict with char $ac_func(); below. */ | ||
2959 | @@ -14242,7 +14182,7 @@ $ac_func(); | ||
2960 | |||
2961 | ; return 0; } | ||
2962 | EOF | ||
2963 | -if { (eval echo configure:14246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2964 | +if { (eval echo configure:14186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
2965 | rm -rf conftest* | ||
2966 | eval "ac_cv_func_$ac_func=yes" | ||
2967 | else | ||
2968 | @@ -14334,7 +14274,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then | ||
2969 | # Compiler Options | ||
2970 | |||
2971 | echo $ac_n "checking for -pipe support""... $ac_c" 1>&6 | ||
2972 | -echo "configure:14338: checking for -pipe support" >&5 | ||
2973 | +echo "configure:14278: checking for -pipe support" >&5 | ||
2974 | if test -n "$GNU_CC" -a -n "$GNU_CXX"; then | ||
2975 | CFLAGS="$CFLAGS -pipe" | ||
2976 | CXXFLAGS="$CXXFLAGS -pipe" | ||
2977 | @@ -14348,16 +14288,16 @@ _SAVE_CFLAGS="$CFLAGS" | ||
2978 | CFLAGS="$CFLAGS -fprofile-generate -fprofile-correction" | ||
2979 | |||
2980 | echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 | ||
2981 | -echo "configure:14352: checking whether C compiler supports -fprofile-generate" >&5 | ||
2982 | +echo "configure:14292: checking whether C compiler supports -fprofile-generate" >&5 | ||
2983 | cat > conftest.$ac_ext <<EOF | ||
2984 | -#line 14354 "configure" | ||
2985 | +#line 14294 "configure" | ||
2986 | #include "confdefs.h" | ||
2987 | |||
2988 | int main() { | ||
2989 | return 0; | ||
2990 | ; return 0; } | ||
2991 | EOF | ||
2992 | -if { (eval echo configure:14361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2993 | +if { (eval echo configure:14301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
2994 | rm -rf conftest* | ||
2995 | PROFILE_GEN_CFLAGS="-fprofile-generate" | ||
2996 | result="yes" | ||
2997 | @@ -14421,16 +14361,16 @@ if test "$_PEDANTIC"; then | ||
2998 | _SAVE_CXXFLAGS=$CXXFLAGS | ||
2999 | CXXFLAGS="$CXXFLAGS -pedantic ${_WARNINGS_CXXFLAGS} -Wno-long-long" | ||
3000 | echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 | ||
3001 | -echo "configure:14425: checking whether C++ compiler has -pedantic long long bug" >&5 | ||
3002 | +echo "configure:14365: checking whether C++ compiler has -pedantic long long bug" >&5 | ||
3003 | cat > conftest.$ac_ext <<EOF | ||
3004 | -#line 14427 "configure" | ||
3005 | +#line 14367 "configure" | ||
3006 | #include "confdefs.h" | ||
3007 | $configure_static_assert_macros | ||
3008 | int main() { | ||
3009 | CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8) | ||
3010 | ; return 0; } | ||
3011 | EOF | ||
3012 | -if { (eval echo configure:14434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3013 | +if { (eval echo configure:14374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3014 | rm -rf conftest* | ||
3015 | result="no" | ||
3016 | else | ||
3017 | @@ -14457,12 +14397,12 @@ fi | ||
3018 | _SAVE_CXXFLAGS=$CXXFLAGS | ||
3019 | CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" | ||
3020 | echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 | ||
3021 | -echo "configure:14461: checking for correct overload resolution with const and templates" >&5 | ||
3022 | +echo "configure:14401: checking for correct overload resolution with const and templates" >&5 | ||
3023 | if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then | ||
3024 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3025 | else | ||
3026 | cat > conftest.$ac_ext <<EOF | ||
3027 | -#line 14466 "configure" | ||
3028 | +#line 14406 "configure" | ||
3029 | #include "confdefs.h" | ||
3030 | |||
3031 | template <class T> | ||
3032 | @@ -14492,7 +14432,7 @@ int main() { | ||
3033 | |||
3034 | ; return 0; } | ||
3035 | EOF | ||
3036 | -if { (eval echo configure:14496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3037 | +if { (eval echo configure:14436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3038 | rm -rf conftest* | ||
3039 | ac_nscap_nonconst_opeq_bug="no" | ||
3040 | else | ||
3041 | @@ -14518,19 +14458,19 @@ EOF | ||
3042 | fi | ||
3043 | |||
3044 | echo $ac_n "checking for tm_zone tm_gmtoff in struct tm""... $ac_c" 1>&6 | ||
3045 | -echo "configure:14522: checking for tm_zone tm_gmtoff in struct tm" >&5 | ||
3046 | +echo "configure:14462: checking for tm_zone tm_gmtoff in struct tm" >&5 | ||
3047 | if eval "test \"`echo '$''{'ac_cv_struct_tm_zone_tm_gmtoff'+set}'`\" = set"; then | ||
3048 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3049 | else | ||
3050 | cat > conftest.$ac_ext <<EOF | ||
3051 | -#line 14527 "configure" | ||
3052 | +#line 14467 "configure" | ||
3053 | #include "confdefs.h" | ||
3054 | #include <time.h> | ||
3055 | int main() { | ||
3056 | struct tm tm; tm.tm_zone = 0; tm.tm_gmtoff = 1; | ||
3057 | ; return 0; } | ||
3058 | EOF | ||
3059 | -if { (eval echo configure:14534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3060 | +if { (eval echo configure:14474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3061 | rm -rf conftest* | ||
3062 | ac_cv_struct_tm_zone_tm_gmtoff="yes" | ||
3063 | else | ||
3064 | @@ -14572,18 +14512,18 @@ cross_compiling=$ac_cv_prog_cc_cross | ||
3065 | |||
3066 | |||
3067 | echo $ac_n "checking what kind of list files are supported by the linker""... $ac_c" 1>&6 | ||
3068 | -echo "configure:14576: checking what kind of list files are supported by the linker" >&5 | ||
3069 | +echo "configure:14516: checking what kind of list files are supported by the linker" >&5 | ||
3070 | if eval "test \"`echo '$''{'EXPAND_LIBS_LIST_STYLE'+set}'`\" = set"; then | ||
3071 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3072 | else | ||
3073 | echo "int main() {return 0;}" > conftest.${ac_ext} | ||
3074 | - if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then | ||
3075 | + if { ac_try='${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5'; { (eval echo configure:14521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest.${OBJ_SUFFIX}; then | ||
3076 | echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list | ||
3077 | - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
3078 | + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS conftest.list $LIBS 1>&5'; { (eval echo configure:14523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
3079 | EXPAND_LIBS_LIST_STYLE=linkerscript | ||
3080 | else | ||
3081 | echo "conftest.${OBJ_SUFFIX}" > conftest.list | ||
3082 | - if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
3083 | + if { ac_try='${CC-cc} -o conftest${ac_exeext} $LDFLAGS @conftest.list $LIBS 1>&5'; { (eval echo configure:14527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } && test -s conftest${ac_exeext}; then | ||
3084 | EXPAND_LIBS_LIST_STYLE=list | ||
3085 | else | ||
3086 | EXPAND_LIBS_LIST_STYLE=none | ||
3087 | @@ -14603,7 +14543,7 @@ LIBS_DESC_SUFFIX=desc | ||
3088 | |||
3089 | if test "$GCC_USE_GNU_LD"; then | ||
3090 | echo $ac_n "checking what kind of ordering can be done with the linker""... $ac_c" 1>&6 | ||
3091 | -echo "configure:14607: checking what kind of ordering can be done with the linker" >&5 | ||
3092 | +echo "configure:14547: checking what kind of ordering can be done with the linker" >&5 | ||
3093 | if eval "test \"`echo '$''{'EXPAND_LIBS_ORDER_STYLE'+set}'`\" = set"; then | ||
3094 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3095 | else | ||
3096 | @@ -14611,14 +14551,14 @@ else | ||
3097 | _SAVE_LDFLAGS="$LDFLAGS" | ||
3098 | LDFLAGS="${LDFLAGS} -Wl,--section-ordering-file,conftest.order" | ||
3099 | cat > conftest.$ac_ext <<EOF | ||
3100 | -#line 14615 "configure" | ||
3101 | +#line 14555 "configure" | ||
3102 | #include "confdefs.h" | ||
3103 | |||
3104 | int main() { | ||
3105 | |||
3106 | ; return 0; } | ||
3107 | EOF | ||
3108 | -if { (eval echo configure:14622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3109 | +if { (eval echo configure:14562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3110 | rm -rf conftest* | ||
3111 | EXPAND_LIBS_ORDER_STYLE=section-ordering-file | ||
3112 | else | ||
3113 | @@ -14630,7 +14570,7 @@ fi | ||
3114 | rm -f conftest* | ||
3115 | LDFLAGS="$_SAVE_LDFLAGS" | ||
3116 | if test -z "$EXPAND_LIBS_ORDER_STYLE"; then | ||
3117 | - if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then | ||
3118 | + if { ac_try='${CC-cc} ${DSO_LDOPTS} ${LDFLAGS} -o ${DLL_PREFIX}conftest${DLL_SUFFIX} -Wl'; { (eval echo configure:14574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then | ||
3119 | EXPAND_LIBS_ORDER_STYLE=linkerscript | ||
3120 | else | ||
3121 | EXPAND_LIBS_ORDER_STYLE=none | ||
3122 | @@ -14741,7 +14681,7 @@ esac | ||
3123 | if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then | ||
3124 | if test -n "$JS_WANT_READLINE"; then | ||
3125 | echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 | ||
3126 | -echo "configure:14745: checking for readline in -lreadline" >&5 | ||
3127 | +echo "configure:14685: checking for readline in -lreadline" >&5 | ||
3128 | ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` | ||
3129 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then | ||
3130 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3131 | @@ -14749,7 +14689,7 @@ else | ||
3132 | ac_save_LIBS="$LIBS" | ||
3133 | LIBS="-lreadline $LIBS" | ||
3134 | cat > conftest.$ac_ext <<EOF | ||
3135 | -#line 14753 "configure" | ||
3136 | +#line 14693 "configure" | ||
3137 | #include "confdefs.h" | ||
3138 | /* Override any gcc2 internal prototype to avoid an error. */ | ||
3139 | /* We use char because int might match the return type of a gcc2 | ||
3140 | @@ -14760,7 +14700,7 @@ int main() { | ||
3141 | readline() | ||
3142 | ; return 0; } | ||
3143 | EOF | ||
3144 | -if { (eval echo configure:14764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3145 | +if { (eval echo configure:14704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3146 | rm -rf conftest* | ||
3147 | eval "ac_cv_lib_$ac_lib_var=yes" | ||
3148 | else | ||
3149 | @@ -14990,9 +14930,9 @@ EOF | ||
3150 | |||
3151 | |||
3152 | echo $ac_n "checking for posix_fallocate""... $ac_c" 1>&6 | ||
3153 | -echo "configure:14994: checking for posix_fallocate" >&5 | ||
3154 | +echo "configure:14934: checking for posix_fallocate" >&5 | ||
3155 | cat > conftest.$ac_ext <<EOF | ||
3156 | -#line 14996 "configure" | ||
3157 | +#line 14936 "configure" | ||
3158 | #include "confdefs.h" | ||
3159 | #define _XOPEN_SOURCE 600 | ||
3160 | #include <fcntl.h> | ||
3161 | @@ -15000,7 +14940,7 @@ int main() { | ||
3162 | posix_fallocate(0, 0, 0); | ||
3163 | ; return 0; } | ||
3164 | EOF | ||
3165 | -if { (eval echo configure:15004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3166 | +if { (eval echo configure:14944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3167 | rm -rf conftest* | ||
3168 | ac_cv___posix_fallocate=true | ||
3169 | else | ||
3170 | @@ -15029,7 +14969,7 @@ if test "$MOZ_X11"; then | ||
3171 | _SAVE_CFLAGS=$CFLAGS | ||
3172 | CFLAGS="$CFLAGS $XCFLAGS" | ||
3173 | cat > conftest.$ac_ext <<EOF | ||
3174 | -#line 15033 "configure" | ||
3175 | +#line 14973 "configure" | ||
3176 | #include "confdefs.h" | ||
3177 | |||
3178 | #include <stdio.h> | ||
3179 | @@ -15047,7 +14987,7 @@ int main() { | ||
3180 | |||
3181 | ; return 0; } | ||
3182 | EOF | ||
3183 | -if { (eval echo configure:15051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3184 | +if { (eval echo configure:14991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | ||
3185 | : | ||
3186 | else | ||
3187 | echo "configure: failed program was:" >&5 | ||
3188 | @@ -15162,12 +15102,12 @@ fi | ||
3189 | for ac_func in setlocale | ||
3190 | do | ||
3191 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
3192 | -echo "configure:15166: checking for $ac_func" >&5 | ||
3193 | +echo "configure:15106: checking for $ac_func" >&5 | ||
3194 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
3195 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3196 | else | ||
3197 | cat > conftest.$ac_ext <<EOF | ||
3198 | -#line 15171 "configure" | ||
3199 | +#line 15111 "configure" | ||
3200 | #include "confdefs.h" | ||
3201 | /* System header to define __stub macros and hopefully few prototypes, | ||
3202 | which can conflict with char $ac_func(); below. */ | ||
3203 | @@ -15190,7 +15130,7 @@ $ac_func(); | ||
3204 | |||
3205 | ; return 0; } | ||
3206 | EOF | ||
3207 | -if { (eval echo configure:15194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3208 | +if { (eval echo configure:15134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3209 | rm -rf conftest* | ||
3210 | eval "ac_cv_func_$ac_func=yes" | ||
3211 | else | ||
3212 | @@ -15220,12 +15160,12 @@ done | ||
3213 | for ac_func in localeconv | ||
3214 | do | ||
3215 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 | ||
3216 | -echo "configure:15224: checking for $ac_func" >&5 | ||
3217 | +echo "configure:15164: checking for $ac_func" >&5 | ||
3218 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then | ||
3219 | echo $ac_n "(cached) $ac_c" 1>&6 | ||
3220 | else | ||
3221 | cat > conftest.$ac_ext <<EOF | ||
3222 | -#line 15229 "configure" | ||
3223 | +#line 15169 "configure" | ||
3224 | #include "confdefs.h" | ||
3225 | /* System header to define __stub macros and hopefully few prototypes, | ||
3226 | which can conflict with char $ac_func(); below. */ | ||
3227 | @@ -15248,7 +15188,7 @@ $ac_func(); | ||
3228 | |||
3229 | ; return 0; } | ||
3230 | EOF | ||
3231 | -if { (eval echo configure:15252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3232 | +if { (eval echo configure:15192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | ||
3233 | rm -rf conftest* | ||
3234 | eval "ac_cv_func_$ac_func=yes" | ||
3235 | else | ||
3236 | -- | ||
3237 | 1.9.3 | ||
3238 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch b/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch new file mode 100644 index 000000000..6aeb2f683 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch | |||
@@ -0,0 +1,75 @@ | |||
1 | From d4a15ad82292ff6d772dcc631df98754d20be31b Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Walters <walters@verbum.org> | ||
3 | Date: Tue, 18 Mar 2014 11:46:05 -0400 | ||
4 | Subject: [PATCH 2/5] Move JS_BYTES_PER_WORD out of config.h | ||
5 | |||
6 | Instead define it in terms of the already extant GNU C extension | ||
7 | __SIZEOF_POINTER__. This avoids multiarch conflicts when 32 and 64 | ||
8 | bit packages of js are co-installed. | ||
9 | --- | ||
10 | |||
11 | Upstream-status: Pending | ||
12 | |||
13 | js/src/configure.in | 9 --------- | ||
14 | js/src/js-config.h.in | 1 - | ||
15 | js/src/jstypes.h | 12 ++++++++++++ | ||
16 | 3 files changed, 12 insertions(+), 10 deletions(-) | ||
17 | |||
18 | diff --git a/js/src/configure.in b/js/src/configure.in | ||
19 | index 15605b2..64c7606 100644 | ||
20 | --- a/js/src/configure.in | ||
21 | +++ b/js/src/configure.in | ||
22 | @@ -2345,15 +2345,6 @@ else | ||
23 | AC_MSG_RESULT(no) | ||
24 | fi | ||
25 | |||
26 | -MOZ_SIZE_OF_TYPE(JS_BYTES_PER_WORD, void*, 4 8) | ||
27 | -if test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "4"; then | ||
28 | - AC_DEFINE(JS_BITS_PER_WORD_LOG2, 5) | ||
29 | -elif test "$moz_cv_size_of_JS_BYTES_PER_WORD" -eq "8"; then | ||
30 | - AC_DEFINE(JS_BITS_PER_WORD_LOG2, 6) | ||
31 | -else | ||
32 | - AC_MSG_ERROR([Unexpected JS_BYTES_PER_WORD]) | ||
33 | -fi | ||
34 | - | ||
35 | MOZ_ALIGN_OF_TYPE(JS_ALIGN_OF_POINTER, void*, 2 4 8 16) | ||
36 | MOZ_SIZE_OF_TYPE(JS_BYTES_PER_DOUBLE, double, 6 8 10 12 14) | ||
37 | |||
38 | diff --git a/js/src/js-config.h.in b/js/src/js-config.h.in | ||
39 | index 6889e00..4775420 100644 | ||
40 | --- a/js/src/js-config.h.in | ||
41 | +++ b/js/src/js-config.h.in | ||
42 | @@ -56,7 +56,6 @@ | ||
43 | #undef JS_INT32_TYPE | ||
44 | #undef JS_INT64_TYPE | ||
45 | #undef JS_INTPTR_TYPE | ||
46 | -#undef JS_BYTES_PER_WORD | ||
47 | |||
48 | /* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being | ||
49 | correct. */ | ||
50 | diff --git a/js/src/jstypes.h b/js/src/jstypes.h | ||
51 | index d0cf183..3e7928f 100644 | ||
52 | --- a/js/src/jstypes.h | ||
53 | +++ b/js/src/jstypes.h | ||
54 | @@ -24,6 +24,18 @@ | ||
55 | #include "mozilla/Util.h" | ||
56 | |||
57 | #include "js-config.h" | ||
58 | +#ifndef JS_BYTES_PER_WORD | ||
59 | +#define JS_BYTES_PER_WORD __SIZEOF_POINTER__ | ||
60 | +#endif | ||
61 | +#ifndef JS_BITS_PER_WORD_LOG2 | ||
62 | +#if JS_BYTES_PER_WORD == 8 | ||
63 | +#define JS_BITS_PER_WORD_LOG2 6 | ||
64 | +#elif JS_BYTES_PER_WORD == 4 | ||
65 | +#define JS_BITS_PER_WORD_LOG2 5 | ||
66 | +#else | ||
67 | +#error Unhandled JS_BYTES_PER_WORD | ||
68 | +#endif | ||
69 | +#endif | ||
70 | |||
71 | /*********************************************************************** | ||
72 | ** MACROS: JS_EXTERN_API | ||
73 | -- | ||
74 | 1.9.3 | ||
75 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch b/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch new file mode 100644 index 000000000..6e724292a --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0003-Add-AArch64-support.patch | |||
@@ -0,0 +1,76 @@ | |||
1 | From 15e710e331d36eb279852b5cd1ba37a9a6005217 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Mon, 2 Mar 2015 19:08:22 +0800 | ||
4 | Subject: [PATCH 3/5] Add AArch64 support | ||
5 | |||
6 | --- | ||
7 | Upstream-status: Pending | ||
8 | |||
9 | js/src/assembler/jit/ExecutableAllocator.h | 6 ++++++ | ||
10 | js/src/assembler/wtf/Platform.h | 4 ++++ | ||
11 | js/src/configure.in | 4 ++++ | ||
12 | mfbt/double-conversion/utils.h | 1 + | ||
13 | 4 files changed, 15 insertions(+) | ||
14 | |||
15 | diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h | ||
16 | index c071c33..90764c3 100644 | ||
17 | --- a/js/src/assembler/jit/ExecutableAllocator.h | ||
18 | +++ b/js/src/assembler/jit/ExecutableAllocator.h | ||
19 | @@ -382,6 +382,12 @@ public: | ||
20 | { | ||
21 | reprotectRegion(start, size, Executable); | ||
22 | } | ||
23 | +#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX | ||
24 | + static void cacheFlush(void* code, size_t size) | ||
25 | + { | ||
26 | + intptr_t end = reinterpret_cast<intptr_t>(code) + size; | ||
27 | + __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end)); | ||
28 | + } | ||
29 | #else | ||
30 | static void makeWritable(void*, size_t) {} | ||
31 | static void makeExecutable(void*, size_t) {} | ||
32 | diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h | ||
33 | index 0c84896..e8763a7 100644 | ||
34 | --- a/js/src/assembler/wtf/Platform.h | ||
35 | +++ b/js/src/assembler/wtf/Platform.h | ||
36 | @@ -325,6 +325,10 @@ | ||
37 | #define WTF_THUMB_ARCH_VERSION 0 | ||
38 | #endif | ||
39 | |||
40 | +/* CPU(AArch64) - 64-bit ARM */ | ||
41 | +#if defined(__aarch64__) | ||
42 | +#define WTF_CPU_AARCH64 1 | ||
43 | +#endif | ||
44 | |||
45 | /* WTF_CPU_ARMV5_OR_LOWER - ARM instruction set v5 or earlier */ | ||
46 | /* On ARMv5 and below the natural alignment is required. | ||
47 | diff --git a/js/src/configure.in b/js/src/configure.in | ||
48 | index 64c7606..0673aca 100644 | ||
49 | --- a/js/src/configure.in | ||
50 | +++ b/js/src/configure.in | ||
51 | @@ -1121,6 +1121,10 @@ arm*) | ||
52 | CPU_ARCH=arm | ||
53 | ;; | ||
54 | |||
55 | +aarch64) | ||
56 | + CPU_ARCH=aarch64 | ||
57 | + ;; | ||
58 | + | ||
59 | mips|mipsel) | ||
60 | CPU_ARCH="mips" | ||
61 | ;; | ||
62 | diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h | ||
63 | index 0eec2d9..fe26dab 100644 | ||
64 | --- a/mfbt/double-conversion/utils.h | ||
65 | +++ b/mfbt/double-conversion/utils.h | ||
66 | @@ -58,6 +58,7 @@ | ||
67 | defined(__mips__) || defined(__powerpc__) || \ | ||
68 | defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ | ||
69 | defined(__SH4__) || defined(__alpha__) || \ | ||
70 | + defined(__aarch64__) || \ | ||
71 | defined(_MIPS_ARCH_MIPS32R2) | ||
72 | #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 | ||
73 | #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) | ||
74 | -- | ||
75 | 1.9.3 | ||
76 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch b/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch new file mode 100644 index 000000000..8bd35d405 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch | |||
@@ -0,0 +1,103 @@ | |||
1 | From 0128c5a9eeee0d3fc0deb9129dd20eb79338c8f4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Mon, 2 Mar 2015 19:08:59 +0800 | ||
4 | Subject: [PATCH 4/5] mozbug746112-no-decommit-on-large-pages | ||
5 | |||
6 | --- | ||
7 | Upstream-status: Pending | ||
8 | |||
9 | js/src/gc/Heap.h | 15 ++++++++++----- | ||
10 | js/src/jsgc.cpp | 15 ++++++++++++--- | ||
11 | 2 files changed, 22 insertions(+), 8 deletions(-) | ||
12 | |||
13 | diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h | ||
14 | index b8f8c78..1cfd269 100644 | ||
15 | --- a/js/src/gc/Heap.h | ||
16 | +++ b/js/src/gc/Heap.h | ||
17 | @@ -103,26 +103,31 @@ struct Cell | ||
18 | }; | ||
19 | |||
20 | /* | ||
21 | - * Page size is 4096 by default, except for SPARC, where it is 8192. | ||
22 | + * Page size must be static to support our arena pointer optimizations, so we | ||
23 | + * are forced to support each platform with non-4096 pages as a special case. | ||
24 | + * Note: The freelist supports a maximum arena shift of 15. | ||
25 | * Note: Do not use JS_CPU_SPARC here, this header is used outside JS. | ||
26 | * Bug 692267: Move page size definition to gc/Memory.h and include it | ||
27 | * directly once jsgc.h is no longer an installed header. | ||
28 | */ | ||
29 | #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) | ||
30 | const size_t PageShift = 13; | ||
31 | +const size_t ArenaShift = PageShift; | ||
32 | +#elif defined(__powerpc__) | ||
33 | +const size_t PageShift = 16; | ||
34 | +const size_t ArenaShift = 12; | ||
35 | #else | ||
36 | const size_t PageShift = 12; | ||
37 | +const size_t ArenaShift = PageShift; | ||
38 | #endif | ||
39 | const size_t PageSize = size_t(1) << PageShift; | ||
40 | +const size_t ArenaSize = size_t(1) << ArenaShift; | ||
41 | +const size_t ArenaMask = ArenaSize - 1; | ||
42 | |||
43 | const size_t ChunkShift = 20; | ||
44 | const size_t ChunkSize = size_t(1) << ChunkShift; | ||
45 | const size_t ChunkMask = ChunkSize - 1; | ||
46 | |||
47 | -const size_t ArenaShift = PageShift; | ||
48 | -const size_t ArenaSize = PageSize; | ||
49 | -const size_t ArenaMask = ArenaSize - 1; | ||
50 | - | ||
51 | /* | ||
52 | * This is the maximum number of arenas we allow in the FreeCommitted state | ||
53 | * before we trigger a GC_SHRINK to release free arenas to the OS. | ||
54 | diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp | ||
55 | index b3caf05..a258d2d 100644 | ||
56 | --- a/js/src/jsgc.cpp | ||
57 | +++ b/js/src/jsgc.cpp | ||
58 | @@ -251,6 +251,13 @@ static const int BackgroundPhaseLength[] = { | ||
59 | sizeof(BackgroundPhaseStrings) / sizeof(AllocKind) | ||
60 | }; | ||
61 | |||
62 | +/* Unused memory decommiting requires the arena size match the page size. */ | ||
63 | +static bool | ||
64 | +DecommitEnabled() | ||
65 | +{ | ||
66 | + return PageSize == ArenaSize; | ||
67 | +} | ||
68 | + | ||
69 | #ifdef DEBUG | ||
70 | void | ||
71 | ArenaHeader::checkSynchronizedWithFreeList() const | ||
72 | @@ -742,7 +749,8 @@ Chunk::fetchNextDecommittedArena() | ||
73 | decommittedArenas.unset(offset); | ||
74 | |||
75 | Arena *arena = &arenas[offset]; | ||
76 | - MarkPagesInUse(arena, ArenaSize); | ||
77 | + if (DecommitEnabled()) | ||
78 | + MarkPagesInUse(arena, ArenaSize); | ||
79 | arena->aheader.setAsNotAllocated(); | ||
80 | |||
81 | return &arena->aheader; | ||
82 | @@ -2731,7 +2739,7 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) | ||
83 | chunk->removeFromAvailableList(); | ||
84 | |||
85 | size_t arenaIndex = Chunk::arenaIndex(aheader->arenaAddress()); | ||
86 | - bool ok; | ||
87 | + bool ok = true; | ||
88 | { | ||
89 | /* | ||
90 | * If the main thread waits for the decommit to finish, skip | ||
91 | @@ -2741,7 +2749,8 @@ DecommitArenasFromAvailableList(JSRuntime *rt, Chunk **availableListHeadp) | ||
92 | Maybe<AutoUnlockGC> maybeUnlock; | ||
93 | if (!rt->isHeapBusy()) | ||
94 | maybeUnlock.construct(rt); | ||
95 | - ok = MarkPagesUnused(aheader->getArena(), ArenaSize); | ||
96 | + if (DecommitEnabled()) | ||
97 | + ok = MarkPagesUnused(aheader->getArena(), ArenaSize); | ||
98 | } | ||
99 | |||
100 | if (ok) { | ||
101 | -- | ||
102 | 1.9.3 | ||
103 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch b/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch new file mode 100644 index 000000000..bc99ecc50 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/0005-aarch64-64k-page.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 9c42920c2b635a399bd1f93833efdeb1696f17ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen.kooi@linaro.org> | ||
3 | Date: Mon, 2 Mar 2015 19:09:57 +0800 | ||
4 | Subject: [PATCH 5/5] aarch64-64k-page | ||
5 | |||
6 | --- | ||
7 | Upstream-status: Pending | ||
8 | |||
9 | js/src/gc/Heap.h | 2 +- | ||
10 | js/src/gc/Memory.cpp | 3 +++ | ||
11 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h | ||
14 | index 1cfd269..f4dbcda 100644 | ||
15 | --- a/js/src/gc/Heap.h | ||
16 | +++ b/js/src/gc/Heap.h | ||
17 | @@ -113,7 +113,7 @@ struct Cell | ||
18 | #if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) | ||
19 | const size_t PageShift = 13; | ||
20 | const size_t ArenaShift = PageShift; | ||
21 | -#elif defined(__powerpc__) | ||
22 | +#elif defined(__powerpc__) || defined(__aarch64__) | ||
23 | const size_t PageShift = 16; | ||
24 | const size_t ArenaShift = 12; | ||
25 | #else | ||
26 | diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp | ||
27 | index 5b386a2..e5ad018 100644 | ||
28 | --- a/js/src/gc/Memory.cpp | ||
29 | +++ b/js/src/gc/Memory.cpp | ||
30 | @@ -302,8 +302,11 @@ GetPageFaultCount() | ||
31 | void | ||
32 | InitMemorySubsystem() | ||
33 | { | ||
34 | + /* aarch64 may have 64KB or 4KB pages */ | ||
35 | +#ifndef __aarch64__ | ||
36 | if (size_t(sysconf(_SC_PAGESIZE)) != PageSize) | ||
37 | MOZ_CRASH(); | ||
38 | +#endif | ||
39 | } | ||
40 | |||
41 | void * | ||
42 | -- | ||
43 | 1.9.3 | ||
44 | |||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch b/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch new file mode 100644 index 000000000..43c459042 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | fix the compile error of powerpc64 | ||
2 | |||
3 | Upstream-status: Accepted | ||
4 | |||
5 | fix the following error | ||
6 | |error: 'jsuword' does not name a type | ||
7 | |||
8 | |||
9 | --- a/js/src/jsval.hold 2015-04-24 01:15:06.692970731 -0500 | ||
10 | +++ b/js/src/jsval.h 2015-04-24 01:15:41.792969478 -0500 | ||
11 | @@ -304,7 +304,6 @@ | ||
12 | int32_t i32; | ||
13 | uint32_t u32; | ||
14 | JSWhyMagic why; | ||
15 | - jsuword word; | ||
16 | } payload; | ||
17 | } s; | ||
18 | double asDouble; | ||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch b/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch new file mode 100644 index 000000000..abde01bcd --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs/fix_milestone_compile_issue.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | fix the compile error do to perl update | ||
2 | |||
3 | Upstream-status: Inappropriate | ||
4 | |||
5 | |||
6 | Signed-of-by: Armin Kuster <akuster808@gmail.com> | ||
7 | |||
8 | Index: src/config/milestone.pl | ||
9 | =================================================================== | ||
10 | --- src.orig/config/milestone.pl | ||
11 | +++ src/config/milestone.pl | ||
12 | @@ -55,7 +55,7 @@ $MILESTONE_FILE = "$TOPSRCDIR/config/mi | ||
13 | # | ||
14 | my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); | ||
15 | |||
16 | -if (defined(@TEMPLATE_FILE)) { | ||
17 | +if (@TEMPLATE_FILE) { | ||
18 | my $TFILE; | ||
19 | |||
20 | foreach $TFILE (@TEMPLATE_FILE) { | ||
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb new file mode 100644 index 000000000..6621a703e --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb | |||
@@ -0,0 +1,74 @@ | |||
1 | SUMMARY = "SpiderMonkey is Mozilla's JavaScript engine written in C/C++" | ||
2 | LICENSE = "MPL-2.0" | ||
3 | LIC_FILES_CHKSUM = "file://../../LICENSE;md5=815ca599c9df247a0c7f619bab123dad" | ||
4 | |||
5 | SRC_URI = " \ | ||
6 | http://ftp.mozilla.org/pub/mozilla.org/js/${BPN}${PV}.tar.gz \ | ||
7 | file://0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch \ | ||
8 | file://0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch \ | ||
9 | file://0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch;patchdir=../../ \ | ||
10 | file://0003-Add-AArch64-support.patch;patchdir=../../ \ | ||
11 | file://0004-mozbug746112-no-decommit-on-large-pages.patch;patchdir=../../ \ | ||
12 | file://0005-aarch64-64k-page.patch;patchdir=../../ \ | ||
13 | file://0001-regenerate-configure.patch;patchdir=../../ \ | ||
14 | file://fix-the-compile-error-of-powerpc64.patch;patchdir=../../ \ | ||
15 | file://fix_milestone_compile_issue.patch \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[md5sum] = "20b6f8f1140ef6e47daa3b16965c9202" | ||
19 | SRC_URI[sha256sum] = "321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba" | ||
20 | |||
21 | S = "${WORKDIR}/${BPN}${PV}/js/src" | ||
22 | |||
23 | inherit autotools pkgconfig perlnative | ||
24 | |||
25 | DEPENDS += "nspr zlib" | ||
26 | |||
27 | # nspr's package-config is ignored so set libs manually | ||
28 | EXTRA_OECONF = " \ | ||
29 | --target=${TARGET_SYS} \ | ||
30 | --host=${BUILD_SYS} \ | ||
31 | --build=${BUILD_SYS} \ | ||
32 | --prefix=${prefix} \ | ||
33 | --libdir=${libdir} \ | ||
34 | --with-nspr-libs='-lplds4 -lplc4 -lnspr4' \ | ||
35 | --enable-threadsafe \ | ||
36 | --disable-static \ | ||
37 | " | ||
38 | EXTRA_OECONF_append_armv4 += " \ | ||
39 | --disable-methodjit \ | ||
40 | " | ||
41 | |||
42 | # mozjs requires autoreconf 2.13 | ||
43 | do_configure() { | ||
44 | ( cd ${S} | ||
45 | gnu-configize --force | ||
46 | mv config.guess config.sub build/autoconf ) | ||
47 | ${S}/configure ${EXTRA_OECONF} | ||
48 | } | ||
49 | |||
50 | # patch.bbclass will try to apply the patches already present and fail, so clean them out | ||
51 | do_sourceclean() { | ||
52 | ( | ||
53 | cd ${WORKDIR}/${BPN}${PV}/patches | ||
54 | for i in $(cat series | awk '{print $1}') ; do | ||
55 | rm -f $i | ||
56 | done | ||
57 | rm -f series | ||
58 | ) | ||
59 | } | ||
60 | |||
61 | addtask sourceclean before do_patch after do_unpack | ||
62 | |||
63 | PACKAGES =+ "lib${PN}" | ||
64 | FILES_lib${PN} += "${libdir}/lib*.so" | ||
65 | FILES_${PN}-dev += "${bindir}/js17-config" | ||
66 | |||
67 | # Fails to build with thumb-1 (qemuarm) | ||
68 | #| {standard input}: Assembler messages: | ||
69 | #| {standard input}:2172: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r2,r1,LSR#20' | ||
70 | #| {standard input}:2173: Error: unshifted register required -- `bic r2,r2,#(1<<11)' | ||
71 | #| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' | ||
72 | #| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' | ||
73 | #| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' | ||
74 | ARM_INSTRUCTION_SET = "arm" | ||
diff --git a/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules new file mode 100644 index 000000000..4b50cf881 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules | |||
@@ -0,0 +1,8 @@ | |||
1 | /* give group 'network' rights to change settings */ | ||
2 | /* taken from https://wiki.archlinux.org/index.php/NetworkManager#Set_up_PolicyKit_permissions */ | ||
3 | |||
4 | polkit.addRule(function(action, subject) { | ||
5 | if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("network")) { | ||
6 | return polkit.Result.YES; | ||
7 | } | ||
8 | }); | ||
diff --git a/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules new file mode 100644 index 000000000..95b0e0f69 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules | |||
@@ -0,0 +1,8 @@ | |||
1 | /* give group 'datetime' rights to change settings */ | ||
2 | /* based upon http://lists.freedesktop.org/archives/systemd-devel/2013-March/009576.html */ | ||
3 | |||
4 | polkit.addRule(function(action, subject) { | ||
5 | if (action.id.indexOf("org.freedesktop.timedate1.") == 0 && subject.isInGroup("datetime")) { | ||
6 | return polkit.Result.YES; | ||
7 | } | ||
8 | }); | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb new file mode 100644 index 000000000..b262b5ef8 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-gnome_0.102.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "GNOME Authentication Agent for PolicyKit" | ||
2 | DESCRIPTION = "PolicyKit-gnome provides an Authentication Agent for PolicyKit that integrates well with the GNOME desktop environment" | ||
3 | HOMEPAGE = "http://www.packagekit.org/" | ||
4 | BUGTRACKER = "http://bugzilla.gnome.org/" | ||
5 | DEPENDS = "polkit dbus-glib gconf gtk+ intltool-native gnome-common" | ||
6 | LICENSE = "LGPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \ | ||
8 | file://src/main.c;beginline=1;endline=20;md5=aba145d1802f2329ba561e3e48ecb795" | ||
9 | |||
10 | SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \ | ||
11 | " | ||
12 | |||
13 | PR = "r2" | ||
14 | |||
15 | EXTRA_OECONF = "\ | ||
16 | --disable-examples \ | ||
17 | --disable-introspection \ | ||
18 | " | ||
19 | |||
20 | inherit autotools gtk-doc pkgconfig | ||
21 | |||
22 | FILES_${PN} += " ${datadir}/dbus-1 \ | ||
23 | ${datadir}/PolicyKit \ | ||
24 | " | ||
25 | SRC_URI[md5sum] = "f6b485ffd7bd605af815fd2747180481" | ||
26 | SRC_URI[sha256sum] = "81caa6972e651e90ef4ac31d7ed41bc79543d46b850dbd5b14b40f8ef7107d11" | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb new file mode 100644 index 000000000..eced4b6de --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | DESCRIPTION = "Create usergroup datetime. All members off this group are allowed set date/time/timezone via system dbus" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" | ||
4 | |||
5 | require polkit-group-rule.inc | ||
6 | |||
7 | SRC_URI = "file://50-org.freedesktop.timedate1.rules" | ||
8 | |||
9 | do_install() { | ||
10 | install -m 0755 ${WORKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d | ||
11 | } | ||
12 | |||
13 | USERADD_PACKAGES = "${PN}" | ||
14 | GROUPADD_PARAM_${PN} = "--system datetime" | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb new file mode 100644 index 000000000..551ed3eb8 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb | |||
@@ -0,0 +1,14 @@ | |||
1 | DESCRIPTION = "Create usergroup network. All members off this group are allowed to modify networkmanager settings" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" | ||
4 | |||
5 | require polkit-group-rule.inc | ||
6 | |||
7 | SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" | ||
8 | |||
9 | do_install() { | ||
10 | install -m 0755 ${WORKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d | ||
11 | } | ||
12 | |||
13 | USERADD_PACKAGES = "${PN}" | ||
14 | GROUPADD_PARAM_${PN} = "--system network" | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc new file mode 100644 index 000000000..8d1a89aa3 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc | |||
@@ -0,0 +1,9 @@ | |||
1 | # polkit must prepare polkid group | ||
2 | DEPENDS += "polkit" | ||
3 | |||
4 | inherit allarch useradd | ||
5 | |||
6 | do_install_prepend() { | ||
7 | install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d | ||
8 | chown polkitd:polkitd ${D}${sysconfdir}/polkit-1/rules.d | ||
9 | } | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch new file mode 100644 index 000000000..b9334a8fd --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 56cadbc45c5ef98a7b775638d2109c4a09a58c06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 22 Feb 2014 18:09:57 +0100 | ||
4 | Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login | ||
5 | |||
6 | * they were merged into libsystemd in systemd-209 | ||
7 | |||
8 | Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) | ||
9 | |||
10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
11 | --- | ||
12 | configure.ac | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index a7b0148..64d513d 100644 | ||
17 | --- a/configure.ac | ||
18 | +++ b/configure.ac | ||
19 | @@ -196,7 +196,7 @@ AC_ARG_ENABLE([libsystemd-login], | ||
20 | [enable_libsystemd_login=auto]) | ||
21 | if test "$enable_libsystemd_login" != "no"; then | ||
22 | PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, | ||
23 | - [libsystemd-login], | ||
24 | + [libsystemd], | ||
25 | have_libsystemd_login=yes, | ||
26 | have_libsystemd_login=no) | ||
27 | if test "$have_libsystemd_login" = "yes"; then | ||
28 | @@ -223,7 +223,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ | ||
29 | AS_IF([test "$enable_libsystemd_login" = "no" ], [ | ||
30 | AC_MSG_WARN([ConsoleKit requested but system appears to use systemd]) | ||
31 | ], [ | ||
32 | - AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd-login pkg-config?)]) | ||
33 | + AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd pkg-config?)]) | ||
34 | ]) | ||
35 | ]) | ||
36 | ]) | ||
37 | -- | ||
38 | 1.8.5.3 | ||
39 | |||
diff --git a/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch b/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch new file mode 100644 index 000000000..74647efce --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit/polkit-1_pam.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | polkit: No system-auth in OE-Core, we can use common-* in place of it. | ||
2 | |||
3 | Upstream-Status:Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
6 | |||
7 | --- a/configure.ac 2011-03-04 02:26:20.000000000 +0800 | ||
8 | +++ b/configure.ac.new 2011-07-18 10:14:12.516818852 +0800 | ||
9 | @@ -350,10 +350,10 @@ | ||
10 | PAM_FILE_INCLUDE_PASSWORD=system | ||
11 | PAM_FILE_INCLUDE_SESSION=system | ||
12 | else | ||
13 | - PAM_FILE_INCLUDE_AUTH=system-auth | ||
14 | - PAM_FILE_INCLUDE_ACCOUNT=system-auth | ||
15 | - PAM_FILE_INCLUDE_PASSWORD=system-auth | ||
16 | - PAM_FILE_INCLUDE_SESSION=system-auth | ||
17 | + PAM_FILE_INCLUDE_AUTH=common-auth | ||
18 | + PAM_FILE_INCLUDE_ACCOUNT=common-account | ||
19 | + PAM_FILE_INCLUDE_PASSWORD=common-password | ||
20 | + PAM_FILE_INCLUDE_SESSION=common-session | ||
21 | fi | ||
22 | |||
23 | AC_SUBST(PAM_FILE_INCLUDE_AUTH) | ||
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.112.bb b/meta-oe/recipes-extended/polkit/polkit_0.112.bb new file mode 100644 index 000000000..72b182b95 --- /dev/null +++ b/meta-oe/recipes-extended/polkit/polkit_0.112.bb | |||
@@ -0,0 +1,46 @@ | |||
1 | SUMMARY = "PolicyKit Authorization Framework" | ||
2 | DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes." | ||
3 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" | ||
4 | LICENSE = "LGPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ | ||
6 | file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4" | ||
7 | |||
8 | DEPENDS = "expat glib-2.0 intltool-native gobject-introspection-stub mozjs" | ||
9 | |||
10 | inherit autotools gtk-doc pkgconfig useradd systemd | ||
11 | |||
12 | PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ | ||
13 | ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" | ||
14 | |||
15 | PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" | ||
16 | PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" | ||
17 | # there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS | ||
18 | PACKAGECONFIG[consolekit] = ",,,consolekit" | ||
19 | |||
20 | PAM_SRC_URI = "file://polkit-1_pam.patch" | ||
21 | SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ | ||
22 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | ||
23 | file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ | ||
24 | " | ||
25 | |||
26 | SRC_URI[md5sum] = "b0f2fa00a55f47c6a5d88e9b73f80127" | ||
27 | SRC_URI[sha256sum] = "d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6" | ||
28 | |||
29 | EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection" | ||
30 | |||
31 | PACKAGES =+ "${PN}-examples" | ||
32 | |||
33 | FILES_${PN} += " \ | ||
34 | ${libdir}/${BPN}-1 \ | ||
35 | ${datadir}/dbus-1 \ | ||
36 | ${datadir}/${BPN}-1 \ | ||
37 | " | ||
38 | FILES_${PN}-dbg += "${libdir}/${BPN}-1/.debug" | ||
39 | |||
40 | FILES_${PN}-examples = "${bindir}/*example*" | ||
41 | |||
42 | USERADD_PACKAGES = "${PN}" | ||
43 | USERADD_PARAM_${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" | ||
44 | |||
45 | SYSTEMD_SERVICE_${PN} = "${BPN}.service" | ||
46 | SYSTEMD_AUTO_ENABLE = "disable" | ||
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch new file mode 100644 index 000000000..8135fc28e --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001 | ||
2 | From: Venture Research <tech@ventureresearch.com> | ||
3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 | ||
4 | Subject: [PATCH] hiredis: use default CC if it is set | ||
5 | |||
6 | Instead of trying to automagically figure out CC, which breaks with OE | ||
7 | as CC has spaces in it, just skip it if one was already passed in. | ||
8 | |||
9 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
10 | --- | ||
11 | deps/hiredis/Makefile | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile | ||
15 | index 16b8767..0b27c82 100644 | ||
16 | --- a/deps/hiredis/Makefile | ||
17 | +++ b/deps/hiredis/Makefile | ||
18 | @@ -11,7 +11,7 @@ HIREDIS_MAJOR=0 | ||
19 | HIREDIS_MINOR=10 | ||
20 | |||
21 | # Fallback to gcc when $CC is not in $PATH. | ||
22 | -CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') | ||
23 | +CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') | ||
24 | OPTIMIZATION?=-O3 | ||
25 | WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings | ||
26 | DEBUG?= -g -ggdb | ||
27 | -- | ||
28 | 1.8.1.2 | ||
29 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server new file mode 100755 index 000000000..6014d70c0 --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis/init-redis-server | |||
@@ -0,0 +1,40 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: redis-server | ||
5 | # Required-Start: $network | ||
6 | # Required-Stop: $network | ||
7 | # Default-Start: S 2 3 4 5 | ||
8 | # Default-Stop: 0 1 6 | ||
9 | # Short-Description: Redis, a key-value store | ||
10 | # Description: Redis is an open source, advanced key-value store. | ||
11 | # http://redis.io | ||
12 | ### END INIT INFO | ||
13 | |||
14 | test -f /usr/bin/redis-server || exit 0 | ||
15 | |||
16 | ARGS="/etc/redis/redis.conf" | ||
17 | |||
18 | case "$1" in | ||
19 | start) | ||
20 | echo "Starting redis-server..." | ||
21 | start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS | ||
22 | ;; | ||
23 | stop) | ||
24 | echo "Stopping redis-server..." | ||
25 | start-stop-daemon --stop --quiet --exec /usr/bin/redis-server | ||
26 | ;; | ||
27 | restart) | ||
28 | echo "Stopping redis-server..." | ||
29 | start-stop-daemon --stop --quiet --exec /usr/bin/redis-server | ||
30 | echo "Starting redis-server..." | ||
31 | start-stop-daemon --start --quiet --exec /usr/bin/redis-server -- $ARGS | ||
32 | ;; | ||
33 | *) | ||
34 | echo "Usage: /etc/init.d/redis-server {start|stop|restart}" | ||
35 | exit 1 | ||
36 | ;; | ||
37 | esac | ||
38 | |||
39 | exit 0 | ||
40 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch new file mode 100644 index 000000000..c4d1bc493 --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 394108035d350ae662a431c80131f812b5f72dff Mon Sep 17 00:00:00 2001 | ||
2 | From: Venture Research <tech@ventureresearch.com> | ||
3 | Date: Fri, 8 Feb 2013 20:22:19 -0600 | ||
4 | Subject: [PATCH] lua: update Makefile to use environment build settings | ||
5 | |||
6 | OE-specific parameters, instead of overriding all of these simply use | ||
7 | the ones that are already passed in. Also configure for only Linux... | ||
8 | |||
9 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
10 | --- | ||
11 | deps/lua/src/Makefile | 18 +++++++----------- | ||
12 | 1 file changed, 7 insertions(+), 11 deletions(-) | ||
13 | |||
14 | diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile | ||
15 | index 77d6a48..888d0da 100644 | ||
16 | --- a/deps/lua/src/Makefile | ||
17 | +++ b/deps/lua/src/Makefile | ||
18 | @@ -5,18 +5,14 @@ | ||
19 | # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT ======================= | ||
20 | |||
21 | # Your platform. See PLATS for possible values. | ||
22 | -PLAT= none | ||
23 | +PLAT= linux | ||
24 | |||
25 | -CC= gcc | ||
26 | -CFLAGS= -O2 -Wall $(MYCFLAGS) | ||
27 | -AR= ar rcu | ||
28 | -RANLIB= ranlib | ||
29 | -RM= rm -f | ||
30 | -LIBS= -lm $(MYLIBS) | ||
31 | - | ||
32 | -MYCFLAGS= | ||
33 | +MYCFLAGS=-DLUA_USE_LINUX | ||
34 | MYLDFLAGS= | ||
35 | -MYLIBS= | ||
36 | +MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses | ||
37 | + | ||
38 | +CFLAGS += $(MYCFLAGS) | ||
39 | +LIBS += -lm $(MYLIBS) | ||
40 | |||
41 | # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= | ||
42 | |||
43 | @@ -48,7 +44,7 @@ o: $(ALL_O) | ||
44 | a: $(ALL_A) | ||
45 | |||
46 | $(LUA_A): $(CORE_O) $(LIB_O) | ||
47 | - $(AR) $@ $? | ||
48 | + $(AR) rcu $@ $? | ||
49 | $(RANLIB) $@ | ||
50 | |||
51 | $(LUA_T): $(LUA_O) $(LUA_A) | ||
52 | -- | ||
53 | 1.8.1.2 | ||
54 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch new file mode 100644 index 000000000..b89c87129 --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From f8861d2129b9e18bba137705bfa38c6bd9be1790 Mon Sep 17 00:00:00 2001 | ||
2 | From: Venture Research <tech@ventureresearch.com> | ||
3 | Date: Wed, 6 Feb 2013 20:51:02 -0600 | ||
4 | Subject: [PATCH] hack to force use of libc malloc | ||
5 | |||
6 | Hack to force libc usage as it seems the option to pass it in has been | ||
7 | removed in favor of magic. | ||
8 | |||
9 | Note that this of course doesn't allow tcmalloc and jemalloc, however | ||
10 | jemalloc wasn't building correctly. | ||
11 | |||
12 | Signed-off-by: Venture Research <tech@ventureresearch.com> | ||
13 | --- | ||
14 | src/Makefile | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/src/Makefile b/src/Makefile | ||
18 | index 204a271..91b307d 100644 | ||
19 | --- a/src/Makefile | ||
20 | +++ b/src/Makefile | ||
21 | @@ -13,7 +13,8 @@ | ||
22 | # Just use 'make dep', but this is only needed by developers. | ||
23 | |||
24 | release_hdr := $(shell sh -c './mkreleasehdr.sh') | ||
25 | -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | ||
26 | +# use fake uname option to force use of generic libc | ||
27 | +uname_S := "USE_LIBC_MALLOC" | ||
28 | OPTIMIZATION?=-O2 | ||
29 | DEPENDENCY_TARGETS=hiredis linenoise lua | ||
30 | |||
31 | -- | ||
32 | 1.8.1.2 | ||
33 | |||
diff --git a/meta-oe/recipes-extended/redis/redis/redis.conf b/meta-oe/recipes-extended/redis/redis/redis.conf new file mode 100644 index 000000000..923b98e5c --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis/redis.conf | |||
@@ -0,0 +1,550 @@ | |||
1 | # Redis configuration file example | ||
2 | |||
3 | # Note on units: when memory size is needed, it is possible to specify | ||
4 | # it in the usual form of 1k 5GB 4M and so forth: | ||
5 | # | ||
6 | # 1k => 1000 bytes | ||
7 | # 1kb => 1024 bytes | ||
8 | # 1m => 1000000 bytes | ||
9 | # 1mb => 1024*1024 bytes | ||
10 | # 1g => 1000000000 bytes | ||
11 | # 1gb => 1024*1024*1024 bytes | ||
12 | # | ||
13 | # units are case insensitive so 1GB 1Gb 1gB are all the same. | ||
14 | |||
15 | # By default Redis does not run as a daemon. Use 'yes' if you need it. | ||
16 | # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. | ||
17 | # | ||
18 | # OE: run as a daemon. | ||
19 | # | ||
20 | daemonize yes | ||
21 | |||
22 | # When running daemonized, Redis writes a pid file in /var/run/redis.pid by | ||
23 | # default. You can specify a custom pid file location here. | ||
24 | pidfile /var/run/redis.pid | ||
25 | |||
26 | # Accept connections on the specified port, default is 6379. | ||
27 | # If port 0 is specified Redis will not listen on a TCP socket. | ||
28 | port 6379 | ||
29 | |||
30 | # If you want you can bind a single interface, if the bind option is not | ||
31 | # specified all the interfaces will listen for incoming connections. | ||
32 | # | ||
33 | # bind 127.0.0.1 | ||
34 | |||
35 | # Specify the path for the unix socket that will be used to listen for | ||
36 | # incoming connections. There is no default, so Redis will not listen | ||
37 | # on a unix socket when not specified. | ||
38 | # | ||
39 | # unixsocket /tmp/redis.sock | ||
40 | # unixsocketperm 755 | ||
41 | |||
42 | # Close the connection after a client is idle for N seconds (0 to disable) | ||
43 | timeout 0 | ||
44 | |||
45 | # Set server verbosity to 'debug' | ||
46 | # it can be one of: | ||
47 | # debug (a lot of information, useful for development/testing) | ||
48 | # verbose (many rarely useful info, but not a mess like the debug level) | ||
49 | # notice (moderately verbose, what you want in production probably) | ||
50 | # warning (only very important / critical messages are logged) | ||
51 | loglevel notice | ||
52 | |||
53 | # Specify the log file name. Also 'stdout' can be used to force | ||
54 | # Redis to log on the standard output. Note that if you use standard | ||
55 | # output for logging but daemonize, logs will be sent to /dev/null | ||
56 | logfile /var/log/redis.log | ||
57 | |||
58 | # To enable logging to the system logger, just set 'syslog-enabled' to yes, | ||
59 | # and optionally update the other syslog parameters to suit your needs. | ||
60 | # syslog-enabled no | ||
61 | |||
62 | # Specify the syslog identity. | ||
63 | # syslog-ident redis | ||
64 | |||
65 | # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7. | ||
66 | # syslog-facility local0 | ||
67 | |||
68 | # Set the number of databases. The default database is DB 0, you can select | ||
69 | # a different one on a per-connection basis using SELECT <dbid> where | ||
70 | # dbid is a number between 0 and 'databases'-1 | ||
71 | databases 16 | ||
72 | |||
73 | ################################ SNAPSHOTTING ################################# | ||
74 | # | ||
75 | # Save the DB on disk: | ||
76 | # | ||
77 | # save <seconds> <changes> | ||
78 | # | ||
79 | # Will save the DB if both the given number of seconds and the given | ||
80 | # number of write operations against the DB occurred. | ||
81 | # | ||
82 | # In the example below the behaviour will be to save: | ||
83 | # after 900 sec (15 min) if at least 1 key changed | ||
84 | # after 300 sec (5 min) if at least 10 keys changed | ||
85 | # after 60 sec if at least 10000 keys changed | ||
86 | # | ||
87 | # Note: you can disable saving at all commenting all the "save" lines. | ||
88 | # | ||
89 | # It is also possible to remove all the previously configured save | ||
90 | # points by adding a save directive with a single empty string argument | ||
91 | # like in the following example: | ||
92 | # | ||
93 | # save "" | ||
94 | |||
95 | #save 900 1 | ||
96 | #save 300 10 | ||
97 | #save 60 10000 | ||
98 | |||
99 | # OE: tune for a small embedded system with a limited # of keys. | ||
100 | save 120 1 | ||
101 | save 60 100 | ||
102 | save 30 1000 | ||
103 | |||
104 | # By default Redis will stop accepting writes if RDB snapshots are enabled | ||
105 | # (at least one save point) and the latest background save failed. | ||
106 | # This will make the user aware (in an hard way) that data is not persisting | ||
107 | # on disk properly, otherwise chances are that no one will notice and some | ||
108 | # distater will happen. | ||
109 | # | ||
110 | # If the background saving process will start working again Redis will | ||
111 | # automatically allow writes again. | ||
112 | # | ||
113 | # However if you have setup your proper monitoring of the Redis server | ||
114 | # and persistence, you may want to disable this feature so that Redis will | ||
115 | # continue to work as usually even if there are problems with disk, | ||
116 | # permissions, and so forth. | ||
117 | stop-writes-on-bgsave-error yes | ||
118 | |||
119 | # Compress string objects using LZF when dump .rdb databases? | ||
120 | # For default that's set to 'yes' as it's almost always a win. | ||
121 | # If you want to save some CPU in the saving child set it to 'no' but | ||
122 | # the dataset will likely be bigger if you have compressible values or keys. | ||
123 | rdbcompression yes | ||
124 | |||
125 | # Since verison 5 of RDB a CRC64 checksum is placed at the end of the file. | ||
126 | # This makes the format more resistant to corruption but there is a performance | ||
127 | # hit to pay (around 10%) when saving and loading RDB files, so you can disable it | ||
128 | # for maximum performances. | ||
129 | # | ||
130 | # RDB files created with checksum disabled have a checksum of zero that will | ||
131 | # tell the loading code to skip the check. | ||
132 | rdbchecksum yes | ||
133 | |||
134 | # The filename where to dump the DB | ||
135 | dbfilename dump.rdb | ||
136 | |||
137 | # The working directory. | ||
138 | # | ||
139 | # The DB will be written inside this directory, with the filename specified | ||
140 | # above using the 'dbfilename' configuration directive. | ||
141 | # | ||
142 | # Also the Append Only File will be created inside this directory. | ||
143 | # | ||
144 | # Note that you must specify a directory here, not a file name. | ||
145 | dir /var/lib/redis/ | ||
146 | |||
147 | ################################# REPLICATION ################################# | ||
148 | |||
149 | # Master-Slave replication. Use slaveof to make a Redis instance a copy of | ||
150 | # another Redis server. Note that the configuration is local to the slave | ||
151 | # so for example it is possible to configure the slave to save the DB with a | ||
152 | # different interval, or to listen to another port, and so on. | ||
153 | # | ||
154 | # slaveof <masterip> <masterport> | ||
155 | |||
156 | # If the master is password protected (using the "requirepass" configuration | ||
157 | # directive below) it is possible to tell the slave to authenticate before | ||
158 | # starting the replication synchronization process, otherwise the master will | ||
159 | # refuse the slave request. | ||
160 | # | ||
161 | # masterauth <master-password> | ||
162 | |||
163 | # When a slave lost the connection with the master, or when the replication | ||
164 | # is still in progress, the slave can act in two different ways: | ||
165 | # | ||
166 | # 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will | ||
167 | # still reply to client requests, possibly with out of date data, or the | ||
168 | # data set may just be empty if this is the first synchronization. | ||
169 | # | ||
170 | # 2) if slave-serve-stale data is set to 'no' the slave will reply with | ||
171 | # an error "SYNC with master in progress" to all the kind of commands | ||
172 | # but to INFO and SLAVEOF. | ||
173 | # | ||
174 | slave-serve-stale-data yes | ||
175 | |||
176 | # You can configure a slave instance to accept writes or not. Writing against | ||
177 | # a slave instance may be useful to store some ephemeral data (because data | ||
178 | # written on a slave will be easily deleted after resync with the master) but | ||
179 | # may also cause problems if clients are writing to it because of a | ||
180 | # misconfiguration. | ||
181 | # | ||
182 | # Since Redis 2.6 by default slaves are read-only. | ||
183 | # | ||
184 | # Note: read only slaves are not designed to be exposed to untrusted clients | ||
185 | # on the internet. It's just a protection layer against misuse of the instance. | ||
186 | # Still a read only slave exports by default all the administrative commands | ||
187 | # such as CONFIG, DEBUG, and so forth. To a limited extend you can improve | ||
188 | # security of read only slaves using 'rename-command' to shadow all the | ||
189 | # administrative / dangerous commands. | ||
190 | slave-read-only yes | ||
191 | |||
192 | # Slaves send PINGs to server in a predefined interval. It's possible to change | ||
193 | # this interval with the repl_ping_slave_period option. The default value is 10 | ||
194 | # seconds. | ||
195 | # | ||
196 | # repl-ping-slave-period 10 | ||
197 | |||
198 | # The following option sets a timeout for both Bulk transfer I/O timeout and | ||
199 | # master data or ping response timeout. The default value is 60 seconds. | ||
200 | # | ||
201 | # It is important to make sure that this value is greater than the value | ||
202 | # specified for repl-ping-slave-period otherwise a timeout will be detected | ||
203 | # every time there is low traffic between the master and the slave. | ||
204 | # | ||
205 | # repl-timeout 60 | ||
206 | |||
207 | # The slave priority is an integer number published by Redis in the INFO output. | ||
208 | # It is used by Redis Sentinel in order to select a slave to promote into a | ||
209 | # master if the master is no longer working correctly. | ||
210 | # | ||
211 | # A slave with a low priority number is considered better for promotion, so | ||
212 | # for instance if there are three slaves with priority 10, 100, 25 Sentinel will | ||
213 | # pick the one wtih priority 10, that is the lowest. | ||
214 | # | ||
215 | # However a special priority of 0 marks the slave as not able to perform the | ||
216 | # role of master, so a slave with priority of 0 will never be selected by | ||
217 | # Redis Sentinel for promotion. | ||
218 | # | ||
219 | # By default the priority is 100. | ||
220 | slave-priority 100 | ||
221 | |||
222 | ################################## SECURITY ################################### | ||
223 | |||
224 | # Require clients to issue AUTH <PASSWORD> before processing any other | ||
225 | # commands. This might be useful in environments in which you do not trust | ||
226 | # others with access to the host running redis-server. | ||
227 | # | ||
228 | # This should stay commented out for backward compatibility and because most | ||
229 | # people do not need auth (e.g. they run their own servers). | ||
230 | # | ||
231 | # Warning: since Redis is pretty fast an outside user can try up to | ||
232 | # 150k passwords per second against a good box. This means that you should | ||
233 | # use a very strong password otherwise it will be very easy to break. | ||
234 | # | ||
235 | # requirepass foobared | ||
236 | |||
237 | # Command renaming. | ||
238 | # | ||
239 | # It is possible to change the name of dangerous commands in a shared | ||
240 | # environment. For instance the CONFIG command may be renamed into something | ||
241 | # of hard to guess so that it will be still available for internal-use | ||
242 | # tools but not available for general clients. | ||
243 | # | ||
244 | # Example: | ||
245 | # | ||
246 | # rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52 | ||
247 | # | ||
248 | # It is also possible to completely kill a command renaming it into | ||
249 | # an empty string: | ||
250 | # | ||
251 | # rename-command CONFIG "" | ||
252 | |||
253 | ################################### LIMITS #################################### | ||
254 | |||
255 | # Set the max number of connected clients at the same time. By default | ||
256 | # this limit is set to 10000 clients, however if the Redis server is not | ||
257 | # able ot configure the process file limit to allow for the specified limit | ||
258 | # the max number of allowed clients is set to the current file limit | ||
259 | # minus 32 (as Redis reserves a few file descriptors for internal uses). | ||
260 | # | ||
261 | # Once the limit is reached Redis will close all the new connections sending | ||
262 | # an error 'max number of clients reached'. | ||
263 | # | ||
264 | # maxclients 10000 | ||
265 | |||
266 | # Don't use more memory than the specified amount of bytes. | ||
267 | # When the memory limit is reached Redis will try to remove keys | ||
268 | # accordingly to the eviction policy selected (see maxmemmory-policy). | ||
269 | # | ||
270 | # If Redis can't remove keys according to the policy, or if the policy is | ||
271 | # set to 'noeviction', Redis will start to reply with errors to commands | ||
272 | # that would use more memory, like SET, LPUSH, and so on, and will continue | ||
273 | # to reply to read-only commands like GET. | ||
274 | # | ||
275 | # This option is usually useful when using Redis as an LRU cache, or to set | ||
276 | # an hard memory limit for an instance (using the 'noeviction' policy). | ||
277 | # | ||
278 | # WARNING: If you have slaves attached to an instance with maxmemory on, | ||
279 | # the size of the output buffers needed to feed the slaves are subtracted | ||
280 | # from the used memory count, so that network problems / resyncs will | ||
281 | # not trigger a loop where keys are evicted, and in turn the output | ||
282 | # buffer of slaves is full with DELs of keys evicted triggering the deletion | ||
283 | # of more keys, and so forth until the database is completely emptied. | ||
284 | # | ||
285 | # In short... if you have slaves attached it is suggested that you set a lower | ||
286 | # limit for maxmemory so that there is some free RAM on the system for slave | ||
287 | # output buffers (but this is not needed if the policy is 'noeviction'). | ||
288 | # | ||
289 | # maxmemory <bytes> | ||
290 | |||
291 | # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory | ||
292 | # is reached? You can select among five behavior: | ||
293 | # | ||
294 | # volatile-lru -> remove the key with an expire set using an LRU algorithm | ||
295 | # allkeys-lru -> remove any key accordingly to the LRU algorithm | ||
296 | # volatile-random -> remove a random key with an expire set | ||
297 | # allkeys-random -> remove a random key, any key | ||
298 | # volatile-ttl -> remove the key with the nearest expire time (minor TTL) | ||
299 | # noeviction -> don't expire at all, just return an error on write operations | ||
300 | # | ||
301 | # Note: with all the kind of policies, Redis will return an error on write | ||
302 | # operations, when there are not suitable keys for eviction. | ||
303 | # | ||
304 | # At the date of writing this commands are: set setnx setex append | ||
305 | # incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd | ||
306 | # sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby | ||
307 | # zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby | ||
308 | # getset mset msetnx exec sort | ||
309 | # | ||
310 | # The default is: | ||
311 | # | ||
312 | # maxmemory-policy volatile-lru | ||
313 | |||
314 | # LRU and minimal TTL algorithms are not precise algorithms but approximated | ||
315 | # algorithms (in order to save memory), so you can select as well the sample | ||
316 | # size to check. For instance for default Redis will check three keys and | ||
317 | # pick the one that was used less recently, you can change the sample size | ||
318 | # using the following configuration directive. | ||
319 | # | ||
320 | # maxmemory-samples 3 | ||
321 | |||
322 | ############################## APPEND ONLY MODE ############################### | ||
323 | |||
324 | # By default Redis asynchronously dumps the dataset on disk. This mode is | ||
325 | # good enough in many applications, but an issue with the Redis process or | ||
326 | # a power outage may result into a few minutes of writes lost (depending on | ||
327 | # the configured save points). | ||
328 | # | ||
329 | # The Append Only File is an alternative persistence mode that provides | ||
330 | # much better durability. For instance using the default data fsync policy | ||
331 | # (see later in the config file) Redis can lose just one second of writes in a | ||
332 | # dramatic event like a server power outage, or a single write if something | ||
333 | # wrong with the Redis process itself happens, but the operating system is | ||
334 | # still running correctly. | ||
335 | # | ||
336 | # AOF and RDB persistence can be enabled at the same time without problems. | ||
337 | # If the AOF is enabled on startup Redis will load the AOF, that is the file | ||
338 | # with the better durability guarantees. | ||
339 | # | ||
340 | # Please check http://redis.io/topics/persistence for more information. | ||
341 | |||
342 | # | ||
343 | # OE: changed default to enable this | ||
344 | appendonly yes | ||
345 | |||
346 | # The name of the append only file (default: "appendonly.aof") | ||
347 | # appendfilename appendonly.aof | ||
348 | |||
349 | # The fsync() call tells the Operating System to actually write data on disk | ||
350 | # instead to wait for more data in the output buffer. Some OS will really flush | ||
351 | # data on disk, some other OS will just try to do it ASAP. | ||
352 | # | ||
353 | # Redis supports three different modes: | ||
354 | # | ||
355 | # no: don't fsync, just let the OS flush the data when it wants. Faster. | ||
356 | # always: fsync after every write to the append only log . Slow, Safest. | ||
357 | # everysec: fsync only one time every second. Compromise. | ||
358 | # | ||
359 | # The default is "everysec" that's usually the right compromise between | ||
360 | # speed and data safety. It's up to you to understand if you can relax this to | ||
361 | # "no" that will let the operating system flush the output buffer when | ||
362 | # it wants, for better performances (but if you can live with the idea of | ||
363 | # some data loss consider the default persistence mode that's snapshotting), | ||
364 | # or on the contrary, use "always" that's very slow but a bit safer than | ||
365 | # everysec. | ||
366 | # | ||
367 | # More details please check the following article: | ||
368 | # http://antirez.com/post/redis-persistence-demystified.html | ||
369 | # | ||
370 | # If unsure, use "everysec". | ||
371 | |||
372 | # appendfsync always | ||
373 | appendfsync everysec | ||
374 | # appendfsync no | ||
375 | |||
376 | # When the AOF fsync policy is set to always or everysec, and a background | ||
377 | # saving process (a background save or AOF log background rewriting) is | ||
378 | # performing a lot of I/O against the disk, in some Linux configurations | ||
379 | # Redis may block too long on the fsync() call. Note that there is no fix for | ||
380 | # this currently, as even performing fsync in a different thread will block | ||
381 | # our synchronous write(2) call. | ||
382 | # | ||
383 | # In order to mitigate this problem it's possible to use the following option | ||
384 | # that will prevent fsync() from being called in the main process while a | ||
385 | # BGSAVE or BGREWRITEAOF is in progress. | ||
386 | # | ||
387 | # This means that while another child is saving the durability of Redis is | ||
388 | # the same as "appendfsync none", that in practical terms means that it is | ||
389 | # possible to lost up to 30 seconds of log in the worst scenario (with the | ||
390 | # default Linux settings). | ||
391 | # | ||
392 | # If you have latency problems turn this to "yes". Otherwise leave it as | ||
393 | # "no" that is the safest pick from the point of view of durability. | ||
394 | no-appendfsync-on-rewrite no | ||
395 | |||
396 | # Automatic rewrite of the append only file. | ||
397 | # Redis is able to automatically rewrite the log file implicitly calling | ||
398 | # BGREWRITEAOF when the AOF log size will growth by the specified percentage. | ||
399 | # | ||
400 | # This is how it works: Redis remembers the size of the AOF file after the | ||
401 | # latest rewrite (or if no rewrite happened since the restart, the size of | ||
402 | # the AOF at startup is used). | ||
403 | # | ||
404 | # This base size is compared to the current size. If the current size is | ||
405 | # bigger than the specified percentage, the rewrite is triggered. Also | ||
406 | # you need to specify a minimal size for the AOF file to be rewritten, this | ||
407 | # is useful to avoid rewriting the AOF file even if the percentage increase | ||
408 | # is reached but it is still pretty small. | ||
409 | # | ||
410 | # Specify a percentage of zero in order to disable the automatic AOF | ||
411 | # rewrite feature. | ||
412 | |||
413 | auto-aof-rewrite-percentage 100 | ||
414 | auto-aof-rewrite-min-size 64mb | ||
415 | |||
416 | ################################ LUA SCRIPTING ############################### | ||
417 | |||
418 | # Max execution time of a Lua script in milliseconds. | ||
419 | # | ||
420 | # If the maximum execution time is reached Redis will log that a script is | ||
421 | # still in execution after the maximum allowed time and will start to | ||
422 | # reply to queries with an error. | ||
423 | # | ||
424 | # When a long running script exceed the maximum execution time only the | ||
425 | # SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be | ||
426 | # used to stop a script that did not yet called write commands. The second | ||
427 | # is the only way to shut down the server in the case a write commands was | ||
428 | # already issue by the script but the user don't want to wait for the natural | ||
429 | # termination of the script. | ||
430 | # | ||
431 | # Set it to 0 or a negative value for unlimited execution without warnings. | ||
432 | lua-time-limit 5000 | ||
433 | |||
434 | ################################## SLOW LOG ################################### | ||
435 | |||
436 | # The Redis Slow Log is a system to log queries that exceeded a specified | ||
437 | # execution time. The execution time does not include the I/O operations | ||
438 | # like talking with the client, sending the reply and so forth, | ||
439 | # but just the time needed to actually execute the command (this is the only | ||
440 | # stage of command execution where the thread is blocked and can not serve | ||
441 | # other requests in the meantime). | ||
442 | # | ||
443 | # You can configure the slow log with two parameters: one tells Redis | ||
444 | # what is the execution time, in microseconds, to exceed in order for the | ||
445 | # command to get logged, and the other parameter is the length of the | ||
446 | # slow log. When a new command is logged the oldest one is removed from the | ||
447 | # queue of logged commands. | ||
448 | |||
449 | # The following time is expressed in microseconds, so 1000000 is equivalent | ||
450 | # to one second. Note that a negative number disables the slow log, while | ||
451 | # a value of zero forces the logging of every command. | ||
452 | slowlog-log-slower-than 10000 | ||
453 | |||
454 | # There is no limit to this length. Just be aware that it will consume memory. | ||
455 | # You can reclaim memory used by the slow log with SLOWLOG RESET. | ||
456 | slowlog-max-len 128 | ||
457 | |||
458 | ############################### ADVANCED CONFIG ############################### | ||
459 | |||
460 | # Hashes are encoded using a memory efficient data structure when they have a | ||
461 | # small number of entries, and the biggest entry does not exceed a given | ||
462 | # threshold. These thresholds can be configured using the following directives. | ||
463 | hash-max-ziplist-entries 512 | ||
464 | hash-max-ziplist-value 64 | ||
465 | |||
466 | # Similarly to hashes, small lists are also encoded in a special way in order | ||
467 | # to save a lot of space. The special representation is only used when | ||
468 | # you are under the following limits: | ||
469 | list-max-ziplist-entries 512 | ||
470 | list-max-ziplist-value 64 | ||
471 | |||
472 | # Sets have a special encoding in just one case: when a set is composed | ||
473 | # of just strings that happens to be integers in radix 10 in the range | ||
474 | # of 64 bit signed integers. | ||
475 | # The following configuration setting sets the limit in the size of the | ||
476 | # set in order to use this special memory saving encoding. | ||
477 | set-max-intset-entries 512 | ||
478 | |||
479 | # Similarly to hashes and lists, sorted sets are also specially encoded in | ||
480 | # order to save a lot of space. This encoding is only used when the length and | ||
481 | # elements of a sorted set are below the following limits: | ||
482 | zset-max-ziplist-entries 128 | ||
483 | zset-max-ziplist-value 64 | ||
484 | |||
485 | # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in | ||
486 | # order to help rehashing the main Redis hash table (the one mapping top-level | ||
487 | # keys to values). The hash table implementation Redis uses (see dict.c) | ||
488 | # performs a lazy rehashing: the more operation you run into an hash table | ||
489 | # that is rehashing, the more rehashing "steps" are performed, so if the | ||
490 | # server is idle the rehashing is never complete and some more memory is used | ||
491 | # by the hash table. | ||
492 | # | ||
493 | # The default is to use this millisecond 10 times every second in order to | ||
494 | # active rehashing the main dictionaries, freeing memory when possible. | ||
495 | # | ||
496 | # If unsure: | ||
497 | # use "activerehashing no" if you have hard latency requirements and it is | ||
498 | # not a good thing in your environment that Redis can reply form time to time | ||
499 | # to queries with 2 milliseconds delay. | ||
500 | # | ||
501 | # use "activerehashing yes" if you don't have such hard requirements but | ||
502 | # want to free memory asap when possible. | ||
503 | activerehashing yes | ||
504 | |||
505 | # The client output buffer limits can be used to force disconnection of clients | ||
506 | # that are not reading data from the server fast enough for some reason (a | ||
507 | # common reason is that a Pub/Sub client can't consume messages as fast as the | ||
508 | # publisher can produce them). | ||
509 | # | ||
510 | # The limit can be set differently for the three different classes of clients: | ||
511 | # | ||
512 | # normal -> normal clients | ||
513 | # slave -> slave clients and MONITOR clients | ||
514 | # pubsub -> clients subcribed to at least one pubsub channel or pattern | ||
515 | # | ||
516 | # The syntax of every client-output-buffer-limit directive is the following: | ||
517 | # | ||
518 | # client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds> | ||
519 | # | ||
520 | # A client is immediately disconnected once the hard limit is reached, or if | ||
521 | # the soft limit is reached and remains reached for the specified number of | ||
522 | # seconds (continuously). | ||
523 | # So for instance if the hard limit is 32 megabytes and the soft limit is | ||
524 | # 16 megabytes / 10 seconds, the client will get disconnected immediately | ||
525 | # if the size of the output buffers reach 32 megabytes, but will also get | ||
526 | # disconnected if the client reaches 16 megabytes and continuously overcomes | ||
527 | # the limit for 10 seconds. | ||
528 | # | ||
529 | # By default normal clients are not limited because they don't receive data | ||
530 | # without asking (in a push way), but just after a request, so only | ||
531 | # asynchronous clients may create a scenario where data is requested faster | ||
532 | # than it can read. | ||
533 | # | ||
534 | # Instead there is a default limit for pubsub and slave clients, since | ||
535 | # subscribers and slaves receive data in a push fashion. | ||
536 | # | ||
537 | # Both the hard or the soft limit can be disabled just setting it to zero. | ||
538 | client-output-buffer-limit normal 0 0 0 | ||
539 | client-output-buffer-limit slave 256mb 64mb 60 | ||
540 | client-output-buffer-limit pubsub 32mb 8mb 60 | ||
541 | |||
542 | ################################## INCLUDES ################################### | ||
543 | |||
544 | # Include one or more other config files here. This is useful if you | ||
545 | # have a standard template that goes to all Redis server but also need | ||
546 | # to customize a few per-server settings. Include files can include | ||
547 | # other files, so use this wisely. | ||
548 | # | ||
549 | # include /path/to/local.conf | ||
550 | # include /path/to/other.conf | ||
diff --git a/meta-oe/recipes-extended/redis/redis_2.6.9.bb b/meta-oe/recipes-extended/redis/redis_2.6.9.bb new file mode 100644 index 000000000..8f009757f --- /dev/null +++ b/meta-oe/recipes-extended/redis/redis_2.6.9.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | SUMMARY = "Redis key-value store" | ||
2 | DESCRIPTION = "Redis is an open source, advanced key-value store." | ||
3 | HOMEPAGE = "http://redis.io" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "BSD" | ||
6 | LIC_FILES_CHKSUM="file://COPYING;md5=673e0ac66aac758f8f2140c6fc7947d2" | ||
7 | |||
8 | SRC_URI = "http://redis.googlecode.com/files/redis-${PV}.tar.gz \ | ||
9 | file://hiredis-use-default-CC-if-it-is-set.patch \ | ||
10 | file://lua-update-Makefile-to-use-environment-build-setting.patch \ | ||
11 | file://oe-use-libc-malloc.patch \ | ||
12 | file://redis.conf \ | ||
13 | file://init-redis-server \ | ||
14 | " | ||
15 | |||
16 | inherit update-rc.d | ||
17 | |||
18 | INITSCRIPT_NAME = "redis-server" | ||
19 | INITSCRIPT_PARAMS = "defaults 87" | ||
20 | |||
21 | SRC_URI[md5sum] = "5093fb7c5f763e828c857daf260665bc" | ||
22 | SRC_URI[sha256sum] = "4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489" | ||
23 | |||
24 | do_install() { | ||
25 | export PREFIX=${D}/${prefix} | ||
26 | oe_runmake install | ||
27 | |||
28 | install -d ${D}/${sysconfdir}/redis | ||
29 | install -m 0755 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf | ||
30 | |||
31 | install -d ${D}/${sysconfdir}/init.d | ||
32 | install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server | ||
33 | |||
34 | install -d ${D}/var/lib/redis/ | ||
35 | } | ||
36 | |||
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch new file mode 100644 index 000000000..cf5d7752e --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From c581b02d074f5a109074bc190f373f5ba4320468 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tobias Oetiker <tobi@oetiker.ch> | ||
3 | Date: Thu, 3 Oct 2013 15:51:00 +0200 | ||
4 | Subject: [PATCH] removing testing leftovers | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
9 | |||
10 | --- | ||
11 | bindings/perl-piped/leaktest.pl | 16 ---------------- | ||
12 | 1 file changed, 16 deletions(-) | ||
13 | delete mode 100644 bindings/perl-piped/leaktest.pl | ||
14 | |||
15 | diff --git a/bindings/perl-piped/leaktest.pl b/bindings/perl-piped/leaktest.pl | ||
16 | deleted file mode 100644 | ||
17 | index cebf1c7..0000000 | ||
18 | --- a/bindings/perl-piped/leaktest.pl | ||
19 | +++ /dev/null | ||
20 | @@ -1,16 +0,0 @@ | ||
21 | -#!/bin/perl -w | ||
22 | -$ENV{PATH}="/usr/ucb"; | ||
23 | -use strict; | ||
24 | -use RRDp; | ||
25 | -my $rrdfile='/tmp/test.rrd'; | ||
26 | -RRDp::start '/home/oetiker/data/projects/AABN-rrdtool/src/rrdtool'; | ||
27 | -print grep /rrdtool/,`ps au`; | ||
28 | -print grep /rrdtool/,`ps au`; | ||
29 | -my $i=0; | ||
30 | -while ($i<1000) { | ||
31 | - RRDp::cmd 'info /tmp/test.rrd'; | ||
32 | - $_ = RRDp::read; | ||
33 | - $i++; | ||
34 | -} | ||
35 | -$_ = RRDp::end; | ||
36 | -print grep /rrdtool/,`ps au`; | ||
37 | -- | ||
38 | 1.8.5.5 | ||
39 | |||
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch new file mode 100644 index 000000000..321a842b6 --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- a/configure.ac 2012-11-06 11:20:54.099021892 -0500 | ||
2 | +++ b/configure.ac~ 2012-11-06 11:19:57.255023857 -0500 | ||
3 | @@ -548,7 +548,7 @@ | ||
4 | |||
5 | fi | ||
6 | EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") | ||
7 | -EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2) | ||
8 | +EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, "") | ||
9 | |||
10 | if test "$EX_CHECK_ALL_ERR" = "YES"; then | ||
11 | AC_MSG_ERROR([Please fix the library issues listed above and try again.]) | ||
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb new file mode 100644 index 000000000..6bc5e9863 --- /dev/null +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb | |||
@@ -0,0 +1,122 @@ | |||
1 | SUMMARY = "High performance data logging and graphing system for time series data" | ||
2 | HOMEPAGE = "http://oss.oetiker.ch/rrdtool/" | ||
3 | |||
4 | LICENSE = "GPLv2" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" | ||
6 | |||
7 | DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native" | ||
8 | |||
9 | SRCREV = "1850e00a17e25e93c39e608f4e2da50f29c5c712" | ||
10 | PV = "1.4.8" | ||
11 | |||
12 | SRC_URI = "\ | ||
13 | git://github.com/oetiker/rrdtool-1.x.git;branch=1.4 \ | ||
14 | file://remove_hardcoded_xml_include.patch \ | ||
15 | file://0001-removing-testing-leftovers.patch \ | ||
16 | " | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit autotools-brokensep gettext pythonnative perlnative python-dir cpan-base | ||
21 | |||
22 | EXTRA_AUTORECONF = "-I m4" | ||
23 | |||
24 | PACKAGECONFIG ??= "python perl" | ||
25 | |||
26 | PACKAGECONFIG[python] = "--enable-python=yes \ | ||
27 | am_cv_python_pythondir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages \ | ||
28 | am_cv_python_pyexecdir=${STAGING_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages,\ | ||
29 | --disable-python,python," | ||
30 | |||
31 | PACKAGECONFIG[perl] = \ | ||
32 | "--enable-perl=yes --with-perl-options='INSTALLDIRS="vendor"' \ | ||
33 | ac_cv_path_PERL_CC='${CC}', \ | ||
34 | --disable-perl,perl," | ||
35 | |||
36 | PACKAGECONFIG[dbi] = "--enable-libdbi,--disable-libdbi,libdbi" | ||
37 | |||
38 | EXTRA_OECONF = " \ | ||
39 | --enable-shared \ | ||
40 | --disable-libwrap \ | ||
41 | --program-prefix='' \ | ||
42 | rd_cv_ieee_works=yes \ | ||
43 | --disable-ruby \ | ||
44 | --disable-lua \ | ||
45 | --disable-tcl \ | ||
46 | --disable-rpath \ | ||
47 | " | ||
48 | |||
49 | # don't use perl.real, this results in break issues with prebuilts since perl.real doesn't | ||
50 | # know where the PERL5LIB is... | ||
51 | # use wrapper perl instead | ||
52 | EXTRA_OEMAKE = "PERL=${STAGING_BINDIR_NATIVE}/perl-native/perl FULLPERL=${STAGING_BINDIR_NATIVE}/perl-native/perl" | ||
53 | |||
54 | export BUILD_SYS | ||
55 | export HOST_SYS | ||
56 | export STAGING_LIBDIR | ||
57 | export STAGING_INCDIR | ||
58 | |||
59 | # Env var which tells perl if it should use host (no) or target (yes) settings | ||
60 | export PERLCONFIGTARGET = "${@is_target(d)}" | ||
61 | export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" | ||
62 | export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" | ||
63 | export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" | ||
64 | |||
65 | do_configure() { | ||
66 | #fix the pkglib problem with newer automake | ||
67 | #perl | ||
68 | sed -i -e "s|-Wl,--rpath -Wl,\$rp||g" \ | ||
69 | ${S}/bindings/perl-shared/Makefile.PL | ||
70 | |||
71 | #python | ||
72 | sed -i -e '/PYTHON_INCLUDES="-I${/c \ | ||
73 | PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \ | ||
74 | ${S}/m4/acinclude.m4 | ||
75 | #remove the hardcoded $(libdir) rpath | ||
76 | sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am | ||
77 | |||
78 | autotools_do_configure | ||
79 | |||
80 | #modify python sitepkg | ||
81 | #remove the dependency of perl-shared:Makefile | ||
82 | #or perl-shared/Makefile will be regenerated | ||
83 | #if any code touch bindings/Makefile after below perl bindings code | ||
84 | sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \ | ||
85 | --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \ | ||
86 | -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \ | ||
87 | ${B}/bindings/Makefile | ||
88 | |||
89 | #redo the perl bindings | ||
90 | ( | ||
91 | cd ${S}/bindings/perl-shared; | ||
92 | perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc"; | ||
93 | |||
94 | cd ../../bindings/perl-piped; | ||
95 | perl Makefile.PL INSTALLDIRS="vendor"; | ||
96 | ) | ||
97 | |||
98 | #change the interpreter in file | ||
99 | sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \ | ||
100 | ${B}/examples/Makefile | ||
101 | sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \ | ||
102 | ${B}/examples/*.pl | ||
103 | } | ||
104 | |||
105 | PACKAGES =+ "${PN}-perl ${PN}-python" | ||
106 | |||
107 | FILES_${PN}-doc += "${datadir}/examples" | ||
108 | |||
109 | DESCRIPTION_${PN}-perl = \ | ||
110 | "The ${PN}-perl package includes RRDtool bindings for perl." | ||
111 | FILES_${PN}-perl = "${libdir}/perl/vendor_perl/*/*.pm ${datadir}/rrdtool/examples \ | ||
112 | ${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*" | ||
113 | RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \ | ||
114 | perl-module-io-file perl-module-ipc-open2 perl-module-io-socket" | ||
115 | |||
116 | DESCRIPTION_${PN}-python = \ | ||
117 | "The ${PN}-python package includes RRDtool bindings for python." | ||
118 | FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" | ||
119 | RDEPENDS_${PN}-python = "python" | ||
120 | |||
121 | FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ | ||
122 | ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/initscript b/meta-oe/recipes-extended/rsyslog/rsyslog/initscript new file mode 100644 index 000000000..7a8f8f991 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/initscript | |||
@@ -0,0 +1,118 @@ | |||
1 | #! /bin/sh | ||
2 | # | ||
3 | # This is an init script for openembedded | ||
4 | # Copy it to /etc/init.d/rsyslog and type | ||
5 | # > update-rc.d rsyslog defaults 5 | ||
6 | # | ||
7 | |||
8 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
9 | NAME=rsyslog | ||
10 | RSYSLOGD=rsyslogd | ||
11 | RSYSLOGD_BIN=/usr/sbin/rsyslogd | ||
12 | RSYSLOGD_OPTIONS="" | ||
13 | RSYSLOGD_PIDFILE=/var/run/rsyslogd.pid | ||
14 | SCRIPTNAME=/etc/init.d/$NAME | ||
15 | # Exit if the package is not installed | ||
16 | [ -x "$RSYSLOGD_BIN" ] || exit 0 | ||
17 | # Read configuration variable file if it is present | ||
18 | [ -r /etc/default/$NAME ] && . /etc/default/$NAME | ||
19 | # | ||
20 | # Function that starts the daemon/service | ||
21 | # | ||
22 | do_start() | ||
23 | { | ||
24 | DAEMON=$1 | ||
25 | DAEMON_ARGS=$2 | ||
26 | PIDFILE=$3 | ||
27 | # Return | ||
28 | # 0 if daemon has been started | ||
29 | # 1 if daemon could not be started | ||
30 | # if daemon had already been started, start-stop-daemon will return 1 | ||
31 | # so add -o/--oknodo(if nothing is done, exit 0) | ||
32 | start-stop-daemon -S --quiet --pidfile $PIDFILE --exec $DAEMON \ | ||
33 | --oknodo -- $DAEMON_ARGS || return 1 | ||
34 | } | ||
35 | # | ||
36 | # Function that stops the daemon/service | ||
37 | # | ||
38 | do_stop() | ||
39 | { | ||
40 | NAME=$1 | ||
41 | PIDFILE=$2 | ||
42 | # Return | ||
43 | # 0 if daemon has been stopped | ||
44 | # 1 if daemon was already stopped | ||
45 | # 2 if daemon could not be stopped | ||
46 | # other if a failure occurred | ||
47 | # QUIT/TERM/INT should work here, but they don't ????? | ||
48 | start-stop-daemon -K --quiet --signal KILL --pidfile $PIDFILE --name $NAME | ||
49 | RETVAL="$?" | ||
50 | rm -f $PIDFILE | ||
51 | return "$RETVAL" | ||
52 | } | ||
53 | # | ||
54 | # Function that sends a SIGHUP to the daemon/service | ||
55 | # | ||
56 | do_reload() { | ||
57 | NAME=$1 | ||
58 | PIDFILE=$2 | ||
59 | start-stop-daemon -K --signal HUP --quiet --pidfile $PIDFILE --name $NAME | ||
60 | return 0 | ||
61 | } | ||
62 | |||
63 | do_status() { | ||
64 | NAME=$1 | ||
65 | PIDFILE=$2 | ||
66 | # -t: test only but not stop | ||
67 | start-stop-daemon -K -t --quiet --pidfile $PIDFILE --name $NAME | ||
68 | # exit with status 0 if process is found | ||
69 | if [ "$?" = "0" ]; then | ||
70 | return 0 | ||
71 | else | ||
72 | return 1 | ||
73 | fi | ||
74 | } | ||
75 | |||
76 | case "$1" in | ||
77 | start) | ||
78 | echo -n "starting $RSYSLOGD ... " | ||
79 | do_start "$RSYSLOGD_BIN" "$RSYSLOGD_OPTIONS" "$RSYSLOGD_PIDFILE" | ||
80 | case "$?" in | ||
81 | 0) echo "done" ;; | ||
82 | 1) echo "failed" ;; | ||
83 | esac | ||
84 | ;; | ||
85 | stop) | ||
86 | echo -n "stopping $RSYSLOGD ... " | ||
87 | do_stop "$RSYSLOGD" "$RSYSLOGD_PIDFILE" | ||
88 | case "$?" in | ||
89 | 0|1) echo "done" ;; | ||
90 | 2) echo "failed" ;; | ||
91 | esac | ||
92 | ;; | ||
93 | reload|force-reload) | ||
94 | echo -n "reloading $RSYSLOGD ... " | ||
95 | do_reload "$RSYSLOGD" "$RSYSLOGD_PIDFILE" | ||
96 | echo "done" | ||
97 | ;; | ||
98 | restart) | ||
99 | $0 stop | ||
100 | $0 start | ||
101 | ;; | ||
102 | status) | ||
103 | echo -n "status $RSYSLOGD ... " | ||
104 | do_status "$RSYSLOGD" "$RSYSLOGD_PIDFILE" | ||
105 | if [ "$?" = "0" ]; then | ||
106 | echo "running" | ||
107 | exit 0 | ||
108 | else | ||
109 | echo "stopped" | ||
110 | exit 1 | ||
111 | fi | ||
112 | ;; | ||
113 | *) | ||
114 | echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload}" >&2 | ||
115 | exit 3 | ||
116 | ;; | ||
117 | esac | ||
118 | exit 0 | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch new file mode 100644 index 000000000..bdcb6e22a --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-fix-ptest-not-finish.patch | |||
@@ -0,0 +1,96 @@ | |||
1 | $MaxMessageSize doesn't work if before $IncludeConfig diag-common.conf, then | ||
2 | test cases fall into infinite loop with error message: | ||
3 | |||
4 | 8062.511110729:4902c480: error: message received is larger than max msg size, we split it | ||
5 | 8062.511152265:4902c480: discarding zero-sized message | ||
6 | |||
7 | Update configure to fix it. | ||
8 | |||
9 | Upstream-Status: pending | ||
10 | |||
11 | Kai Kang <kai.kang@windriver.com> | ||
12 | --- | ||
13 | diff -Nru rsyslog-7.4.4/tests/testsuites/complex1.conf rsyslog-7.4.4.new/tests/testsuites/complex1.conf | ||
14 | --- rsyslog-7.4.4/tests/testsuites/complex1.conf 2013-08-31 00:30:41.000000000 +0800 | ||
15 | +++ rsyslog-7.4.4.new/tests/testsuites/complex1.conf 2013-12-18 14:28:10.644004184 +0800 | ||
16 | @@ -1,7 +1,7 @@ | ||
17 | # complex test case with multiple actions in gzip mode | ||
18 | # rgerhards, 2009-05-22 | ||
19 | -$MaxMessageSize 10k | ||
20 | $IncludeConfig diag-common.conf | ||
21 | +$MaxMessageSize 10k | ||
22 | |||
23 | $MainMsgQueueTimeoutEnqueue 5000 | ||
24 | |||
25 | diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf | ||
26 | --- rsyslog-7.4.4/tests/testsuites/gzipwr_large.conf 2012-04-04 14:29:55.000000000 +0800 | ||
27 | +++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large.conf 2013-12-18 14:28:10.645004186 +0800 | ||
28 | @@ -1,7 +1,7 @@ | ||
29 | # simple async writing test | ||
30 | # rgerhards, 2010-03-09 | ||
31 | -$MaxMessageSize 10k | ||
32 | $IncludeConfig diag-common.conf | ||
33 | +$MaxMessageSize 10k | ||
34 | |||
35 | $ModLoad ../plugins/imtcp/.libs/imtcp | ||
36 | $MainMsgQueueTimeoutShutdown 10000 | ||
37 | diff -Nru rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf | ||
38 | --- rsyslog-7.4.4/tests/testsuites/gzipwr_large_dynfile.conf 2012-04-04 14:29:55.000000000 +0800 | ||
39 | +++ rsyslog-7.4.4.new/tests/testsuites/gzipwr_large_dynfile.conf 2013-12-18 14:28:10.645004186 +0800 | ||
40 | @@ -1,7 +1,7 @@ | ||
41 | # simple async writing test | ||
42 | # rgerhards, 2010-03-09 | ||
43 | -$MaxMessageSize 10k | ||
44 | $IncludeConfig diag-common.conf | ||
45 | +$MaxMessageSize 10k | ||
46 | |||
47 | $ModLoad ../plugins/imtcp/.libs/imtcp | ||
48 | $MainMsgQueueTimeoutShutdown 10000 | ||
49 | diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf | ||
50 | --- rsyslog-7.4.4/tests/testsuites/imptcp_conndrop.conf 2013-08-31 00:30:41.000000000 +0800 | ||
51 | +++ rsyslog-7.4.4.new/tests/testsuites/imptcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 | ||
52 | @@ -1,7 +1,7 @@ | ||
53 | # simple async writing test | ||
54 | # rgerhards, 2010-03-09 | ||
55 | -$MaxMessageSize 10k | ||
56 | $IncludeConfig diag-common.conf | ||
57 | +$MaxMessageSize 10k | ||
58 | |||
59 | $ModLoad ../plugins/imptcp/.libs/imptcp | ||
60 | $MainMsgQueueTimeoutShutdown 10000 | ||
61 | diff -Nru rsyslog-7.4.4/tests/testsuites/imptcp_large.conf rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf | ||
62 | --- rsyslog-7.4.4/tests/testsuites/imptcp_large.conf 2013-08-31 00:30:41.000000000 +0800 | ||
63 | +++ rsyslog-7.4.4.new/tests/testsuites/imptcp_large.conf 2013-12-18 14:28:10.646004189 +0800 | ||
64 | @@ -1,7 +1,7 @@ | ||
65 | # simple async writing test | ||
66 | # rgerhards, 2010-03-09 | ||
67 | -$MaxMessageSize 10k | ||
68 | $IncludeConfig diag-common.conf | ||
69 | +$MaxMessageSize 10k | ||
70 | |||
71 | $ModLoad ../plugins/imptcp/.libs/imptcp | ||
72 | $MainMsgQueueTimeoutShutdown 10000 | ||
73 | diff -Nru rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf | ||
74 | --- rsyslog-7.4.4/tests/testsuites/imtcp_conndrop.conf 2013-07-19 20:59:03.000000000 +0800 | ||
75 | +++ rsyslog-7.4.4.new/tests/testsuites/imtcp_conndrop.conf 2013-12-18 14:28:10.646004189 +0800 | ||
76 | @@ -1,7 +1,7 @@ | ||
77 | # simple async writing test | ||
78 | # rgerhards, 2010-03-09 | ||
79 | -$MaxMessageSize 10k | ||
80 | $IncludeConfig diag-common.conf | ||
81 | +$MaxMessageSize 10k | ||
82 | |||
83 | $ModLoad ../plugins/imtcp/.libs/imtcp | ||
84 | $MainMsgQueueTimeoutShutdown 10000 | ||
85 | diff -Nru rsyslog-7.4.4/tests/testsuites/wr_large.conf rsyslog-7.4.4.new/tests/testsuites/wr_large.conf | ||
86 | --- rsyslog-7.4.4/tests/testsuites/wr_large.conf 2012-04-04 14:29:55.000000000 +0800 | ||
87 | +++ rsyslog-7.4.4.new/tests/testsuites/wr_large.conf 2013-12-18 14:28:10.647004190 +0800 | ||
88 | @@ -1,7 +1,7 @@ | ||
89 | # simple async writing test | ||
90 | # rgerhards, 2010-03-09 | ||
91 | -$MaxMessageSize 10k | ||
92 | $IncludeConfig diag-common.conf | ||
93 | +$MaxMessageSize 10k | ||
94 | |||
95 | $ModLoad ../plugins/imtcp/.libs/imtcp | ||
96 | $MainMsgQueueTimeoutShutdown 10000 | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch new file mode 100644 index 000000000..3a16f2649 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog-use-serial-tests-config-needed-by-ptest.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | Subject: [PATCH] rsyslog: use serial-tests config needed by ptest | ||
2 | |||
3 | ptest needs buildtest-TESTS and runtest-TESTS targets. | ||
4 | serial-tests is required to generate those targets. | ||
5 | |||
6 | Upstream-Status: Inappropriate [default automake behavior incompatible with ptest] | ||
7 | |||
8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
9 | --- | ||
10 | configure.ac | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 1b880f8..0e29742 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -3,7 +3,7 @@ | ||
18 | |||
19 | AC_PREREQ(2.61) | ||
20 | AC_INIT([rsyslog],[7.4.4],[rsyslog@lists.adiscon.com]) | ||
21 | -AM_INIT_AUTOMAKE | ||
22 | +AM_INIT_AUTOMAKE([serial-tests]) | ||
23 | |||
24 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | ||
25 | |||
26 | -- | ||
27 | 2.0.0 | ||
28 | |||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf new file mode 100644 index 000000000..54f8bb6a5 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.conf | |||
@@ -0,0 +1,84 @@ | |||
1 | # if you experience problems, check | ||
2 | # http://www.rsyslog.com/troubleshoot for assistance | ||
3 | |||
4 | # rsyslog v3: load input modules | ||
5 | # If you do not load inputs, nothing happens! | ||
6 | # You may need to set the module load path if modules are not found. | ||
7 | # | ||
8 | # Ported from debian's sysklogd.conf | ||
9 | |||
10 | $ModLoad immark # provides --MARK-- message capability | ||
11 | $ModLoad imuxsock # provides support for local system logging (e.g. via logger command) | ||
12 | $ModLoad imklog # kernel logging (formerly provided by rklogd) | ||
13 | |||
14 | # | ||
15 | # Set the default permissions | ||
16 | # | ||
17 | $FileCreateMode 0640 | ||
18 | $DirCreateMode 0755 | ||
19 | $Umask 0022 | ||
20 | |||
21 | auth,authpriv.* /var/log/auth.log | ||
22 | *.*;auth,authpriv.none -/var/log/syslog | ||
23 | cron.* /var/log/cron.log | ||
24 | daemon.* -/var/log/daemon.log | ||
25 | kern.* -/var/log/kern.log | ||
26 | lpr.* -/var/log/lpr.log | ||
27 | mail.* -/var/log/mail.log | ||
28 | user.* -/var/log/user.log | ||
29 | |||
30 | # | ||
31 | # Logging for the mail system. Split it up so that | ||
32 | # it is easy to write scripts to parse these files. | ||
33 | # | ||
34 | mail.info -/var/log/mail.info | ||
35 | mail.warn -/var/log/mail.warn | ||
36 | mail.err /var/log/mail.err | ||
37 | |||
38 | # Logging for INN news system | ||
39 | # | ||
40 | news.crit /var/log/news.crit | ||
41 | news.err /var/log/news.err | ||
42 | news.notice -/var/log/news.notice | ||
43 | |||
44 | # | ||
45 | # Some `catch-all' logfiles. | ||
46 | # | ||
47 | *.=debug;\ | ||
48 | auth,authpriv.none;\ | ||
49 | news.none;mail.none -/var/log/debug | ||
50 | *.=info;*.=notice;*.=warn;\ | ||
51 | auth,authpriv.none;\ | ||
52 | cron,daemon.none;\ | ||
53 | mail,news.none -/var/log/messages | ||
54 | |||
55 | # | ||
56 | # Emergencies are sent to everybody logged in. | ||
57 | # | ||
58 | *.emerg :omusrmsg:* | ||
59 | |||
60 | # Save boot messages also to boot.log | ||
61 | local7.* /var/log/boot.log | ||
62 | |||
63 | # Remote Logging (we use TCP for reliable delivery) | ||
64 | # An on-disk queue is created for this action. If the remote host is | ||
65 | # down, messages are spooled to disk and sent when it is up again. | ||
66 | #$WorkDirectory /var/spool/rsyslog # where to place spool files | ||
67 | #$ActionQueueFileName uniqName # unique name prefix for spool files | ||
68 | $ActionQueueMaxDiskSpace 10m # 1gb space limit (use as much as possible) | ||
69 | #$ActionQueueSaveOnShutdown on # save messages to disk on shutdown | ||
70 | #$ActionQueueType LinkedList # run asynchronously | ||
71 | #$ActionResumeRetryCount -1 # infinite retries if host is down | ||
72 | # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional | ||
73 | #*.* @@remote-host:514 | ||
74 | |||
75 | |||
76 | # ######### Receiving Messages from Remote Hosts ########## | ||
77 | # TCP Syslog Server: | ||
78 | # provides TCP syslog reception and GSS-API (if compiled to support it) | ||
79 | #$ModLoad imtcp.so # load module | ||
80 | #$InputTCPServerRun 514 # start up TCP listener at port 514 | ||
81 | |||
82 | # UDP Syslog Server: | ||
83 | #$ModLoad imudp.so # provides UDP syslog reception | ||
84 | #$UDPServerRun 514 # start a UDP syslog server at standard port 514 | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate new file mode 100644 index 000000000..ba1120af4 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate | |||
@@ -0,0 +1,39 @@ | |||
1 | # /etc/logrotate.d/rsyslog - Ported from Debian | ||
2 | |||
3 | /var/log/syslog | ||
4 | { | ||
5 | rotate 7 | ||
6 | daily | ||
7 | missingok | ||
8 | notifempty | ||
9 | delaycompress | ||
10 | compress | ||
11 | postrotate | ||
12 | /etc/init.d/rsyslog reload 2> /dev/null || true | ||
13 | endscript | ||
14 | } | ||
15 | |||
16 | /var/log/mail.info | ||
17 | /var/log/mail.warn | ||
18 | /var/log/mail.err | ||
19 | /var/log/mail.log | ||
20 | /var/log/daemon.log | ||
21 | /var/log/kern.log | ||
22 | /var/log/auth.log | ||
23 | /var/log/user.log | ||
24 | /var/log/lpr.log | ||
25 | /var/log/cron.log | ||
26 | /var/log/debug | ||
27 | /var/log/messages | ||
28 | { | ||
29 | rotate 4 | ||
30 | weekly | ||
31 | missingok | ||
32 | notifempty | ||
33 | compress | ||
34 | delaycompress | ||
35 | sharedscripts | ||
36 | postrotate | ||
37 | /etc/init.d/rsyslog reload 2> /dev/null || true | ||
38 | endscript | ||
39 | } | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest new file mode 100644 index 000000000..38a1d1b72 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | make -C tests -k runtest-TESTS | ||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch new file mode 100644 index 000000000..ebc10707c --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 5c3ba79177f7d1763db33c4358af2af60ff214b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Roy Li <rongqing.li@windriver.com> | ||
3 | Date: Wed, 18 Jun 2014 13:46:52 +0800 | ||
4 | Subject: [PATCH] use pkgconfig to check libgcrypt | ||
5 | |||
6 | Upstream-status: Inappropriate [configuration] | ||
7 | |||
8 | libgcrypt does no longer provide libgcrypt-config, and provide | ||
9 | *.pc, so we should use pkgconfig to check | ||
10 | |||
11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
12 | --- | ||
13 | configure.ac | 19 +------------------ | ||
14 | 1 file changed, 1 insertion(+), 18 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 017116e..1b880f8 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -784,24 +784,7 @@ AC_ARG_ENABLE(libgcrypt, | ||
21 | [enable_libgcrypt=yes] | ||
22 | ) | ||
23 | if test "x$enable_libgcrypt" = "xyes"; then | ||
24 | - AC_CHECK_PROG( | ||
25 | - [HAVE_LIBGCRYPT_CONFIG], | ||
26 | - [libgcrypt-config], | ||
27 | - [yes],,, | ||
28 | - ) | ||
29 | - if test "x${HAVE_LIBGCRYPT_CONFIG}" != "xyes"; then | ||
30 | - AC_MSG_FAILURE([libgcrypt-config not found in PATH]) | ||
31 | - fi | ||
32 | - AC_CHECK_LIB( | ||
33 | - [gcrypt], | ||
34 | - [gcry_cipher_open], | ||
35 | - [LIBGCRYPT_CFLAGS="`libgcrypt-config --cflags`" | ||
36 | - LIBGCRYPT_LIBS="`libgcrypt-config --libs`" | ||
37 | - ], | ||
38 | - [AC_MSG_FAILURE([libgcrypt is missing])], | ||
39 | - [`libgcrypt-config --libs --cflags`] | ||
40 | - ) | ||
41 | - AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present]) | ||
42 | + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) | ||
43 | fi | ||
44 | AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) | ||
45 | AC_SUBST(LIBGCRYPT_CFLAGS) | ||
46 | -- | ||
47 | 1.7.9.5 | ||
48 | |||
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb new file mode 100644 index 000000000..db7900cf5 --- /dev/null +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | |||
@@ -0,0 +1,169 @@ | |||
1 | SUMMARY = "Rsyslog is an enhanced multi-threaded syslogd" | ||
2 | DESCRIPTION = "\ | ||
3 | Rsyslog is an enhanced syslogd supporting, among others, MySQL,\ | ||
4 | PostgreSQL, failover log destinations, syslog/tcp, fine grain\ | ||
5 | output format control, high precision timestamps, queued operations\ | ||
6 | and the ability to filter on any message part. It is quite\ | ||
7 | compatible to stock sysklogd and can be used as a drop-in replacement.\ | ||
8 | Its advanced features make it suitable for enterprise-class,\ | ||
9 | encryption protected syslog relay chains while at the same time being\ | ||
10 | very easy to setup for the novice user." | ||
11 | |||
12 | DEPENDS = "zlib libestr json-c bison-native flex-native" | ||
13 | HOMEPAGE = "http://www.rsyslog.com/" | ||
14 | LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" | ||
15 | LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ | ||
16 | file://COPYING.LESSER;md5=cb7903f1e5c39ae838209e130dca270a \ | ||
17 | file://COPYING.ASL20;md5=052f8a09206615ab07326ff8ce2d9d32\ | ||
18 | " | ||
19 | |||
20 | SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \ | ||
21 | file://initscript \ | ||
22 | file://rsyslog.conf \ | ||
23 | file://rsyslog.logrotate \ | ||
24 | file://use-pkgconfig-to-check-libgcrypt.patch \ | ||
25 | file://run-ptest \ | ||
26 | file://rsyslog-fix-ptest-not-finish.patch \ | ||
27 | file://rsyslog-use-serial-tests-config-needed-by-ptest.patch \ | ||
28 | " | ||
29 | |||
30 | SRC_URI[md5sum] = "ebcc010a6205c28eb505c0fe862f32c6" | ||
31 | SRC_URI[sha256sum] = "276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc2f9087" | ||
32 | |||
33 | inherit autotools pkgconfig systemd update-rc.d update-alternatives ptest | ||
34 | |||
35 | EXTRA_OECONF += "--enable-cached-man-pages" | ||
36 | |||
37 | # first line is default yes in configure | ||
38 | PACKAGECONFIG ??= " \ | ||
39 | zlib rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ | ||
40 | imdiag gnutls \ | ||
41 | ${@base_contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \ | ||
42 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | ||
43 | ${@base_contains('DISTRO_FEATURES', 'ptest', 'testbench ${VALGRIND}', '', d)} \ | ||
44 | " | ||
45 | |||
46 | # default yes in configure | ||
47 | PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," | ||
48 | PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,," | ||
49 | PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," | ||
50 | PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," | ||
51 | PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," | ||
52 | PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," | ||
53 | PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," | ||
54 | PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," | ||
55 | PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," | ||
56 | |||
57 | # default no in configure | ||
58 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," | ||
59 | PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,," | ||
60 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," | ||
61 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," | ||
62 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," | ||
63 | PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," | ||
64 | PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," | ||
65 | PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," | ||
66 | PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," | ||
67 | PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,," | ||
68 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," | ||
69 | |||
70 | TESTDIR = "tests" | ||
71 | do_compile_ptest() { | ||
72 | sed -i 's/\(^buildtest-TESTS: \)/\1 $(check_PROGRAMS) /' ${TESTDIR}/Makefile | ||
73 | oe_runmake -C ${TESTDIR} buildtest-TESTS | ||
74 | } | ||
75 | |||
76 | do_install_ptest() { | ||
77 | # install the tests | ||
78 | cp -rf ${S}/${TESTDIR} ${D}${PTEST_PATH} | ||
79 | cp -rf ${B}/${TESTDIR} ${D}${PTEST_PATH} | ||
80 | |||
81 | # do NOT need to rebuild Makefile itself | ||
82 | sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
83 | |||
84 | # fix the srcdir | ||
85 | sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
86 | |||
87 | # valgrind is not compatible with arm and mips, | ||
88 | # so remove related test cases if there is no valgrind. | ||
89 | if [ x${VALGRIND} = x ]; then | ||
90 | sed -i '/udp-msgreduc-/d' ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
91 | fi | ||
92 | |||
93 | # install necessary links | ||
94 | install -d ${D}${PTEST_PATH}/tools | ||
95 | ln -sf ${sbindir}/rsyslogd ${D}${PTEST_PATH}/tools/rsyslogd | ||
96 | |||
97 | install -d ${D}${PTEST_PATH}/runtime | ||
98 | install -d ${D}${PTEST_PATH}/runtime/.libs | ||
99 | ( | ||
100 | cd ${D}/${libdir}/rsyslog | ||
101 | allso="*.so" | ||
102 | for i in $allso; do | ||
103 | ln -sf ${libdir}/rsyslog/$i ${D}${PTEST_PATH}/runtime/.libs/$i | ||
104 | done | ||
105 | ) | ||
106 | |||
107 | # fix the module load path with runtime/.libs | ||
108 | find ${D}${PTEST_PATH}/${TESTDIR} -name \*.conf -exec \ | ||
109 | sed -i -e 's:../plugins/.*/.libs/:../runtime/.libs/:' \ | ||
110 | '{}' \; | ||
111 | } | ||
112 | |||
113 | do_install_append() { | ||
114 | install -d "${D}${sysconfdir}/init.d" | ||
115 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog.${BPN} | ||
116 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf | ||
117 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog | ||
118 | } | ||
119 | |||
120 | FILES_${PN} += "${bindir}" | ||
121 | |||
122 | INITSCRIPT_NAME = "syslog" | ||
123 | INITSCRIPT_PARAMS = "defaults" | ||
124 | |||
125 | # higher than sysklogd's 100 | ||
126 | ALTERNATIVE_PRIORITY = "110" | ||
127 | |||
128 | ALTERNATIVE_${PN} = "syslogd syslog-conf syslog-logrotate" | ||
129 | |||
130 | ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" | ||
131 | ALTERNATIVE_TARGET[syslogd] = "${sbindir}/rsyslogd" | ||
132 | ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" | ||
133 | ALTERNATIVE_TARGET[syslog-conf] = "${sysconfdir}/rsyslog.conf" | ||
134 | ALTERNATIVE_LINK_NAME[syslog-logrotate] = "${sysconfdir}/logrotate.d/syslog" | ||
135 | ALTERNATIVE_TARGET[syslog-logrotate] = "${sysconfdir}/logrotate.rsyslog" | ||
136 | |||
137 | CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" | ||
138 | |||
139 | RPROVIDES_${PN} += "${PN}-systemd" | ||
140 | RREPLACES_${PN} += "${PN}-systemd" | ||
141 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
142 | SYSTEMD_SERVICE_${PN} = "${BPN}.service" | ||
143 | |||
144 | RDEPENDS_${PN} += "logrotate update-rc.d" | ||
145 | |||
146 | # for rsyslog-ptest | ||
147 | VALGRIND = "valgrind" | ||
148 | VALGRIND_mips = "" | ||
149 | VALGRIND_mips64 = "" | ||
150 | VALGRIND_arm = "" | ||
151 | VALGRIND_aarch64 = "" | ||
152 | RDEPENDS_${PN}-ptest += "make diffutils gzip" | ||
153 | RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" | ||
154 | |||
155 | # no syslog-init for systemd | ||
156 | python () { | ||
157 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): | ||
158 | pn = d.getVar('PN', True) | ||
159 | sysconfdir = d.getVar('sysconfdir', True) | ||
160 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') | ||
161 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) | ||
162 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) | ||
163 | |||
164 | if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): | ||
165 | pn = d.getVar('PN', True) | ||
166 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') | ||
167 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) | ||
168 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir', True))) | ||
169 | } | ||
diff --git a/meta-oe/recipes-extended/sip/sip_4.16.4.bb b/meta-oe/recipes-extended/sip/sip_4.16.4.bb new file mode 100644 index 000000000..d6d3f9ca5 --- /dev/null +++ b/meta-oe/recipes-extended/sip/sip_4.16.4.bb | |||
@@ -0,0 +1,52 @@ | |||
1 | SUMMARY = "SIP is a C++/Python Wrapper Generator" | ||
2 | AUTHOR = "Phil Thompson" | ||
3 | HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" | ||
4 | SECTION = "devel" | ||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" | ||
7 | DEPENDS_class-target = "qt4-x11-free python" | ||
8 | |||
9 | # riverbankcomputing is upstream, but keeps only latest version, sf usually have few older | ||
10 | #SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz" | ||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz" | ||
12 | SRC_URI[md5sum] = "a9840670a064dbf8f63a8f653776fec9" | ||
13 | SRC_URI[sha256sum] = "ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5" | ||
14 | |||
15 | BBCLASSEXTEND = "native" | ||
16 | |||
17 | inherit qmake2 python-dir pythonnative | ||
18 | PACKAGES += "python-sip" | ||
19 | |||
20 | |||
21 | EXTRA_QMAKEVARS_POST += "CONFIG=console" | ||
22 | |||
23 | export BUILD_SYS | ||
24 | export HOST_SYS | ||
25 | export STAGING_LIBDIR | ||
26 | export STAGING_INCDIR | ||
27 | |||
28 | do_configure_prepend_class-target() { | ||
29 | echo "py_platform = linux" > sip.cfg | ||
30 | echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)" >> sip.cfg | ||
31 | echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg | ||
32 | echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg | ||
33 | echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg | ||
34 | echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg | ||
35 | python configure.py --use-qmake --configuration sip.cfg --sysroot ${STAGING_DIR_HOST} | ||
36 | } | ||
37 | do_configure_prepend_class-native() { | ||
38 | echo "py_platform = linux" > sip.cfg | ||
39 | echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)" >> sip.cfg | ||
40 | echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg | ||
41 | echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg | ||
42 | echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg | ||
43 | echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg | ||
44 | python configure.py --use-qmake --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE} | ||
45 | } | ||
46 | do_install() { | ||
47 | oe_runmake install | ||
48 | } | ||
49 | |||
50 | FILES_python-${PN} = "${libdir}/${PYTHON_DIR}/site-packages/" | ||
51 | FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug" | ||
52 | |||
diff --git a/meta-oe/recipes-extended/smartmontools/files/initd.smartd b/meta-oe/recipes-extended/smartmontools/files/initd.smartd new file mode 100755 index 000000000..54adcb406 --- /dev/null +++ b/meta-oe/recipes-extended/smartmontools/files/initd.smartd | |||
@@ -0,0 +1,112 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | # smartmontools init file for smartd | ||
4 | # Copyright (C) 2002-8 Bruce Allen <smartmontools-support@lists.sourceforge.net> | ||
5 | # $Id: smartd.initd.in 3360 2011-06-06 19:25:36Z chrfranke $ | ||
6 | |||
7 | # For RedHat and cousins: | ||
8 | # chkconfig: - 60 60 | ||
9 | # description: Self Monitoring and Reporting Technology (SMART) Daemon | ||
10 | # processname: smartd | ||
11 | |||
12 | # For SuSE and cousins | ||
13 | ### BEGIN INIT INFO | ||
14 | # Provides: smartd | ||
15 | # Required-Start: $syslog $remote_fs | ||
16 | # Should-Start: sendmail | ||
17 | # Required-Stop: $syslog $remote_fs | ||
18 | # Should-Stop: sendmail | ||
19 | # Default-Start: 2 3 4 5 | ||
20 | # Default-Stop: 0 1 6 | ||
21 | # Short-Description: Monitors disk and tape health via S.M.A.R.T. | ||
22 | # Description: Start S.M.A.R.T. disk and tape monitor. | ||
23 | ### END INIT INFO | ||
24 | |||
25 | # This program is free software; you can redistribute it and/or modify it | ||
26 | # under the terms of the GNU General Public License as published by the Free | ||
27 | # Software Foundation; either version 2, or (at your option) any later | ||
28 | # version. | ||
29 | # You should have received a copy of the GNU General Public License (for | ||
30 | # example COPYING); if not, write to the Free Software Foundation, Inc., 675 | ||
31 | # Mass Ave, Cambridge, MA 02139, USA. | ||
32 | # This code was originally developed as a Senior Thesis by Michael Cornwell | ||
33 | # at the Concurrent Systems Laboratory (now part of the Storage Systems | ||
34 | # Research Center), Jack Baskin School of Engineering, University of | ||
35 | # California, Santa Cruz. http://ssrc.soe.ucsc.edu/. | ||
36 | |||
37 | # Uncomment the line below to pass options to smartd on startup. | ||
38 | # Note that distribution specific configuration files like | ||
39 | # /etc/{default,sysconfig}/smartmontools might override these | ||
40 | #smartd_opts="--interval=1800" | ||
41 | |||
42 | SMARTD_BIN=/usr/sbin/smartd | ||
43 | SMARTDPID=/var/run/smartd.pid | ||
44 | [ -x $SMARTD_BIN ] || exit 0 | ||
45 | RET=0 | ||
46 | |||
47 | # source configuration file | ||
48 | [ -r /etc/default/rcS ] && . /etc/default/rcS | ||
49 | [ -r /etc/default/smartmontools ] && . /etc/default/smartmontools | ||
50 | |||
51 | smartd_opts="--pidfile $SMARTDPID $smartd_opts" | ||
52 | |||
53 | case "$1" in | ||
54 | start) | ||
55 | if [ "$start_smartd" != "yes" ]; then | ||
56 | [ "$VERBOSE" != "no" ] && echo "Not starting S.M.A.R.T. daemon smartd, disabled via /etc/default/smartmontools" | ||
57 | exit 0 | ||
58 | fi | ||
59 | echo -n "Starting S.M.A.R.T. daemon: smartd" | ||
60 | if start-stop-daemon --start --quiet --pidfile $SMARTDPID \ | ||
61 | --exec $SMARTD_BIN -- $smartd_opts; then | ||
62 | echo "." | ||
63 | else | ||
64 | echo " (failed)" | ||
65 | RET=1 | ||
66 | fi | ||
67 | ;; | ||
68 | stop) | ||
69 | echo -n "Stopping S.M.A.R.T. daemon: smartd" | ||
70 | start-stop-daemon --stop --quiet --oknodo --pidfile $SMARTDPID | ||
71 | echo "." | ||
72 | ;; | ||
73 | restart) | ||
74 | $0 stop | ||
75 | $0 start | ||
76 | ;; | ||
77 | force-reload) | ||
78 | $0 reload || $0 restart | ||
79 | ;; | ||
80 | reload) | ||
81 | echo -n "Reload S.M.A.R.T. daemon: smartd" | ||
82 | if start-stop-daemon --stop --quiet --signal 1 \ | ||
83 | --pidfile $SMARTDPID; then | ||
84 | echo "." | ||
85 | else | ||
86 | echo " (failed)" | ||
87 | RET=1 | ||
88 | fi | ||
89 | ;; | ||
90 | report) | ||
91 | echo -n "Checking SMART devices now" | ||
92 | if start-stop-daemon --stop --quiet --signal 10 \ | ||
93 | --pidfile $SMARTDPID; then | ||
94 | echo "." | ||
95 | else | ||
96 | echo " (failed)" | ||
97 | RET=1 | ||
98 | fi | ||
99 | ;; | ||
100 | status) | ||
101 | if pidof $SMARTD_BIN >/dev/null; then | ||
102 | echo "$SMARTD_BIN is running." | ||
103 | else | ||
104 | echo "$SMARTD_BIN is not running." | ||
105 | RET=1 | ||
106 | fi | ||
107 | ;; | ||
108 | *) | ||
109 | echo "Usage: $0 {start|stop|restart|force-reload|reload|report|status}" | ||
110 | exit 1 | ||
111 | esac | ||
112 | exit $RET | ||
diff --git a/meta-oe/recipes-extended/smartmontools/files/smartd.service b/meta-oe/recipes-extended/smartmontools/files/smartd.service new file mode 100644 index 000000000..f3db946c8 --- /dev/null +++ b/meta-oe/recipes-extended/smartmontools/files/smartd.service | |||
@@ -0,0 +1,12 @@ | |||
1 | [Unit] | ||
2 | Description=Self Monitoring and Reporting Technology (SMART) Daemon | ||
3 | After=syslog.target | ||
4 | |||
5 | [Service] | ||
6 | EnvironmentFile=-@SYSCONFDIR@/smartmontools | ||
7 | ExecStart=@SBINDIR@/smartd -n $smart_opts | ||
8 | ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID | ||
9 | StandardOutput=syslog | ||
10 | |||
11 | [Install] | ||
12 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-extended/smartmontools/files/smartmontools.default b/meta-oe/recipes-extended/smartmontools/files/smartmontools.default new file mode 100644 index 000000000..602e00beb --- /dev/null +++ b/meta-oe/recipes-extended/smartmontools/files/smartmontools.default | |||
@@ -0,0 +1,6 @@ | |||
1 | # uncomment to start smartd on system startup for SysV init script | ||
2 | # For systemd service file, use `systemctl enable smartd'. | ||
3 | #start_smartd=yes | ||
4 | |||
5 | # uncomment to pass additional options to smartd on startup | ||
6 | #smartd_opts="--interval=1800" | ||
diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb new file mode 100644 index 000000000..fd7b1b8c5 --- /dev/null +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.2.bb | |||
@@ -0,0 +1,54 @@ | |||
1 | SUMMARY = "Control and monitor storage systems using S.M.A.R.T" | ||
2 | DESCRIPTION = \ | ||
3 | "The smartmontools package contains two utility programs (smartctl \ | ||
4 | and smartd) to control and monitor storage systems using the Self-\ | ||
5 | Monitoring, Analysis and Reporting Technology System (SMART) built \ | ||
6 | into most modern ATA and SCSI hard disks. In many cases, these \ | ||
7 | utilities will provide advanced warning of disk degradation and failure." | ||
8 | |||
9 | HOMEPAGE = "http://smartmontools.sourceforge.net/" | ||
10 | SECTION = "console/utils" | ||
11 | |||
12 | LICENSE = "GPLv2" | ||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \ | ||
16 | file://initd.smartd \ | ||
17 | file://smartmontools.default \ | ||
18 | file://smartd.service \ | ||
19 | " | ||
20 | |||
21 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ | ||
22 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | ||
23 | " | ||
24 | PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" | ||
25 | PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" | ||
26 | |||
27 | SRC_URI[md5sum] = "d44f84081a12cef79cd17f78044351fc" | ||
28 | SRC_URI[sha256sum] = "486f660579bb0fb4f6b927ded7531cb1f99685c666397377761c5b04dd96065b" | ||
29 | |||
30 | inherit autotools update-rc.d systemd | ||
31 | |||
32 | SYSTEMD_SERVICE_${PN} = "smartd.service" | ||
33 | SYSTEMD_AUTO_ENABLE = "disable" | ||
34 | |||
35 | do_install_append () { | ||
36 | #install the init.d/smartd | ||
37 | install -d ${D}${sysconfdir}/init.d | ||
38 | install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd | ||
39 | install -d ${D}${sysconfdir}/default | ||
40 | install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools | ||
41 | |||
42 | #install systemd service file | ||
43 | install -d ${D}${systemd_unitdir}/system | ||
44 | install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system | ||
45 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | ||
46 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | ||
47 | -e 's,@SBINDIR@,${sbindir},g' \ | ||
48 | ${D}${systemd_unitdir}/system/smartd.service | ||
49 | } | ||
50 | |||
51 | INITSCRIPT_NAME = "smartd" | ||
52 | INITSCRIPT_PARAMS = "start 60 2 3 4 5 . stop 60 0 1 6 ." | ||
53 | |||
54 | RDEPENDS_${PN} += "mailx" | ||
diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb new file mode 100644 index 000000000..d8de9dfd2 --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb | |||
@@ -0,0 +1,16 @@ | |||
1 | SUMMARY = "Linux CAN network development utilities" | ||
2 | DESCRIPTION = "Linux CAN network development" | ||
3 | LICENSE = "GPLv2 & BSD-3-Clause" | ||
4 | LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=43;md5=390a2c9a3c5e3595a069ac1436553ee7" | ||
5 | |||
6 | DEPENDS = "libsocketcan" | ||
7 | |||
8 | SRC_URI = "git://git.gitorious.org/linux-can/${BPN}.git;protocol=git;branch=master" | ||
9 | SRCREV = "67a2bdcd336e6becfa5784742e18c88dbeddc973" | ||
10 | |||
11 | PV = "0.0+gitr${SRCPV}" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | inherit autotools pkgconfig | ||
16 | |||
diff --git a/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch b/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch new file mode 100644 index 000000000..fcc38e061 --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/canutils/0001-canutils-candump-Add-error-frame-s-handling.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | From bab595e38295dcafcfc17a011d3d51f2df1618e6 Mon Sep 17 00:00:00 2001 | ||
2 | From: AnilKumar Ch <anilkumar@ti.com> | ||
3 | Date: Tue, 10 Jan 2012 18:55:11 +0530 | ||
4 | Subject: [PATCH] canutils: candump: Add error frame's handling | ||
5 | |||
6 | This patch adds the error handling capability to candump utility | ||
7 | by adding error flags for displaying all kind of error frames | ||
8 | like tx_timeout, lost arbitration, controller problems, buserrors, | ||
9 | bus warnings etc. | ||
10 | |||
11 | Usage of candump for error frame display on console: | ||
12 | candump [<can-interface>] [Options] | ||
13 | Ex: candump can0 --error | ||
14 | |||
15 | This patch is created on top of canutils-4.0.6 tag from | ||
16 | http://git.pengutronix.de/?p=tools/canutils.git | ||
17 | |||
18 | Signed-off-by: AnilKumar Ch <anilkumar@ti.com> | ||
19 | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> | ||
20 | --- | ||
21 | Upstream-Status: Backport | ||
22 | |||
23 | src/candump.c | 20 ++++++++++++++++++++ | ||
24 | 1 file changed, 20 insertions(+) | ||
25 | |||
26 | diff --git a/src/candump.c b/src/candump.c | ||
27 | index 259d442..c16425b 100644 | ||
28 | --- a/src/candump.c | ||
29 | +++ b/src/candump.c | ||
30 | @@ -20,6 +20,7 @@ | ||
31 | |||
32 | #include <linux/can.h> | ||
33 | #include <linux/can/raw.h> | ||
34 | +#include <linux/can/error.h> | ||
35 | |||
36 | extern int optind, opterr, optopt; | ||
37 | |||
38 | @@ -40,6 +41,7 @@ static void print_usage(char *prg) | ||
39 | " -p, --protocol=PROTO\t" "CAN protocol (default CAN_RAW = %d)\n" | ||
40 | " --filter=id:mask[:id:mask]...\n" | ||
41 | "\t\t\t" "apply filter\n" | ||
42 | + " -e, --error\t\t" "dump error frames along with data frames\n" | ||
43 | " -h, --help\t\t" "this help\n" | ||
44 | " -o <filename>\t\t" "output into filename\n" | ||
45 | " -d\t\t\t" "daemonize\n" | ||
46 | @@ -86,6 +88,11 @@ int main(int argc, char **argv) | ||
47 | int nbytes, i; | ||
48 | int opt, optdaemon = 0; | ||
49 | uint32_t id, mask; | ||
50 | + int error = 0; | ||
51 | + can_err_mask_t err_mask = (CAN_ERR_TX_TIMEOUT | CAN_ERR_LOSTARB | | ||
52 | + CAN_ERR_CRTL | CAN_ERR_PROT | | ||
53 | + CAN_ERR_TRX | CAN_ERR_ACK | CAN_ERR_BUSOFF | | ||
54 | + CAN_ERR_BUSERROR); | ||
55 | |||
56 | signal(SIGPIPE, SIG_IGN); | ||
57 | |||
58 | @@ -95,6 +102,7 @@ int main(int argc, char **argv) | ||
59 | { "protocol", required_argument, 0, 'p' }, | ||
60 | { "type", required_argument, 0, 't' }, | ||
61 | { "filter", required_argument, 0, FILTER_OPTION }, | ||
62 | + { "error", no_argument, 0, 'e' }, | ||
63 | { "version", no_argument, 0, VERSION_OPTION}, | ||
64 | { 0, 0, 0, 0}, | ||
65 | }; | ||
66 | @@ -121,6 +129,10 @@ int main(int argc, char **argv) | ||
67 | proto = strtoul(optarg, NULL, 0); | ||
68 | break; | ||
69 | |||
70 | + case 'e': | ||
71 | + error = 1; | ||
72 | + break; | ||
73 | + | ||
74 | case 'o': | ||
75 | optout = optarg; | ||
76 | break; | ||
77 | @@ -186,6 +198,14 @@ int main(int argc, char **argv) | ||
78 | } | ||
79 | } | ||
80 | |||
81 | + if (error) { | ||
82 | + if (setsockopt(s, SOL_CAN_RAW, CAN_RAW_ERR_FILTER, &err_mask, | ||
83 | + sizeof(err_mask)) != 0) { | ||
84 | + perror("setsockopt"); | ||
85 | + exit(1); | ||
86 | + } | ||
87 | + } | ||
88 | + | ||
89 | if (optdaemon) | ||
90 | daemon(1, 0); | ||
91 | else { | ||
92 | -- | ||
93 | 1.8.3.1 | ||
94 | |||
diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb new file mode 100644 index 000000000..c220eadab --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | SUMMARY = "canutils (PTX flavour)" | ||
2 | HOMEPAGE = "http://www.pengutronix.de" | ||
3 | SECTION = "console/network" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
7 | |||
8 | DEPENDS = "libsocketcan" | ||
9 | |||
10 | SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d" | ||
11 | SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git \ | ||
12 | file://0001-canutils-candump-Add-error-frame-s-handling.patch \ | ||
13 | " | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | inherit autotools pkgconfig | ||
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch b/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch new file mode 100644 index 000000000..aa6196ee9 --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/libsocketcan/0001-Use-strcmp-instead-of-sizeof-on-char-string.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 94094cc4ee7ae585da3e5e7e83e7d82b5d6de656 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Stein <alexander.stein@systec-electronic.com> | ||
3 | Date: Wed, 14 Nov 2012 12:13:06 +0100 | ||
4 | Subject: [PATCH] Use strcmp instead of sizeof on char* string | ||
5 | |||
6 | This bug was detected by the clang warning: | ||
7 | libsocketcan.c:384:16: warning: argument to 'sizeof' in 'strncmp' call | ||
8 | is the same expression as the source; did you mean to provide an | ||
9 | explicit length? [-Wsizeof-pointer-memaccess] | ||
10 | sizeof(name)) != 0) | ||
11 | ~~~~~~~^~~~~~ | ||
12 | |||
13 | Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> | ||
14 | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> | ||
15 | --- | ||
16 | Upstream-Status: Backport | ||
17 | |||
18 | src/libsocketcan.c | 5 ++--- | ||
19 | 1 file changed, 2 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/src/libsocketcan.c b/src/libsocketcan.c | ||
22 | index fedcbdc..841c2ed 100644 | ||
23 | --- a/src/libsocketcan.c | ||
24 | +++ b/src/libsocketcan.c | ||
25 | @@ -379,9 +379,8 @@ static int do_get_nl_link(int fd, __u8 acquire, const char *name, void *res) | ||
26 | nl_msg->nlmsg_len - NLMSG_LENGTH(sizeof(struct ifaddrmsg)); | ||
27 | parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); | ||
28 | |||
29 | - if (strncmp | ||
30 | - ((char *)RTA_DATA(tb[IFLA_IFNAME]), name, | ||
31 | - sizeof(name)) != 0) | ||
32 | + if (strcmp | ||
33 | + ((char *)RTA_DATA(tb[IFLA_IFNAME]), name) != 0) | ||
34 | continue; | ||
35 | |||
36 | if (tb[IFLA_LINKINFO]) | ||
37 | -- | ||
38 | 1.8.3.1 | ||
39 | |||
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb new file mode 100644 index 000000000..98ef73f29 --- /dev/null +++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.9.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | SUMMARY = "Control basic functions in socketcan from userspace" | ||
2 | HOMEPAGE = "http://www.pengutronix.de" | ||
3 | SECTION = "libs/network" | ||
4 | |||
5 | LICENSE = "LGPLv2.1" | ||
6 | LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38adced4385d8fba1ae2437cedee1" | ||
7 | |||
8 | SRCREV = "e1a224bf1c409adf0c02b07a90deada634e54b88" | ||
9 | |||
10 | SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git \ | ||
11 | file://0001-Use-strcmp-instead-of-sizeof-on-char-string.patch \ | ||
12 | " | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit autotools pkgconfig | ||
17 | |||
18 | do_configure_prepend() { | ||
19 | sed -i -e s:tests/GNUmakefile::g -e s:trunk:0.0.9: ${S}/configure.ac | ||
20 | } | ||
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb new file mode 100644 index 000000000..22b9d2fd7 --- /dev/null +++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Subsurface is an open source dive log program" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
4 | |||
5 | DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf" | ||
6 | |||
7 | PNBLACKLIST[subsurface] ?= "Needs to be upgraded for compatibility with new libdivecomputer" | ||
8 | |||
9 | inherit gtk-icon-cache cmake | ||
10 | |||
11 | inherit gitpkgv | ||
12 | PKGV = "${GITPKGVTAG}" | ||
13 | PV = "4.2" | ||
14 | |||
15 | SRCREV = "f61ee20ba356ecfc4c5b247f548f52d588179c94" | ||
16 | SRC_URI = "git://subsurface.hohndel.org/subsurface.git" | ||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | #FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg" | ||
20 | RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15" | ||
21 | |||
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch new file mode 100644 index 000000000..8b98707cd --- /dev/null +++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/configure.patch | |||
@@ -0,0 +1,128 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- t1lib-5.0.2/configure.in~configure.patch | ||
7 | +++ t1lib-5.0.2/configure.in | ||
8 | @@ -75,9 +75,9 @@ | ||
9 | T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\" | ||
10 | |||
11 | |||
12 | -dnl We use this file by Andreas Zeller to check for libXaw | ||
13 | -builtin(include, ac-tools/ice_find_athena.m4) | ||
14 | -builtin(include, ac-tools/aclocal.m4) | ||
15 | +#dnl We use this file by Andreas Zeller to check for libXaw | ||
16 | +#builtin(include, ac-tools/ice_find_athena.m4) | ||
17 | +#builtin(include, ac-tools/aclocal.m4) | ||
18 | |||
19 | dnl We want these before the checks, so the checks can modify their values. | ||
20 | test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS) | ||
21 | @@ -161,6 +161,7 @@ | ||
22 | |||
23 | dnl **** Check for underscore on external symbols **** | ||
24 | |||
25 | +AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix]) | ||
26 | AC_CACHE_CHECK("whether external symbols need an underscore prefix", | ||
27 | ac_cv_c_extern_prefix, | ||
28 | [saved_libs=$LIBS | ||
29 | @@ -178,68 +179,48 @@ | ||
30 | AC_DEFINE(NEED_UNDERSCORE_PREFIX) | ||
31 | fi | ||
32 | |||
33 | -dnl **** Check which ANSI integer type is 16 bit | ||
34 | +dnl **** Check which ANSI integer type is 16 bit | ||
35 | +T1_AA_TYPE16="" | ||
36 | +for type in short int; do | ||
37 | + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then | ||
38 | + T1_AA_TYPE16="-DT1_AA_TYPE16=$type" | ||
39 | + T1_INT16="$type" | ||
40 | + break | ||
41 | + fi | ||
42 | +done | ||
43 | |||
44 | -AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type, | ||
45 | - AC_TRY_RUN([ | ||
46 | -int main(void) { | ||
47 | - if (sizeof(short)==2) | ||
48 | - return(0); | ||
49 | - else if (sizeof(int)==2) | ||
50 | - return(1); | ||
51 | - else | ||
52 | - return(2); | ||
53 | -}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=)) | ||
54 | -if test "$ac_16bit_type" = "short" | ||
55 | -then | ||
56 | - T1_AA_TYPE16="-DT1_AA_TYPE16=short" | ||
57 | - T1_INT16="short" | ||
58 | -else | ||
59 | - T1_AA_TYPE16="-DT1_AA_TYPE16=int" | ||
60 | - T1_INT16="int" | ||
61 | +if test x"$T1_AA_TYPE16" = "x"; then | ||
62 | + AC_MSG_ERROR("Unable to determine which integer type is 16 bit.") | ||
63 | fi | ||
64 | |||
65 | - | ||
66 | dnl **** Check which ANSI integer type is 32 bit | ||
67 | +T1_AA_TYPE32="" | ||
68 | +for type in int long; do | ||
69 | + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then | ||
70 | + T1_AA_TYPE32="-DT1_AA_TYPE32=$type" | ||
71 | + T1_INT32="$type" | ||
72 | + break | ||
73 | + fi | ||
74 | +done | ||
75 | |||
76 | -AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type, | ||
77 | - AC_TRY_RUN([ | ||
78 | -int main(void) { | ||
79 | - if (sizeof(int)==4) | ||
80 | - return(0); | ||
81 | - else if (sizeof(long)==4) | ||
82 | - return(1); | ||
83 | - else | ||
84 | - return(2); | ||
85 | -}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=)) | ||
86 | -if test "$ac_32bit_type" = "int" | ||
87 | -then | ||
88 | - T1_AA_TYPE32="-DT1_AA_TYPE32=int" | ||
89 | - T1_INT32="int" | ||
90 | -else | ||
91 | - T1_AA_TYPE32="-DT1_AA_TYPE32=long" | ||
92 | - T1_INT32="long" | ||
93 | +if test x"$T1_AA_TYPE32" = "x"; then | ||
94 | + AC_MSG_ERROR("Unable to determine which integer type is 32 bit.") | ||
95 | fi | ||
96 | |||
97 | - | ||
98 | dnl **** Check which ANSI integer type is 64 bit | ||
99 | +T1_AA_TYPE64="" | ||
100 | +for type in long long_long; do | ||
101 | + if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then | ||
102 | + AC_MSG_WARN("$type is 64 bit") | ||
103 | + T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" | ||
104 | + break | ||
105 | + fi | ||
106 | +done | ||
107 | |||
108 | -AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type, | ||
109 | - AC_TRY_RUN([ | ||
110 | -int main(void) { | ||
111 | - if (sizeof(long)==8) | ||
112 | - return(0); | ||
113 | - else | ||
114 | - return(1); | ||
115 | -}], ac_64bit_type="long", ac_64bit_type="<none>")) | ||
116 | -if test "$ac_64bit_type" = "long" | ||
117 | -then | ||
118 | - T1_AA_TYPE64="-DT1_AA_TYPE64=long" | ||
119 | -else | ||
120 | - T1_AA_TYPE64= | ||
121 | +if test x"$T1_AA_TYPE64" = "x"; then | ||
122 | + AC_MSG_ERROR("Unable to determine which integer type is 64 bit.") | ||
123 | fi | ||
124 | |||
125 | - | ||
126 | CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\"" | ||
127 | |||
128 | dnl **** Check for functions and header files **** | ||
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch new file mode 100644 index 000000000..e05002573 --- /dev/null +++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/libtool.patch | |||
@@ -0,0 +1,116 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- t1lib-5.0.2/Makefile.in~libtool | ||
7 | +++ t1lib-5.0.2/Makefile.in | ||
8 | @@ -18,7 +18,8 @@ | ||
9 | # Last modified: 2001-04-01 | ||
10 | # | ||
11 | |||
12 | -SHELL = /bin/sh | ||
13 | +SHELL = @SHELL@ | ||
14 | +LIBTOOL = @LIBTOOL@ | ||
15 | CC = @CC@ | ||
16 | CPP = @CPP@ | ||
17 | CFLAGS = @CFLAGS@ | ||
18 | @@ -150,7 +151,7 @@ | ||
19 | $(RM) examples/Makefile | ||
20 | $(RM) xglyph/Makefile | ||
21 | $(RM) doc/Makefile | ||
22 | - $(RM) libtool | ||
23 | + $(RM) $(LIBTOOL) | ||
24 | |||
25 | |||
26 | # The following two targets are for building and cleaning the python- | ||
27 | --- t1lib-5.0.2/examples/Makefile.in~libtool | ||
28 | +++ t1lib-5.0.2/examples/Makefile.in | ||
29 | @@ -14,9 +14,10 @@ | ||
30 | # Last modified: 2001-04-01 | ||
31 | # | ||
32 | |||
33 | +top_builddir = @top_builddir@ | ||
34 | |||
35 | -LIBTOOL = ../libtool | ||
36 | -SHELL = /bin/sh | ||
37 | +LIBTOOL = @LIBTOOL@ | ||
38 | +SHELL = @SHELL@ | ||
39 | CC = @CC@ | ||
40 | CPP = @CPP@ | ||
41 | CFLAGS = @CFLAGS@ | ||
42 | --- t1lib-5.0.2/lib/Makefile.in~libtool | ||
43 | +++ t1lib-5.0.2/lib/Makefile.in | ||
44 | @@ -15,8 +15,10 @@ | ||
45 | # | ||
46 | # Contributions by H.Kakugawa to use libtool! | ||
47 | |||
48 | -LIBTOOL = ../libtool | ||
49 | -SHELL = /bin/sh | ||
50 | +top_builddir = @top_builddir@ | ||
51 | + | ||
52 | +LIBTOOL = @LIBTOOL@ | ||
53 | +SHELL = @SHELL@ | ||
54 | CC = @CC@ | ||
55 | CPP = @CPP@ | ||
56 | CFLAGS = @CFLAGS@ | ||
57 | --- t1lib-5.0.2/lib/t1lib/Makefile.in~libtool | ||
58 | +++ t1lib-5.0.2/lib/t1lib/Makefile.in | ||
59 | @@ -14,8 +14,10 @@ | ||
60 | # | ||
61 | # Modified by H.Kakugawa to use libtool | ||
62 | |||
63 | -LIBTOOL = ../../libtool | ||
64 | -SHELL = /bin/sh | ||
65 | +top_builddir = @top_builddir@ | ||
66 | + | ||
67 | +LIBTOOL = @LIBTOOL@ | ||
68 | +SHELL = @SHELL@ | ||
69 | CC = @CC@ | ||
70 | CPP = @CPP@ | ||
71 | CFLAGS = @CFLAGS@ | ||
72 | --- t1lib-5.0.2/lib/type1/Makefile.in~libtool | ||
73 | +++ t1lib-5.0.2/lib/type1/Makefile.in | ||
74 | @@ -14,8 +14,10 @@ | ||
75 | # | ||
76 | # Modified by H.Kakugawa to use libtool | ||
77 | |||
78 | -LIBTOOL = ../../libtool | ||
79 | -SHELL = /bin/sh | ||
80 | +top_builddir = @top_builddir@ | ||
81 | + | ||
82 | +LIBTOOL = @LIBTOOL@ | ||
83 | +SHELL = @SHELL@ | ||
84 | CC = @CC@ | ||
85 | CPP = @CPP@ | ||
86 | CFLAGS = @CFLAGS@ | ||
87 | --- t1lib-5.0.2/type1afm/Makefile.in~libtool | ||
88 | +++ t1lib-5.0.2/type1afm/Makefile.in | ||
89 | @@ -15,8 +15,10 @@ | ||
90 | # | ||
91 | # Modified by H.Kakugawa to use libtool | ||
92 | |||
93 | -LIBTOOL = ../libtool | ||
94 | -SHELL = /bin/sh | ||
95 | +top_builddir = @top_builddir@ | ||
96 | + | ||
97 | +LIBTOOL = @LIBTOOL@ | ||
98 | +SHELL = @SHELL@ | ||
99 | CC = @CC@ | ||
100 | CPP = @CPP@ | ||
101 | CFLAGS = @CFLAGS@ | ||
102 | --- t1lib-5.0.2/xglyph/Makefile.in~libtool | ||
103 | +++ t1lib-5.0.2/xglyph/Makefile.in | ||
104 | @@ -15,8 +15,10 @@ | ||
105 | # | ||
106 | # Modified by H.Kakugawa to use libtool | ||
107 | |||
108 | -LIBTOOL = ../libtool | ||
109 | -SHELL = /bin/sh | ||
110 | +top_builddir = @top_builddir@ | ||
111 | + | ||
112 | +LIBTOOL = @LIBTOOL@ | ||
113 | +SHELL = @SHELL@ | ||
114 | CC = @CC@ | ||
115 | CPP = @CPP@ | ||
116 | CFLAGS = @CFLAGS@ | ||
diff --git a/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb new file mode 100644 index 000000000..86cc166e2 --- /dev/null +++ b/meta-oe/recipes-extended/t1lib/t1lib_5.1.2.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SUMMARY = "A Type1 Font Rastering Library" | ||
2 | SECTION = "libs" | ||
3 | DEPENDS = "virtual/libx11 libxaw" | ||
4 | |||
5 | LICENSE = "LGPLv2 GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \ | ||
7 | file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \ | ||
8 | " | ||
9 | |||
10 | SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ | ||
11 | file://configure.patch \ | ||
12 | file://libtool.patch" | ||
13 | SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c" | ||
14 | SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59" | ||
15 | |||
16 | inherit autotools-brokensep | ||
17 | |||
18 | # Fix GNU_HASH problem | ||
19 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
20 | |||
21 | EXTRA_OECONF = "--with-x --without-athena" | ||
22 | EXTRA_OEMAKE = "without_doc" | ||
23 | |||
24 | FILES_${PN} += " ${datadir}/t1lib/t1lib.config" | ||
25 | FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" | ||
26 | |||
diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.1.patch b/meta-oe/recipes-extended/tcsh/files/01_build.1.patch new file mode 100644 index 000000000..b9f41ade9 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/01_build.1.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | Author: Franz Pletz <fpletz@franz-pletz.org> | ||
2 | Description: Original comment: Fix build | ||
3 | Not sure why we have this patch. Let's keep it for compatibility. | ||
4 | --- a/pathnames.h | ||
5 | +++ b/pathnames.h | ||
6 | @@ -92,6 +92,10 @@ | ||
7 | # define _PATH_TCSHELL "/local/bin/tcsh" /* use ram disk */ | ||
8 | #endif /* _MINIX && !_PATH_TCSHELL */ | ||
9 | |||
10 | +#ifndef _PATH_TCSHELL | ||
11 | +# define _PATH_TCSHELL "/bin/tcsh" /* Debian */ | ||
12 | +#endif /* !_PATH_TCSHELL */ | ||
13 | + | ||
14 | #if defined(__EMX__) && !defined(_PATH_DEVNULL) | ||
15 | # define _PATH_DEVNULL "nul" | ||
16 | #endif /* __EMX__ && !_PATH_DEVNULL */ | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.2.patch b/meta-oe/recipes-extended/tcsh/files/01_build.2.patch new file mode 100644 index 000000000..ff2753154 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/01_build.2.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Author: Franz Pletz <fpletz@franz-pletz.org> | ||
2 | Description: Update manpage. | ||
3 | --- a/tcsh.man | ||
4 | +++ b/tcsh.man | ||
5 | @@ -578,7 +578,7 @@ Repeating \fIdabbrev-expand\fR without a | ||
6 | changes to the next previous word etc., skipping identical matches | ||
7 | much like \fIhistory-search-backward\fR does. | ||
8 | .TP 8 | ||
9 | -.B delete-char \fR(not bound) | ||
10 | +.B delete-char \fR(bound to `Del' if using the standard \fI/etc/csh.cshrc\fR) | ||
11 | Deletes the character under the cursor. | ||
12 | See also \fIdelete-char-or-list-or-eof\fR. | ||
13 | .TP 8 | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/01_build.3.patch b/meta-oe/recipes-extended/tcsh/files/01_build.3.patch new file mode 100644 index 000000000..d36c177af --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/01_build.3.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Author: Franz Pletz <fpletz@franz-pletz.org> | ||
2 | Description: Enable NODOT | ||
3 | --- a/config_f.h | ||
4 | +++ b/config_f.h | ||
5 | @@ -98,7 +98,7 @@ | ||
6 | /* | ||
7 | * NODOT Don't put "." in the default path, for security reasons | ||
8 | */ | ||
9 | -#undef NODOT | ||
10 | +#define NODOT | ||
11 | |||
12 | /* | ||
13 | * AUTOLOGOUT tries to determine if it should set autologout depending | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch b/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch new file mode 100644 index 000000000..faa59cc80 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/12_unknown_lscolors.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | Author: Franz Pletz <fpletz@franz-pletz.org> | ||
2 | Description: Don't die on unknown LS_COLORS values | ||
3 | Removing the patch causes a segfault when dircolors is set by coreutils' dircolors. | ||
4 | Debian-Bug: #592089 | ||
5 | |||
6 | --- a/tw.color.c | ||
7 | +++ b/tw.color.c | ||
8 | @@ -239,13 +239,10 @@ parseLS_COLORS(const Char *value) | ||
9 | if ((Char)variables[i].variable[0] == (v[0] & CHAR) && | ||
10 | (Char)variables[i].variable[1] == (v[1] & CHAR)) | ||
11 | break; | ||
12 | - if (i < nvariables) { | ||
13 | - v += 3; | ||
14 | + v += 3; | ||
15 | + if (i < nvariables) | ||
16 | getstring(&c, &v, &variables[i].color, ':'); | ||
17 | - continue; | ||
18 | - } | ||
19 | - else | ||
20 | - stderror(ERR_BADCOLORVAR, v[0], v[1]); | ||
21 | + continue; | ||
22 | } | ||
23 | break; | ||
24 | } | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch b/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch new file mode 100644 index 000000000..cbc9f65d0 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/15_no-strip.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Author: Lucas Nussbaum <lucas@debian.org> | ||
2 | Description: do not strip binary | ||
3 | Stripping should be handled by dh_strip instead, so DEB_BUILD_OPTIONS=nostrip works. | ||
4 | Closes: #438109, #411607 | ||
5 | --- a/Makefile.in | ||
6 | +++ b/Makefile.in | ||
7 | @@ -596,7 +596,6 @@ install: tcsh$(EXEEXT) | ||
8 | -mkdir -p ${DESTBIN} | ||
9 | -mv -f ${DESTBIN}/tcsh$(EXEEXT) ${DESTBIN}/tcsh.old | ||
10 | cp tcsh$(EXEEXT) ${DESTBIN}/tcsh$(EXEEXT) | ||
11 | - -strip ${DESTBIN}/tcsh$(EXEEXT) | ||
12 | chmod 755 ${DESTBIN}/tcsh$(EXEEXT) | ||
13 | |||
14 | install.man: tcsh.man | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch b/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch new file mode 100644 index 000000000..0bda0ba10 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/disable-broken-test.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Author: Lucas Nussbaum <lucas@debian.org> | ||
2 | Description: disable syntactically incorrect test | ||
3 | --- a/tests/lexical.at | ||
4 | +++ b/tests/lexical.at | ||
5 | @@ -172,9 +172,6 @@ | ||
6 | AT_DATA([nohist.csh], | ||
7 | [echo ! space ! tab != "!(" newline ! | ||
8 | ]) | ||
9 | -AT_CHECK([tcsh -f nohist.csh], , | ||
10 | -[[! space ! tab != !( newline ! | ||
11 | -]]) | ||
12 | |||
13 | AT_CLEANUP | ||
14 | |||
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch b/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch new file mode 100644 index 000000000..98a9b2e1d --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/disable-lexical.at-31.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | --- a/tests/lexical.at | ||
2 | +++ b/tests/lexical.at | ||
3 | @@ -27,27 +27,6 @@ AT_CHECK([tcsh -f oneword.csh], , | ||
4 | |||
5 | AT_CLEANUP | ||
6 | |||
7 | - | ||
8 | -AT_SETUP([Comments]) | ||
9 | - | ||
10 | -AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK | ||
11 | -]) | ||
12 | - | ||
13 | -AT_CHECK([tcsh -f -c 'echo @%:@no comment'], , | ||
14 | -[@%:@no comment | ||
15 | -]) | ||
16 | - | ||
17 | -AT_DATA([comment2.csh], | ||
18 | -[[echo testing...@%:@\ | ||
19 | -OK | ||
20 | -]]) | ||
21 | -AT_CHECK([tcsh -f comment2.csh], , | ||
22 | -[testing... OK | ||
23 | -]) | ||
24 | - | ||
25 | -AT_CLEANUP | ||
26 | - | ||
27 | - | ||
28 | AT_SETUP([Escaping special characters]) | ||
29 | |||
30 | AT_DATA([nosplit.csh], | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch new file mode 100644 index 000000000..79f918c08 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/disable-test-nice.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Author: Lucas Nussbaum <lucas@debian.org> | ||
2 | Description: disable test that fails on the buildd with | ||
3 | "setpriority: Permission denied". | ||
4 | --- a/tests/commands.at | ||
5 | +++ b/tests/commands.at | ||
6 | @@ -888,17 +888,6 @@ TCSH_UNTESTED([migrate]) | ||
7 | TCSH_UNTESTED([newgrp]) | ||
8 | |||
9 | |||
10 | -AT_SETUP([nice]) | ||
11 | - | ||
12 | -# Nothing really tested | ||
13 | -AT_CHECK([tcsh -f -c 'nice set var=1; echo $?var'], , | ||
14 | -[0 | ||
15 | -]) | ||
16 | - | ||
17 | - | ||
18 | -AT_CLEANUP | ||
19 | - | ||
20 | - | ||
21 | AT_SETUP([nohup]) | ||
22 | |||
23 | AT_DATA([nohup.csh], | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch b/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch new file mode 100644 index 000000000..69f0564e8 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/disable-test-notty.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From: Lucas Nussbaum <lucas@debian.org> | ||
2 | Description: Those tests fail when running the testsuite without a tty. Disabling them. | ||
3 | |||
4 | --- a/tests/commands.at | ||
5 | +++ b/tests/commands.at | ||
6 | @@ -1203,11 +1203,6 @@ AT_SETUP([source]) | ||
7 | AT_DATA([script.csh], | ||
8 | [[set var=$1 | ||
9 | ]]) | ||
10 | -AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \ | ||
11 | - | sed 's/ [^ ]* / TIME /']], , | ||
12 | -[ 1 TIME source -h script.csh foo ; history | ||
13 | - 2 TIME set var=$1 | ||
14 | -]) | ||
15 | |||
16 | AT_CHECK([tcsh -f -c 'source -h script.csh foo; echo $var'], 1, [], | ||
17 | [var: Undefined variable. | ||
18 | --- a/tests/variables.at | ||
19 | +++ b/tests/variables.at | ||
20 | @@ -319,10 +319,6 @@ AT_CLEANUP | ||
21 | |||
22 | AT_SETUP([$ edit]) | ||
23 | |||
24 | -AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], , | ||
25 | -[1 | ||
26 | -]) | ||
27 | - | ||
28 | AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], , | ||
29 | [0 | ||
30 | ]) | ||
diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch new file mode 100644 index 000000000..3dd420a0e --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Author: Jean-Luc Leger <reiga@dspnet.fr.eu.org> | ||
2 | Description: fix broken globbing expansion | ||
3 | Debian-Bug: #603545 | ||
4 | Index: tcsh-6.18.01/tc.str.c | ||
5 | =================================================================== | ||
6 | --- tcsh-6.18.01.orig/tc.str.c 2012-01-10 13:34:31.000000000 -0800 | ||
7 | +++ tcsh-6.18.01/tc.str.c 2013-02-26 13:12:13.429153489 -0800 | ||
8 | @@ -122,8 +122,9 @@ | ||
9 | #else | ||
10 | ret = mbtowc(&tmp, s, n); | ||
11 | #endif | ||
12 | - if (ret > 0) { | ||
13 | + if (ret >= 0) | ||
14 | *pwc = tmp; | ||
15 | + if (ret >= 0) { | ||
16 | #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC) | ||
17 | if (tmp >= 0xd800 && tmp <= 0xdbff) { | ||
18 | /* UTF-16 surrogate pair. Fetch second half and compute | ||
diff --git a/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb new file mode 100644 index 000000000..1dd4cb580 --- /dev/null +++ b/meta-oe/recipes-extended/tcsh/tcsh_6.18.01.bb | |||
@@ -0,0 +1,49 @@ | |||
1 | DESCRIPTION = "TENEX C Shell, an enhanced version of Berkeley csh \ | ||
2 | The TENEX C Shell is an enhanced version of the Berkeley Unix C shell. \ | ||
3 | It includes all features of 4.4BSD C shell, plus a command-line editor, \ | ||
4 | programmable word completion, spelling correction and more." | ||
5 | |||
6 | HOMEPAGE = "http://www.tcsh.org/" | ||
7 | LICENSE = "BSD" | ||
8 | LIC_FILES_CHKSUM = "file://Copyright;md5=1cf29be62df2be1a3763118b25b4c780" | ||
9 | SECTION = "base" | ||
10 | DEPENDS = "ncurses gettext-native" | ||
11 | SRC_URI = " \ | ||
12 | ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}.orig.tar.gz;name=tarball \ | ||
13 | ${DEBIAN_MIRROR}/main/t/tcsh/tcsh_${PV}-2.diff.gz;name=diffs \ | ||
14 | file://01_build.1.patch \ | ||
15 | file://01_build.2.patch \ | ||
16 | file://01_build.3.patch \ | ||
17 | file://15_no-strip.patch \ | ||
18 | file://disable-test-notty.patch \ | ||
19 | file://disable-test-nice.patch \ | ||
20 | file://disable-lexical.at-31.patch \ | ||
21 | file://12_unknown_lscolors.patch \ | ||
22 | file://tcsh-6.17.02-multibyte.patch \ | ||
23 | file://disable-broken-test.patch \ | ||
24 | " | ||
25 | SRC_URI[tarball.md5sum] = "6eed09dbd4223ab5b6955378450d228a" | ||
26 | SRC_URI[tarball.sha256sum] = "d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8" | ||
27 | SRC_URI[diffs.md5sum] = "ea39b818b624aca49ebf2cd2708d6ff9" | ||
28 | SRC_URI[diffs.sha256sum] = "95b0c1a339b745c47c5d2f9d02c22a71597462e2e882b51614a9d1f75bd3d16c" | ||
29 | |||
30 | inherit autotools | ||
31 | |||
32 | do_install_append () { | ||
33 | oe_runmake install.man DESTDIR=${D} | ||
34 | |||
35 | install -d ${D}${base_bindir} | ||
36 | ln -s /usr/bin/tcsh ${D}${base_bindir}/tcsh | ||
37 | |||
38 | install -d ${D}${sysconfdir}/csh/login.d | ||
39 | install -m 0644 ${S}/debian/csh.cshrc ${S}/debian/csh.login ${S}/debian/csh.logout ${S}/complete.tcsh ${D}${sysconfdir} | ||
40 | install -D -m 0644 ${S}/csh-mode.el ${D}${datadir}/emacs/site-lisp/csh-mode.el | ||
41 | } | ||
42 | |||
43 | FILES_${PN} += "${datadir}/emacs/site-lisp/csh-mode.el" | ||
44 | |||
45 | |||
46 | pkg_postinst_${PN} () { | ||
47 | #!/bin/sh -e | ||
48 | echo /usr/bin/tcsh >> $D/etc/shells | ||
49 | } | ||
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb new file mode 100644 index 000000000..fe0e484de --- /dev/null +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb | |||
@@ -0,0 +1,40 @@ | |||
1 | SUMMARY = "Transparent Inter-Process Communication protocol" | ||
2 | LICENSE = "BSD-3-Clause" | ||
3 | LIC_FILES_CHKSUM = "file://tipc-config/tipc-config.c;endline=32;md5=527a3d5745e1581b15a4fddfb5dfda68" | ||
4 | |||
5 | SRC_URI = "git://tipc.git.sourceforge.net/gitroot/tipc/tipcutils" | ||
6 | SRCREV = "292a03e17f889013fca2c7bd0aaeebd600c88f40" | ||
7 | |||
8 | DEPENDS="virtual/kernel" | ||
9 | |||
10 | inherit autotools | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | do_configure_prepend() { | ||
15 | ( cd ${S}; ${S}/bootstrap ) | ||
16 | } | ||
17 | |||
18 | do_install_append() { | ||
19 | demos="benchmark hello_world topology_subscr_demo connection_demo \ | ||
20 | multicast_demo stream_demo" | ||
21 | for i in $demos;do | ||
22 | install -d ${D}/opt/tipcutils/demos/$i | ||
23 | install ${B}/demos/$i/client_tipc ${D}/opt/tipcutils/demos/$i/ | ||
24 | install ${B}/demos/$i/server_tipc ${D}/opt/tipcutils/demos/$i/ | ||
25 | done | ||
26 | install -d ${D}/opt/tipcutils/demos/inventory_sim | ||
27 | install ${B}/demos/inventory_sim/inventory_sim ${D}/opt/tipcutils/demos/inventory_sim/ | ||
28 | |||
29 | install -d ${D}/opt/tipcutils/ptts | ||
30 | install ${B}/ptts/tipcTS ${D}/opt/tipcutils/ptts/ | ||
31 | install ${B}/ptts/tipcTC ${D}/opt/tipcutils/ptts/ | ||
32 | |||
33 | install -d ${D}${sysconfdir} | ||
34 | cp -a ${S}/scripts/etc/* ${D}${sysconfdir}/ | ||
35 | } | ||
36 | |||
37 | PACKAGES += "${PN}-demos" | ||
38 | FILES_${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug" | ||
39 | FILES_${PN}-demos = "/opt/tipcutils/*" | ||
40 | |||
diff --git a/meta-oe/recipes-extended/tmux/tmux_1.6.bb b/meta-oe/recipes-extended/tmux/tmux_1.6.bb new file mode 100644 index 000000000..b4294d75e --- /dev/null +++ b/meta-oe/recipes-extended/tmux/tmux_1.6.bb | |||
@@ -0,0 +1,18 @@ | |||
1 | SUMMARY = "Terminal multiplexer" | ||
2 | HOMEPAGE = "http://tmux.sourceforge.net" | ||
3 | SECTION = "console/utils" | ||
4 | |||
5 | LICENSE = "ISC" | ||
6 | LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=8685b4455330a940fab1ff451aa941a0" | ||
7 | |||
8 | DEPENDS = "ncurses libevent" | ||
9 | |||
10 | SRC_URI = "${SOURCEFORGE_MIRROR}/tmux/${BP}.tar.gz" | ||
11 | SRC_URI[md5sum] = "3e37db24aa596bf108a0442a81c845b3" | ||
12 | SRC_URI[sha256sum] = "faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6" | ||
13 | |||
14 | inherit autotools pkgconfig | ||
15 | |||
16 | do_configure_prepend () { | ||
17 | sed -i -e 's:-I/usr/local/include::' ${S}/Makefile.am || bb_fatal "sed failed" | ||
18 | } | ||
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch new file mode 100644 index 000000000..05cc5371f --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/fix-ldflags.patch | |||
@@ -0,0 +1,16 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | |||
6 | --- tools/mconsole/Makefile~fix-ldflags 2003-02-08 05:10:08.000000000 +0100 | ||
7 | +++ tools/mconsole/Makefile 2004-04-01 15:37:37.000000000 +0200 | ||
8 | @@ -7,7 +7,7 @@ | ||
9 | all : $(BIN) | ||
10 | |||
11 | $(BIN) : $(OBJS) | ||
12 | - $(CC) $(CFLAGS) -o $(BIN) $(OBJS) -lreadline -lncurses | ||
13 | + $(CC) $(CFLAGS) -o $(BIN) $(OBJS) $(LDFLAGS) -lreadline -lncurses | ||
14 | |||
15 | clean : | ||
16 | rm -f $(BIN) $(OBJS) *~ | ||
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch new file mode 100644 index 000000000..868001dbd --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/unstrip.patch | |||
@@ -0,0 +1,84 @@ | |||
1 | Dont strip during install let the packaging handle it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Index: tools/jailtest/Makefile | ||
6 | =================================================================== | ||
7 | --- tools.orig/jailtest/Makefile 2003-02-07 20:10:27.000000000 -0800 | ||
8 | +++ tools/jailtest/Makefile 2012-09-05 12:13:56.061615854 -0700 | ||
9 | @@ -14,4 +14,4 @@ | ||
10 | |||
11 | install : $(BIN) | ||
12 | install -d $(DESTDIR)$(BIN_DIR) | ||
13 | - install -s $(BIN) $(DESTDIR)$(BIN_DIR) | ||
14 | + install $(BIN) $(DESTDIR)$(BIN_DIR) | ||
15 | Index: tools/mconsole/Makefile | ||
16 | =================================================================== | ||
17 | --- tools.orig/mconsole/Makefile 2012-09-05 12:05:09.869607043 -0700 | ||
18 | +++ tools/mconsole/Makefile 2012-09-05 12:14:07.725607469 -0700 | ||
19 | @@ -14,4 +14,4 @@ | ||
20 | |||
21 | install : $(BIN) | ||
22 | install -d $(DESTDIR)$(BIN_DIR) | ||
23 | - install -s $(BIN) $(DESTDIR)$(BIN_DIR) | ||
24 | + install $(BIN) $(DESTDIR)$(BIN_DIR) | ||
25 | Index: tools/moo/Makefile | ||
26 | =================================================================== | ||
27 | --- tools.orig/moo/Makefile 2003-06-26 09:27:00.000000000 -0700 | ||
28 | +++ tools/moo/Makefile 2012-09-05 12:14:20.981604580 -0700 | ||
29 | @@ -22,4 +22,4 @@ | ||
30 | |||
31 | install : $(BIN) | ||
32 | install -d $(DESTDIR)$(BIN_DIR) | ||
33 | - install -s $(BIN) $(DESTDIR)$(BIN_DIR) | ||
34 | + install $(BIN) $(DESTDIR)$(BIN_DIR) | ||
35 | Index: tools/port-helper/Makefile | ||
36 | =================================================================== | ||
37 | --- tools.orig/port-helper/Makefile 2003-02-07 20:05:31.000000000 -0800 | ||
38 | +++ tools/port-helper/Makefile 2012-09-05 12:14:39.429609678 -0700 | ||
39 | @@ -14,4 +14,4 @@ | ||
40 | |||
41 | install : $(BIN) | ||
42 | install -d $(DESTDIR)$(LIB_DIR) | ||
43 | - install -s $(BIN) $(DESTDIR)$(LIB_DIR) | ||
44 | + install $(BIN) $(DESTDIR)$(LIB_DIR) | ||
45 | Index: tools/tunctl/Makefile | ||
46 | =================================================================== | ||
47 | --- tools.orig/tunctl/Makefile 2003-02-07 20:05:04.000000000 -0800 | ||
48 | +++ tools/tunctl/Makefile 2012-09-05 12:14:49.985606470 -0700 | ||
49 | @@ -14,4 +14,4 @@ | ||
50 | |||
51 | install : $(BIN) | ||
52 | install -d $(DESTDIR)$(BIN_DIR) | ||
53 | - install -s $(BIN) $(DESTDIR)$(BIN_DIR) | ||
54 | + install $(BIN) $(DESTDIR)$(BIN_DIR) | ||
55 | Index: tools/uml_net/Makefile | ||
56 | =================================================================== | ||
57 | --- tools.orig/uml_net/Makefile 2003-02-07 20:04:55.000000000 -0800 | ||
58 | +++ tools/uml_net/Makefile 2012-09-05 12:15:00.961607290 -0700 | ||
59 | @@ -21,4 +21,4 @@ | ||
60 | |||
61 | install : $(BIN) | ||
62 | install -d $(DESTDIR)$(BIN_DIR) | ||
63 | - install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR) | ||
64 | + install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR) | ||
65 | Index: tools/uml_router/Makefile | ||
66 | =================================================================== | ||
67 | --- tools.orig/uml_router/Makefile 2003-02-07 20:04:39.000000000 -0800 | ||
68 | +++ tools/uml_router/Makefile 2012-09-05 12:15:10.649607571 -0700 | ||
69 | @@ -20,4 +20,4 @@ | ||
70 | |||
71 | install : $(BIN) | ||
72 | install -d $(DESTDIR)$(BIN_DIR) | ||
73 | - install -s $(BIN) $(DESTDIR)$(BIN_DIR) | ||
74 | + install $(BIN) $(DESTDIR)$(BIN_DIR) | ||
75 | Index: tools/watchdog/Makefile | ||
76 | =================================================================== | ||
77 | --- tools.orig/watchdog/Makefile 2003-02-07 20:04:25.000000000 -0800 | ||
78 | +++ tools/watchdog/Makefile 2012-09-05 12:15:35.561612203 -0700 | ||
79 | @@ -14,4 +14,4 @@ | ||
80 | |||
81 | install : $(BIN) | ||
82 | install -d $(DESTDIR)$(BIN_DIR) | ||
83 | - install -s $(BIN) $(DESTDIR)$(BIN_DIR) | ||
84 | + install $(BIN) $(DESTDIR)$(BIN_DIR) | ||
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb new file mode 100644 index 000000000..45cc2e751 --- /dev/null +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb | |||
@@ -0,0 +1,26 @@ | |||
1 | SECTION = "console/utils" | ||
2 | SUMMARY = "Utilities for User-Mode-Linux" | ||
3 | LICENSE = "GPL-2.0" | ||
4 | DEPENDS = "zlib ncurses readline" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
6 | SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_utilities_${PV}.tar.bz2 \ | ||
7 | file://fix-ldflags.patch \ | ||
8 | file://unstrip.patch \ | ||
9 | " | ||
10 | SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" | ||
11 | SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" | ||
12 | |||
13 | PR = "r1" | ||
14 | |||
15 | S = "${WORKDIR}/tools" | ||
16 | |||
17 | do_compile() { | ||
18 | oe_runmake | ||
19 | } | ||
20 | |||
21 | do_install() { | ||
22 | oe_runmake install DESTDIR=${D} | ||
23 | } | ||
24 | |||
25 | FILES_${PN} += "${exec_prefix}${nonarch_base_libdir}" | ||
26 | FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/uml/.debug" | ||
diff --git a/meta-oe/recipes-extended/zram/zram/init b/meta-oe/recipes-extended/zram/zram/init new file mode 100644 index 000000000..d12616936 --- /dev/null +++ b/meta-oe/recipes-extended/zram/zram/init | |||
@@ -0,0 +1,85 @@ | |||
1 | #!/bin/bash | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: zram | ||
4 | # Required-Start: | ||
5 | # Required-Stop: | ||
6 | # Default-Start: 2 3 4 5 | ||
7 | # Default-Stop: 0 1 6 | ||
8 | # Short-Description: Increased Performance In Linux With zRam (Virtual Swap Compressed in RAM) | ||
9 | # Description: Adapted from systemd scripts at https://github.com/mystilleef/FedoraZram | ||
10 | # Included as part of antix-goodies package by anticapitalista <antiX@operamail.com> | ||
11 | # This script was written by tradetaxfree and is found at http://crunchbanglinux.org/forums/topic/15344/zram-a-good-idea/ | ||
12 | # Copy this script (as root) from /usr/local/bin to /etc/init.d and then #update-rc.d zram defaults | ||
13 | # After booting verify the module is loaded with: lsmod | grep zram | ||
14 | ### END INIT INFO | ||
15 | set -e | ||
16 | |||
17 | start() { | ||
18 | # get the number of CPUs | ||
19 | num_cpus=$(grep -c processor /proc/cpuinfo) | ||
20 | # if something goes wrong, assume we have 1 | ||
21 | [ "$num_cpus" != 0 ] || num_cpus=1 | ||
22 | |||
23 | # set decremented number of CPUs | ||
24 | last_cpu=$((num_cpus - 1)) | ||
25 | |||
26 | #default Factor % = 90 change this value here or create /etc/default/zram | ||
27 | FACTOR=90 | ||
28 | #& put the above single line in /etc/default/zram with the value you want | ||
29 | [ -f /etc/default/zram ] && source /etc/default/zram || true | ||
30 | factor=$FACTOR # percentage | ||
31 | |||
32 | # get the amount of memory in the machine | ||
33 | memtotal=$(grep MemTotal /proc/meminfo | awk ' { print $2 } ') | ||
34 | mem_by_cpu=$(($memtotal/$num_cpus*$factor/100*1024)) | ||
35 | |||
36 | # load dependency modules | ||
37 | modprobe zram zram_num_devices=$num_cpus | ||
38 | echo "zram devices probed successfully" | ||
39 | |||
40 | # initialize the devices | ||
41 | for i in $(seq 0 $last_cpu); do | ||
42 | echo 1 > /sys/block/zram$i/reset | ||
43 | echo $mem_by_cpu > /sys/block/zram$i/disksize | ||
44 | # Creating swap filesystems | ||
45 | mkswap /dev/zram$i | ||
46 | # Switch the swaps on | ||
47 | swapon -p 100 /dev/zram$i | ||
48 | done | ||
49 | } | ||
50 | |||
51 | stop() { | ||
52 | # get the number of CPUs | ||
53 | num_cpus=$(grep -c processor /proc/cpuinfo) | ||
54 | |||
55 | # set decremented number of CPUs | ||
56 | last_cpu=$((num_cpus - 1)) | ||
57 | |||
58 | # Switching off swap | ||
59 | for i in $(seq 0 $last_cpu); do | ||
60 | if [ "$(grep /dev/zram$i /proc/swaps)" != "" ]; then | ||
61 | swapoff /dev/zram$i | ||
62 | sleep 1 | ||
63 | fi | ||
64 | done | ||
65 | sleep 1 | ||
66 | rmmod zram | ||
67 | } | ||
68 | |||
69 | case "$1" in | ||
70 | start) | ||
71 | start | ||
72 | ;; | ||
73 | stop) | ||
74 | stop | ||
75 | ;; | ||
76 | restart) | ||
77 | stop | ||
78 | sleep 3 | ||
79 | start | ||
80 | ;; | ||
81 | *) | ||
82 | echo "Usage: $0 {start|stop|restart}" | ||
83 | RETVAL=1 | ||
84 | esac | ||
85 | exit $RETVAL | ||
diff --git a/meta-oe/recipes-extended/zram/zram/zram.service b/meta-oe/recipes-extended/zram/zram/zram.service new file mode 100644 index 000000000..4a19367d9 --- /dev/null +++ b/meta-oe/recipes-extended/zram/zram/zram.service | |||
@@ -0,0 +1,12 @@ | |||
1 | [Unit] | ||
2 | Description=Enable zram compressed in-memory swap. | ||
3 | After=multi-user.target | ||
4 | |||
5 | [Service] | ||
6 | RemainAfterExit=yes | ||
7 | ExecStart=/usr/bin/zram-load.sh --load | ||
8 | ExecStop=/usr/bin/zram-load.sh --unload | ||
9 | Type=oneshot | ||
10 | |||
11 | [Install] | ||
12 | WantedBy=multi-user.target | ||
diff --git a/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-oe/recipes-extended/zram/zram_0.1.bb new file mode 100644 index 000000000..e07f570d1 --- /dev/null +++ b/meta-oe/recipes-extended/zram/zram_0.1.bb | |||
@@ -0,0 +1,33 @@ | |||
1 | SUMMARY = "Linux zram compressed in-memory swap" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" | ||
4 | |||
5 | inherit update-rc.d systemd | ||
6 | |||
7 | RDEPENDS_${PN} = "util-linux-swaponoff kmod" | ||
8 | RRECOMMENDS_${PN} = "kernel-module-zram" | ||
9 | |||
10 | PR = "r3" | ||
11 | |||
12 | SRC_URI = " \ | ||
13 | file://init \ | ||
14 | file://zram.service \ | ||
15 | " | ||
16 | |||
17 | do_install () { | ||
18 | # Sysvinit | ||
19 | install -d ${D}${sysconfdir}/init.d | ||
20 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram | ||
21 | |||
22 | install -d ${D}${systemd_unitdir}/system | ||
23 | install -m 0644 ${WORKDIR}/zram.service ${D}${systemd_unitdir}/system | ||
24 | } | ||
25 | |||
26 | FILES_${PN} = "${sysconfdir}" | ||
27 | INITSCRIPT_NAME = "zram" | ||
28 | INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ." | ||
29 | |||
30 | RPROVIDES_${PN} += "${PN}-systemd" | ||
31 | RREPLACES_${PN} += "${PN}-systemd" | ||
32 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
33 | SYSTEMD_SERVICE_${PN} = "zram.service" | ||
diff --git a/meta-oe/recipes-extended/zsh/zsh.inc b/meta-oe/recipes-extended/zsh/zsh.inc new file mode 100644 index 000000000..6dc40bf50 --- /dev/null +++ b/meta-oe/recipes-extended/zsh/zsh.inc | |||
@@ -0,0 +1,59 @@ | |||
1 | SUMMARY = "UNIX Shell similar to the Korn shell" | ||
2 | DESCRIPTION = "Zsh is a shell designed for interactive use, although it is also a \ | ||
3 | powerful scripting language. Many of the useful features of bash, \ | ||
4 | ksh, and tcsh were incorporated into zsh; many original features were added." | ||
5 | HOMEPAGE = "http://www.zsh.org" | ||
6 | SECTION = "base/shell" | ||
7 | |||
8 | LICENSE = "zsh" | ||
9 | LIC_FILES_CHKSUM = "file://LICENCE;md5=b7bc853894664be455a922db9805288e" | ||
10 | |||
11 | PNBLACKLIST[zsh] ?= "BROKEN: doesn't build with B!=S (gnu-configize executed in ${B})" | ||
12 | |||
13 | DEPENDS = "ncurses bison-native" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" | ||
16 | |||
17 | inherit autotools gettext update-alternatives | ||
18 | |||
19 | EXTRA_OECONF = " \ | ||
20 | --bindir=${base_bindir} \ | ||
21 | --enable-etcdir=${sysconfdir} \ | ||
22 | --enable-fndir=${datadir}/${PN}/${PV}/functions \ | ||
23 | --enable-site-fndir=${datadir}/${PN}/site-functions \ | ||
24 | --with-term-lib='ncursesw ncurses' \ | ||
25 | --with-tcsetpgrp \ | ||
26 | --enable-cap \ | ||
27 | --enable-multibyte \ | ||
28 | --disable-gdbm \ | ||
29 | --disable-dynamic \ | ||
30 | zsh_cv_shared_environ=yes \ | ||
31 | " | ||
32 | |||
33 | ALTERNATIVE_${PN} = "sh" | ||
34 | ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" | ||
35 | ALTERNATIVE_TARGET[sh] = "${base_bindir}/${BPN}" | ||
36 | ALTERNATIVE_PRIORITY = "100" | ||
37 | |||
38 | export AUTOHEADER = "true" | ||
39 | |||
40 | do_configure () { | ||
41 | gnu-configize --force | ||
42 | oe_runconf | ||
43 | } | ||
44 | |||
45 | do_install_append () { | ||
46 | rm -fr ${D}/usr/share | ||
47 | } | ||
48 | |||
49 | pkg_postinst_${PN} () { | ||
50 | touch $D${sysconfdir}/shells | ||
51 | grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells | ||
52 | grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells | ||
53 | } | ||
54 | |||
55 | FILES_${PN}-dbg += "\ | ||
56 | ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \ | ||
57 | ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \ | ||
58 | ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \ | ||
59 | " | ||
diff --git a/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb b/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb new file mode 100644 index 000000000..a7170dca8 --- /dev/null +++ b/meta-oe/recipes-extended/zsh/zsh_5.0.5.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require zsh.inc | ||
2 | DEPENDS += "libcap libpcre gdbm groff-native" | ||
3 | |||
4 | SRC_URI[md5sum] = "6fb0e3e52a0f8de5ca63138391b81ce0" | ||
5 | SRC_URI[sha256sum] = "b35cf19e4a6ba39fd03c6372b8a8760a491cc2e2e4aba3d15023ff291c2894b4" | ||