summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch53
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb6
-rw-r--r--meta/site/common-glibc1
-rw-r--r--meta/site/common-uclibc1
4 files changed, 3 insertions, 58 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 @@
1while cross compiling we cannot execute run tests
2
3Upstream-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)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
index 634a4e4f4a..50e174e330 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
@@ -1,6 +1,6 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r3" 3PR = "r4"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native" 6DEPENDS += "libffi python-argparse-native"
@@ -9,14 +9,10 @@ DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nat
9 9
10SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 10SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
11 11
12QSORT_PATCH = "file://remove.test.for.qsort_r.patch"
13QSORT_PATCH_virtclass-native = ""
14
15SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \ 12SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
16 file://configure-libtool.patch \ 13 file://configure-libtool.patch \
17 file://60_wait-longer-for-threads-to-die.patch \ 14 file://60_wait-longer-for-threads-to-die.patch \
18 file://g_once_init_enter.patch \ 15 file://g_once_init_enter.patch \
19 ${QSORT_PATCH} \
20 " 16 "
21SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b" 17SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b"
22SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687" 18SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687"
diff --git a/meta/site/common-glibc b/meta/site/common-glibc
index 364ab67d78..dc69703eec 100644
--- a/meta/site/common-glibc
+++ b/meta/site/common-glibc
@@ -39,6 +39,7 @@ glib_cv_long_long_format=${glib_cv_long_long_format=ll}
39# that to avoid a dependency loop. 39# that to avoid a dependency loop.
40glib_cv___va_copy=${glib_cv___va_copy=yes} 40glib_cv___va_copy=${glib_cv___va_copy=yes}
41glib_cv_va_copy=${glib_cv_va_copy=yes} 41glib_cv_va_copy=${glib_cv_va_copy=yes}
42glib_cv_have_qsort_r=${glib_cv_have_qsort_r=yes}
42 43
43#dbus-glib 44#dbus-glib
44ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} 45ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
index a264765e87..331c2a2773 100644
--- a/meta/site/common-uclibc
+++ b/meta/site/common-uclibc
@@ -20,6 +20,7 @@ ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes}
20ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes} 20ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
21glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1} 21glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
22glib_cv_long_long_format=${glib_cv_long_long_format=ll} 22glib_cv_long_long_format=${glib_cv_long_long_format=ll}
23glib_cv_have_qsort_r=${glib_cv_have_qsort_r=no}
23 24
24#dbus-glib 25#dbus-glib
25ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} 26ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}