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:21 +0000 |
| commit | 37579d7d74d127c90c1e078d05c5bf4ba0b3f755 (patch) | |
| tree | e247a35b09a174cf11e82f0b6bb43b2c96969e47 /meta/recipes-core/glib-2.0 | |
| parent | 01b2a16beb4a924077b74943ad4d6e7976563ff1 (diff) | |
| download | openembedded-core-37579d7d74d127c90c1e078d05c5bf4ba0b3f755.tar.gz openembedded-core-37579d7d74d127c90c1e078d05c5bf4ba0b3f755.tar.bz2 openembedded-core-37579d7d74d127c90c1e078d05c5bf4ba0b3f755.zip | |
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.
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
| -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 @@ require glib.inc -PR = "r2" +PR = "r3" PE = "1" DEPENDS += "libffi python-argparse-native" @@ -9,11 +9,14 @@ DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nat SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" +QSORT_PATCH = "file://remove.test.for.qsort_r.patch" +QSORT_PATCH_virtclass-native = "" + SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \ file://configure-libtool.patch \ file://60_wait-longer-for-threads-to-die.patch \ file://g_once_init_enter.patch \ - file://remove.test.for.qsort_r.patch \ + ${QSORT_PATCH} \ " SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b" SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687" |