diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-11-18 12:59:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-18 14:22:41 +0000 |
commit | 81b6e546bbf624292b004338a400b3c556df7404 (patch) | |
tree | 390a6774acbab8a2eb26c7676f1f87d0c3e5387a /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | 9d4f95587424c9e2d3ef7891c8ac7007f8db1f00 (diff) | |
download | poky-81b6e546bbf624292b004338a400b3c556df7404.tar.gz |
glib-2.0: fix qsort_t testing for uclibc
* instead of disabling the configure test and set it always true
use the site files to set it true for glibc/eglibc and false
for uclibc
* remove the patch
' tested only for uclibc
* bump PR
(From OE-Core rev: 812342e44e9e361a0fa93cfcfe65cf4dd6f2fb57)
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch b/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch deleted file mode 100644 index 5c0a07abb1..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | while cross compiling we cannot execute run tests | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | --- glib-2.30.0.orig/configure.ac 2011-09-29 16:57:35.000000000 +0200 | ||
6 | +++ glib-2.30.0/configure.ac 2011-09-29 17:00:19.931493488 +0200 | ||
7 | @@ -586,45 +586,7 @@ | ||
8 | dnl until we have checked this function is actually usable | ||
9 | AC_CHECK_FUNC([qsort_r]) | ||
10 | |||
11 | -# BSD has a qsort_r with wrong argument order | ||
12 | -if test x$ac_cv_func_qsort_r = xyes ; then | ||
13 | - AC_CACHE_CHECK([if qsort_r uses glibc compatible argument order], glib_cv_have_qsort_r, [ | ||
14 | - AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
15 | - #define _GNU_SOURCE | ||
16 | - #include <stdlib.h> | ||
17 | - | ||
18 | - static int | ||
19 | - cmp (const void *a, const void *b, void *c) | ||
20 | - { | ||
21 | - const int *ia = a; | ||
22 | - const int *ib = b; | ||
23 | - | ||
24 | - if (*ia < *ib) | ||
25 | - return -1; | ||
26 | - else if (*ia > *ib) | ||
27 | - return 1; | ||
28 | - else | ||
29 | - return 0; | ||
30 | - } | ||
31 | - | ||
32 | - int | ||
33 | - main (int argc, char **argv) | ||
34 | - { | ||
35 | - int arr[3] = { 1, 2, 0 }; | ||
36 | - int d = 3; | ||
37 | - | ||
38 | - qsort_r (arr, 3, sizeof (int), cmp, &d); | ||
39 | - | ||
40 | - if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2) | ||
41 | - return 0; | ||
42 | - else | ||
43 | - return 1; | ||
44 | - }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])]) | ||
45 | -fi | ||
46 | - | ||
47 | -if test x$glib_cv_have_qsort_r = xyes ; then | ||
48 | - AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function]) | ||
49 | -fi | ||
50 | +AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function]) | ||
51 | |||
52 | AC_CHECK_SIZEOF(char) | ||
53 | AC_CHECK_SIZEOF(short) | ||