diff options
author | Simon Busch <morphis@gravedo.de> | 2011-11-01 23:08:10 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-02 09:08:28 +0000 |
commit | 9b76e6a2cfc5a4d779f3b06e3acc5ff7b8275470 (patch) | |
tree | 5ced510dd27a2c167de06e09a753c63cc75f1559 | |
parent | b090fde5c184a64d3dd77c5f87b9596854e272ec (diff) | |
download | poky-9b76e6a2cfc5a4d779f3b06e3acc5ff7b8275470.tar.gz |
meta: glib-2.0: don't apply qsort_r test removable patch for native version
On some buildhosts with an older version of native glib-2.0 installed (in this case
2.16.6) the qsort_r test removable patch leads to a compilation error:
| ./.libs/libglib-2.0.so: undefined reference to `qsort_r'
| collect2: ld returned 1 exit status
This patch fixes this so the patch gets only applied for the native version of this
recipe.
(From OE-Core rev: 37579d7d74d127c90c1e078d05c5bf4ba0b3f755)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 7 |
1 files changed, 5 insertions, 2 deletions
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 566355d9de..0efce406e0 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 @@ | |||
1 | require glib.inc | 1 | require glib.inc |
2 | 2 | ||
3 | PR = "r2" | 3 | PR = "r3" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | DEPENDS += "libffi python-argparse-native" | 6 | DEPENDS += "libffi python-argparse-native" |
@@ -9,11 +9,14 @@ DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nat | |||
9 | 9 | ||
10 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" | 10 | SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" |
11 | 11 | ||
12 | QSORT_PATCH = "file://remove.test.for.qsort_r.patch" | ||
13 | QSORT_PATCH_virtclass-native = "" | ||
14 | |||
12 | SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \ | 15 | SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \ |
13 | file://configure-libtool.patch \ | 16 | file://configure-libtool.patch \ |
14 | file://60_wait-longer-for-threads-to-die.patch \ | 17 | file://60_wait-longer-for-threads-to-die.patch \ |
15 | file://g_once_init_enter.patch \ | 18 | file://g_once_init_enter.patch \ |
16 | file://remove.test.for.qsort_r.patch \ | 19 | ${QSORT_PATCH} \ |
17 | " | 20 | " |
18 | SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b" | 21 | SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b" |
19 | SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687" | 22 | SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687" |