* [PATCH] meta: glib-2.0: don't apply qsort_r test removable patch for native version
@ 2011-11-01 22:08 Simon Busch
2011-11-02 8:26 ` Martin Jansa
2011-11-02 9:08 ` Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Simon Busch @ 2011-11-01 22:08 UTC (permalink / raw)
To: openembedded-core
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>
---
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 566355d..0efce40 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"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] meta: glib-2.0: don't apply qsort_r test removable patch for native version
2011-11-01 22:08 [PATCH] meta: glib-2.0: don't apply qsort_r test removable patch for native version Simon Busch
@ 2011-11-02 8:26 ` Martin Jansa
2011-11-02 9:08 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2011-11-02 8:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2146 bytes --]
On Tue, Nov 01, 2011 at 11:08:10PM +0100, Simon Busch wrote:
> 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>
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> 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 566355d..0efce40 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"
> --
> 1.7.5.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] meta: glib-2.0: don't apply qsort_r test removable patch for native version
2011-11-01 22:08 [PATCH] meta: glib-2.0: don't apply qsort_r test removable patch for native version Simon Busch
2011-11-02 8:26 ` Martin Jansa
@ 2011-11-02 9:08 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-11-02 9:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-11-01 at 23:08 +0100, Simon Busch wrote:
> 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>
> ---
> meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-02 9:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-01 22:08 [PATCH] meta: glib-2.0: don't apply qsort_r test removable patch for native version Simon Busch
2011-11-02 8:26 ` Martin Jansa
2011-11-02 9:08 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox