diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch | 443 |
1 files changed, 0 insertions, 443 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch b/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch deleted file mode 100644 index 3663692d2d..0000000000 --- a/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch +++ /dev/null | |||
@@ -1,443 +0,0 @@ | |||
1 | |||
2 | Upstream-Status: Inappropriate [configuration] | ||
3 | |||
4 | Index: rpm-5.1.9/configure.ac | ||
5 | =================================================================== | ||
6 | --- rpm-5.1.9.orig/configure.ac 2009-04-18 17:47:02.000000000 +0100 | ||
7 | +++ rpm-5.1.9/configure.ac 2010-07-06 14:47:28.985462456 +0100 | ||
8 | @@ -643,38 +643,22 @@ | ||
9 | dnl look for libc features | ||
10 | PROVIDES_ERRNO=no | ||
11 | AC_MSG_CHECKING(if <netdb.h> defines h_errno) | ||
12 | -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[printf("%d",h_errno)]])],[PROVIDES_ERRNO=yes],[]) | ||
13 | -AC_MSG_RESULT($PROVIDES_ERRNO) | ||
14 | -if test $PROVIDES_ERRNO = yes; then | ||
15 | - AC_DEFINE(HAVE_HERRNO, 1, [ Define as 1 if <netdb.h> defines h_errno]) | ||
16 | -fi | ||
17 | +AC_DEFINE(HAVE_HERRNO, 1, [ Define as 1 if <netdb.h> defines h_errno]) | ||
18 | |||
19 | dnl If a system doesn't have S_IFSOCK, define it as 0 which will | ||
20 | dnl make S_ISSOCK always return false (nice, eh?) | ||
21 | AC_MSG_CHECKING(if <sys/stat.h> defines S_IFSOCK) | ||
22 | -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[printf("%d", S_IFSOCK)]])],[HAS_S_IFSOCK=yes],[HAS_S_IFSOCK=no]) | ||
23 | -AC_MSG_RESULT($HAS_S_IFSOCK) | ||
24 | -if test $HAS_S_IFSOCK = yes; then | ||
25 | - AC_DEFINE(HAVE_S_IFSOCK, 1, [Define as 1 if <sys/stat.h> defines S_IFSOCK]) | ||
26 | -fi | ||
27 | +AC_DEFINE(HAVE_S_IFSOCK, 1, [Define as 1 if <sys/stat.h> defines S_IFSOCK]) | ||
28 | |||
29 | dnl Some Unix's are missing S_ISLNK, S_ISSOCK | ||
30 | AC_MSG_CHECKING(if <sys/stat.h> defines S_ISLNK) | ||
31 | -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[printf("%d", S_ISLNK(0755))]])],[HAS_S_ISLNK=yes],[HAS_S_ISLNK=no]) | ||
32 | -AC_MSG_RESULT($HAS_S_ISLNK) | ||
33 | -if test $HAS_S_ISLNK = yes; then | ||
34 | - AC_DEFINE(HAVE_S_ISLNK, 1, [Define as 1 if <sys/stat.h> defines S_ISLNK]) | ||
35 | -fi | ||
36 | +AC_DEFINE(HAVE_S_ISLNK, 1, [Define as 1 if <sys/stat.h> defines S_ISLNK]) | ||
37 | |||
38 | AC_MSG_CHECKING(if <sys/stat.h> defines S_ISSOCK) | ||
39 | -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[printf("%d", S_ISSOCK(0755))]])],[HAS_S_ISSOCK=yes],[HAS_S_ISSOCK=no]) | ||
40 | -AC_MSG_RESULT($HAS_S_ISSOCK) | ||
41 | -if test $HAS_S_ISSOCK = yes; then | ||
42 | - AC_DEFINE(HAVE_S_ISSOCK, 1, [Define as 1 if <sys/stat.h> defines S_ISSOCK]) | ||
43 | -fi | ||
44 | +AC_DEFINE(HAVE_S_ISSOCK, 1, [Define as 1 if <sys/stat.h> defines S_ISSOCK]) | ||
45 | |||
46 | AC_MSG_CHECKING(if timezone is defined) | ||
47 | -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[printf("%ld", timezone)]])],[HAS_TIMEZONE=yes],[HAS_TIMEZONE=no]) | ||
48 | +$HAS_TIMEZONE=yes | ||
49 | AC_MSG_RESULT($HAS_TIMEZONE) | ||
50 | |||
51 | dnl check for missing typedefs | ||
52 | @@ -726,53 +710,12 @@ | ||
53 | AC_MSG_RESULT(yes) | ||
54 | AC_CHECK_HEADERS([libelf.h gelf.h]) | ||
55 | if test ".$ac_cv_header_libelf_h" = .no; then | ||
56 | - dnl # <libelf.h> on Solaris is incompatible with LFS. If we couldn't | ||
57 | - dnl # include <libelf.h>, see if we can when _FILE_OFFSET_BITS is | ||
58 | - dnl # set for non-LFS. Same applies for <gelf.h>, since it probably | ||
59 | - dnl # includes <libelf.h> | ||
60 | - AC_MSG_CHECKING([if libelf.h conflicts with _LARGEFILE_SOURCE]) | ||
61 | - AC_COMPILE_IFELSE([ | ||
62 | - AC_LANG_PROGRAM([[ | ||
63 | -#undef _LARGEFILE64_SOURCE | ||
64 | -#undef _LARGEFILE_SOURCE | ||
65 | -#if !defined(_LP64) | ||
66 | -# undef _FILE_OFFSET_BITS | ||
67 | -# define _FILE_OFFSET_BITS 32 | ||
68 | -#endif | ||
69 | -#include <libelf.h> | ||
70 | - ]], [[ | ||
71 | - Elf_Data foo; | ||
72 | - ]]) | ||
73 | - ], [ | ||
74 | - AC_DEFINE(HAVE_LIBELF_H, 1, [Define to 1 if you have libelf.h]) | ||
75 | - ac_cv_header_libelf_h=yes | ||
76 | - AC_DEFINE(LIBELF_H_LFS_CONFLICT, 1, [Define to 1 if libelf.h is incompatible with LFS API]) | ||
77 | - AC_MSG_RESULT(yes) | ||
78 | - ], [ | ||
79 | - AC_MSG_RESULT(no) | ||
80 | - ]) | ||
81 | + AC_DEFINE(HAVE_LIBELF_H, 1, [Define to 1 if you have libelf.h]) | ||
82 | + ac_cv_header_libelf_h=yes | ||
83 | fi | ||
84 | if test ".$ac_cv_header_gelf_h" = .no; then | ||
85 | - AC_MSG_CHECKING([if gelf.h conflicts with _LARGEFILE_SOURCE]) | ||
86 | - AC_COMPILE_IFELSE([ | ||
87 | - AC_LANG_PROGRAM([[ | ||
88 | -#undef _LARGEFILE64_SOURCE | ||
89 | -#undef _LARGEFILE_SOURCE | ||
90 | -#if !defined(_LP64) | ||
91 | -# undef _FILE_OFFSET_BITS | ||
92 | -# define _FILE_OFFSET_BITS 32 | ||
93 | -#endif | ||
94 | -#include <gelf.h> | ||
95 | - ]], [[ | ||
96 | - Elf32_Verdef foo; | ||
97 | - ]]) | ||
98 | - ], [ | ||
99 | - AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have gelf.h]) | ||
100 | - ac_cv_header_gelf_h=yes | ||
101 | - AC_MSG_RESULT(yes) | ||
102 | - ], [ | ||
103 | - AC_MSG_RESULT(no) | ||
104 | - ]) | ||
105 | + AC_DEFINE(HAVE_GELF_H, 1, [Define to 1 if you have gelf.h]) | ||
106 | + ac_cv_header_gelf_h=yes | ||
107 | fi | ||
108 | if test ".$ac_cv_header_gelf_h" = .yes; then | ||
109 | AC_CHECK_LIB([elf], [elf_version], [ | ||
110 | @@ -854,78 +797,9 @@ | ||
111 | python_version="" | ||
112 | ;; | ||
113 | esac | ||
114 | - for python_ver in $python_version ; do | ||
115 | - if test "$python_ver" != "2.x" ; then | ||
116 | - AC_MSG_CHECKING([for Python ${python_ver} API]) | ||
117 | - save_CFLAGS="${CFLAGS}" | ||
118 | - for i in "$prefix" "/usr/local" "/usr"; do | ||
119 | - CFLAGS="${save_CFLAGS} -I$i/include/python${python_ver}" | ||
120 | - AC_RUN_IFELSE([AC_LANG_SOURCE( | ||
121 | - [[#include "Python.h" | ||
122 | - main() { exit(strncmp("${python_ver}", PY_VERSION, 3)); } ]]) | ||
123 | - ], [ | ||
124 | - PYTHON_VERSION="${python_ver}" | ||
125 | - AC_MSG_RESULT(yes) | ||
126 | - PYTHON_PREFIX="${i}" | ||
127 | - break | ||
128 | - ], [ | ||
129 | - ], [ | ||
130 | - dnl if we're cross compiling, assume the user has a clue | ||
131 | - if test "$withval" = "$python_ver"; then | ||
132 | - PYTHON_VERSION="${python_ver}" | ||
133 | - AC_MSG_RESULT(yes) | ||
134 | - break | ||
135 | - fi | ||
136 | - ]) | ||
137 | - done | ||
138 | - CFLAGS="${save_CFLAGS}" | ||
139 | - if test ".$PYTHON_VERSION" == "."; then | ||
140 | - dnl check Mac OS X framework | ||
141 | - save_CFLAGS="${CFLAGS}" | ||
142 | - for f in "~" "" "/System" "/Network"; do | ||
143 | - CFLAGS="${save_CFLAGS} -I$f/Library/Frameworks/Python.framework/Versions/${python_ver}/include/python${python_ver}" | ||
144 | - AC_RUN_IFELSE([AC_LANG_SOURCE( | ||
145 | - [[#include "Python.h" | ||
146 | - main() { exit(strncmp("${python_ver}", PY_VERSION, 3)); } ]]) | ||
147 | - ], [ | ||
148 | - PYTHON_VERSION="${python_ver}" | ||
149 | - AC_MSG_RESULT([yes (using Python.framework)]) | ||
150 | - PYTHON_PREFIX="$f/Library/Frameworks/Python.framework/Versions/${python_ver}" | ||
151 | - break | ||
152 | - ], [ | ||
153 | - ]) | ||
154 | - done | ||
155 | - CFLAGS="${save_CFLAGS}" | ||
156 | - fi | ||
157 | - if test ".$PYTHON_VERSION" == "."; then | ||
158 | - AC_MSG_RESULT(no) | ||
159 | - fi | ||
160 | - else | ||
161 | - AC_MSG_CHECKING([for Python 2.x API]) | ||
162 | - AC_RUN_IFELSE([AC_LANG_SOURCE( | ||
163 | - [[#include <python/Python.h> | ||
164 | - main() { exit(strncmp("2.", PY_VERSION, 2)); } ]]) | ||
165 | - ], [ | ||
166 | - PYTHON_VERSION="" | ||
167 | - AC_MSG_RESULT(yes) | ||
168 | - ], [ | ||
169 | - AC_MSG_RESULT(no) | ||
170 | - ], [ | ||
171 | - dnl if we're cross compiling, assume the user has a clue | ||
172 | - if test "$withval" = "$python_ver"; then | ||
173 | - PYTHON_VERSION="${python_ver}" | ||
174 | - AC_MSG_RESULT(yes) | ||
175 | - else | ||
176 | - AC_MSG_RESULT(no) | ||
177 | - fi | ||
178 | - ]) | ||
179 | - fi | ||
180 | - if test ".$PYTHON_VERSION" != "."; then | ||
181 | - WITH_PYTHON_SUBDIR=python | ||
182 | - WITH_PYTHON_SUBPACKAGE=1 | ||
183 | - break | ||
184 | - fi | ||
185 | - done | ||
186 | + PYTHON_VERSION="${python_ver}" | ||
187 | + WITH_PYTHON_SUBDIR=python | ||
188 | + WITH_PYTHON_SUBPACKAGE=1 | ||
189 | fi | ||
190 | AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]), | ||
191 | [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`(python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()') 2>/dev/null`"]) | ||
192 | @@ -1157,15 +1031,8 @@ | ||
193 | AC_SUBST(WITH_PCRE_LIBS) | ||
194 | else | ||
195 | dnl # make sure PCRE POSIX API can be really _USED_ by RPM | ||
196 | - LIBS_SAVED="$LIBS" | ||
197 | LIBS="-lpcreposix $LIBS" | ||
198 | - AC_LINK_IFELSE([ | ||
199 | - AC_LANG_PROGRAM([#include <pcreposix.h>], [(void)regcomp(0, 0, 0)]) | ||
200 | - ], [ | ||
201 | - AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available]) | ||
202 | - ], [ | ||
203 | - LIBS="$LIBS_SAVED" | ||
204 | - ]) | ||
205 | + AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available]) | ||
206 | fi | ||
207 | dnl # enable PCRE native API support for embedded Lua | ||
208 | if test ".$WITH_LUA" = .yes; then | ||
209 | @@ -1234,30 +1101,7 @@ | ||
210 | |||
211 | dnl # figure out what root's primary group is | ||
212 | AC_MSG_CHECKING([root's primary group]) | ||
213 | -AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdio.h> | ||
214 | -#include <sys/types.h> | ||
215 | -#include <pwd.h> | ||
216 | -#include <grp.h> | ||
217 | -int main() | ||
218 | -{ | ||
219 | - struct passwd *root = NULL; | ||
220 | - struct group *roots_group = NULL; | ||
221 | - FILE * tempfile = NULL; | ||
222 | - root = getpwuid( (uid_t) 0 ); | ||
223 | - if (root != NULL) { | ||
224 | - roots_group = getgrgid(root->pw_gid); | ||
225 | - if (roots_group != NULL) { | ||
226 | - tempfile = fopen("conftest_rootg", "w"); | ||
227 | - if (tempfile != NULL) { | ||
228 | - fprintf(tempfile, "%s\n", roots_group->gr_name); | ||
229 | - fclose(tempfile); | ||
230 | - exit(0); | ||
231 | - } | ||
232 | - } | ||
233 | - } | ||
234 | - exit(1); | ||
235 | -}]])],[ROOT_GROUP=`cat conftest_rootg`; rm -f conftest_rootg],[ROOT_GROUP="root"],[ROOT_GROUP="root" | ||
236 | -]) | ||
237 | +$ROOT_GROUP="root" | ||
238 | AC_MSG_RESULT([$ROOT_GROUP]) | ||
239 | AC_SUBST(ROOT_GROUP) | ||
240 | |||
241 | Index: rpm-5.1.9/pcre/configure.ac | ||
242 | =================================================================== | ||
243 | --- rpm-5.1.9.orig/pcre/configure.ac 2009-01-14 20:19:31.000000000 +0000 | ||
244 | +++ rpm-5.1.9/pcre/configure.ac 2010-07-06 14:51:50.769586089 +0100 | ||
245 | @@ -278,34 +278,6 @@ | ||
246 | # The files below are C++ header files. | ||
247 | pcre_have_type_traits="0" | ||
248 | pcre_have_bits_type_traits="0" | ||
249 | -if test "x$enable_cpp" = "xyes" -a -n "$CXX" | ||
250 | -then | ||
251 | -AC_LANG_PUSH(C++) | ||
252 | - | ||
253 | -# Older versions of pcre defined pcrecpp::no_arg, but in new versions | ||
254 | -# it's called pcrecpp::RE::no_arg. For backwards ABI compatibility, | ||
255 | -# we want to make one an alias for the other. Different systems do | ||
256 | -# this in different ways. Some systems, for instance, can do it via | ||
257 | -# a linker flag: -alias (for os x 10.5) or -i (for os x <=10.4). | ||
258 | -OLD_LDFLAGS="$LDFLAGS" | ||
259 | -for flag in "-alias,__ZN7pcrecpp2RE6no_argE,__ZN7pcrecpp6no_argE" \ | ||
260 | - "-i__ZN7pcrecpp6no_argE:__ZN7pcrecpp2RE6no_argE"; do | ||
261 | - AC_MSG_CHECKING([for alias support in the linker]) | ||
262 | - LDFLAGS="$OLD_LDFLAGS -Wl,$flag" | ||
263 | - # We try to run the linker with this new ld flag. If the link fails, | ||
264 | - # we give up and remove the new flag from LDFLAGS. | ||
265 | - AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp { | ||
266 | - class RE { static int no_arg; }; | ||
267 | - int RE::no_arg; | ||
268 | - }], | ||
269 | - []), | ||
270 | - [AC_MSG_RESULT([yes]); | ||
271 | - EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag"; | ||
272 | - break;], | ||
273 | - AC_MSG_RESULT([no])) | ||
274 | -done | ||
275 | -LDFLAGS="$OLD_LDFLAGS" | ||
276 | - | ||
277 | # We could be more clever here, given we're doing AC_SUBST with this | ||
278 | # (eg set a var to be the name of the include file we want). But we're not | ||
279 | # so it's easy to change back to 'regular' autoconf vars if we needed to. | ||
280 | @@ -316,7 +288,6 @@ | ||
281 | AC_CHECK_HEADERS(type_traits.h, [pcre_have_type_traits="1"], | ||
282 | [pcre_have_type_traits="0"]) | ||
283 | |||
284 | -AC_LANG_POP | ||
285 | fi | ||
286 | # Using AC_SUBST eliminates the need to include config.h in a public .h file | ||
287 | AC_SUBST(pcre_have_type_traits) | ||
288 | Index: rpm-5.1.9/db/dist/configure.ac | ||
289 | =================================================================== | ||
290 | --- rpm-5.1.9.orig/db/dist/configure.ac 2008-06-15 08:16:21.000000000 +0100 | ||
291 | +++ rpm-5.1.9/db/dist/configure.ac 2010-07-06 15:36:39.262461127 +0100 | ||
292 | @@ -602,24 +602,6 @@ | ||
293 | aux*) AC_LIBOBJ([getopt]);; | ||
294 | esac | ||
295 | |||
296 | -# Linux has a broken O_DIRECT flag, but you can't detect it at configure time. | ||
297 | -# Linux and SGI require buffer alignment we may not match, otherwise writes | ||
298 | -# will fail. Default to not using the O_DIRECT flag. | ||
299 | -if test "$db_cv_o_direct" = "yes"; then | ||
300 | - AC_CACHE_CHECK([for open/O_DIRECT], db_cv_open_o_direct, [ | ||
301 | - AC_TRY_LINK([ | ||
302 | - #include <sys/types.h> | ||
303 | - #include <fcntl.h>], [ | ||
304 | - open("a", O_RDONLY | O_DIRECT, 0); | ||
305 | - ], [db_cv_open_o_direct=yes], [db_cv_open_o_direct=no])]) | ||
306 | - if test \ | ||
307 | - "$db_cv_o_direct" = "yes" -a "$db_cv_open_o_direct" = "yes"; then | ||
308 | - AC_DEFINE(HAVE_O_DIRECT) | ||
309 | - AH_TEMPLATE(HAVE_O_DIRECT, | ||
310 | - [Define to 1 if you have the O_DIRECT flag.]) | ||
311 | - fi | ||
312 | -fi | ||
313 | - | ||
314 | # Check for largefile support. | ||
315 | AC_SYS_LARGEFILE | ||
316 | |||
317 | Index: rpm-5.1.9/xz/configure.ac | ||
318 | =================================================================== | ||
319 | --- rpm-5.1.9.orig/xz/configure.ac 2009-02-16 17:07:46.000000000 +0000 | ||
320 | +++ rpm-5.1.9/xz/configure.ac 2010-07-06 15:41:22.632467951 +0100 | ||
321 | @@ -457,26 +457,9 @@ | ||
322 | #endif | ||
323 | ]) | ||
324 | |||
325 | -# Even if we have byteswap.h, we may lack the specific macros/functions. | ||
326 | -if test x$ac_cv_header_byteswap_h = xyes ; then | ||
327 | - m4_foreach([FUNC], [bswap_16,bswap_32,bswap_64], [ | ||
328 | - AC_MSG_CHECKING([if FUNC is available]) | ||
329 | - AC_LINK_IFELSE([AC_LANG_SOURCE([ | ||
330 | -#include <byteswap.h> | ||
331 | -int | ||
332 | -main(void) | ||
333 | -{ | ||
334 | - FUNC[](42); | ||
335 | - return 0; | ||
336 | -} | ||
337 | - ])], [ | ||
338 | - AC_DEFINE(HAVE_[]m4_toupper(FUNC), [1], | ||
339 | - [Define to 1 if] FUNC [is available.]) | ||
340 | - AC_MSG_RESULT([yes]) | ||
341 | - ], [AC_MSG_RESULT([no])]) | ||
342 | - | ||
343 | - ])dnl | ||
344 | -fi | ||
345 | +AC_DEFINE(HAVE_BSWAP_16, 1) | ||
346 | +AC_DEFINE(HAVE_BSWAP_32, 1) | ||
347 | +AC_DEFINE(HAVE_BSWAP_64, 1) | ||
348 | |||
349 | |||
350 | ############################################################################### | ||
351 | @@ -527,90 +510,16 @@ | ||
352 | # xz command line tool uses this to automatically limit its memory usage. | ||
353 | # - sysconf() gives all the needed info on GNU+Linux and Solaris. | ||
354 | # - BSDs use sysctl(). | ||
355 | -AC_MSG_CHECKING([how to detect the amount of physical memory]) | ||
356 | -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ | ||
357 | -#include <unistd.h> | ||
358 | -int | ||
359 | -main() | ||
360 | -{ | ||
361 | - long i; | ||
362 | - i = sysconf(_SC_PAGESIZE); | ||
363 | - i = sysconf(_SC_PHYS_PAGES); | ||
364 | - return 0; | ||
365 | -} | ||
366 | -]])], [ | ||
367 | - AC_DEFINE([HAVE_PHYSMEM_SYSCONF], [1], | ||
368 | +AC_DEFINE([HAVE_PHYSMEM_SYSCONF], [1], | ||
369 | [Define to 1 if the amount of physical memory can be detected | ||
370 | with sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES).]) | ||
371 | - AC_MSG_RESULT([sysconf]) | ||
372 | -], [ | ||
373 | -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ | ||
374 | -#include <sys/types.h> | ||
375 | -#ifdef HAVE_SYS_PARAM_H | ||
376 | -# include <sys/param.h> | ||
377 | -#endif | ||
378 | -#include <sys/sysctl.h> | ||
379 | -int | ||
380 | -main() | ||
381 | -{ | ||
382 | - int name[2] = { CTL_HW, HW_PHYSMEM }; | ||
383 | - unsigned long mem; | ||
384 | - size_t mem_ptr_size = sizeof(mem); | ||
385 | - sysctl(name, 2, &mem, &mem_ptr_size, NULL, NULL); | ||
386 | - return 0; | ||
387 | -} | ||
388 | -]])], [ | ||
389 | - AC_DEFINE([HAVE_PHYSMEM_SYSCTL], [1], | ||
390 | - [Define to 1 if the amount of physical memory can be detected | ||
391 | - with sysctl().]) | ||
392 | - AC_MSG_RESULT([sysctl]) | ||
393 | -], [ | ||
394 | - AC_MSG_RESULT([unknown]) | ||
395 | -])]) | ||
396 | |||
397 | # Check how to find out the number of available CPU cores in the system. | ||
398 | # sysconf(_SC_NPROCESSORS_ONLN) works on most systems, except that BSDs | ||
399 | # use sysctl(). | ||
400 | -AC_MSG_CHECKING([how to detect the number of available CPU cores]) | ||
401 | -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ | ||
402 | -#include <unistd.h> | ||
403 | -int | ||
404 | -main() | ||
405 | -{ | ||
406 | - long i; | ||
407 | - i = sysconf(_SC_NPROCESSORS_ONLN); | ||
408 | - return 0; | ||
409 | -} | ||
410 | -]])], [ | ||
411 | - AC_DEFINE([HAVE_NCPU_SYSCONF], [1], | ||
412 | +AC_DEFINE([HAVE_NCPU_SYSCONF], [1], | ||
413 | [Define to 1 if the number of available CPU cores can be | ||
414 | detected with sysconf(_SC_NPROCESSORS_ONLN).]) | ||
415 | - AC_MSG_RESULT([sysconf]) | ||
416 | -], [ | ||
417 | -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ | ||
418 | -#include <sys/types.h> | ||
419 | -#ifdef HAVE_SYS_PARAM_H | ||
420 | -# include <sys/param.h> | ||
421 | -#endif | ||
422 | -#include <sys/sysctl.h> | ||
423 | -int | ||
424 | -main() | ||
425 | -{ | ||
426 | - int name[2] = { CTL_HW, HW_NCPU }; | ||
427 | - int cpus; | ||
428 | - size_t cpus_size = sizeof(cpus); | ||
429 | - sysctl(name, 2, &cpus, &cpus_size, NULL, NULL); | ||
430 | - return 0; | ||
431 | -} | ||
432 | -]])], [ | ||
433 | - AC_DEFINE([HAVE_NCPU_SYSCTL], [1], | ||
434 | - [Define to 1 if the number of available CPU cores can be | ||
435 | - detected with sysctl().]) | ||
436 | - AC_MSG_RESULT([sysctl]) | ||
437 | -], [ | ||
438 | - AC_MSG_RESULT([unknown]) | ||
439 | -])]) | ||
440 | - | ||
441 | |||
442 | ############################################################################### | ||
443 | # If using GCC, set some additional CFLAGS: | ||