* [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade
@ 2012-04-29 21:27 Martin Jansa
2012-04-29 21:27 ` [PATCH 1/3] glib-2.0: upgrade to 2.32.1 Martin Jansa
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Martin Jansa @ 2012-04-29 21:27 UTC (permalink / raw)
To: openembedded-core
Tested on my images and fixed failing recipe, mostly it's about including header files like:
glib-2.0/glib/gthread.h:28:2: error: #error "Only <glib.h> can be included directly."
The following changes since commit 5a1f172d35be610688842a8a9a84f24edb9aeb51:
bitbake.conf: use TUNE_PKGARCH instead of TARGET_ARCH in SDK_NAME (2012-04-26 10:59:20 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2
Martin Jansa (3):
glib-2.0: upgrade to 2.32.1
gobject-introspection: upgrade to 1.32.1
libsoup-2.4: upgrade to 2.38.1
.../glib-2.0/glib-2.0/configure-libtool.patch | 54 ++++++++++++++------
.../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 ---------
.../{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} | 6 +--
meta/recipes-core/glib-2.0/glib.inc | 2 +-
..._1.31.20.bb => gobject-introspection_1.32.1.bb} | 13 +++--
...libsoup-2.4_2.36.1.bb => libsoup-2.4_2.38.1.bb} | 8 ++--
6 files changed, 53 insertions(+), 54 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch
rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} (91%)
rename meta/recipes-gnome/gnome/{gobject-introspection_1.31.20.bb => gobject-introspection_1.32.1.bb} (52%)
rename meta/recipes-support/libsoup/{libsoup-2.4_2.36.1.bb => libsoup-2.4_2.38.1.bb} (55%)
--
1.7.8.6
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/3] glib-2.0: upgrade to 2.32.1 2012-04-29 21:27 [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Martin Jansa @ 2012-04-29 21:27 ` Martin Jansa 2012-04-30 16:25 ` Saul Wold 2012-04-29 21:27 ` [PATCH 2/3] gobject-introspection: upgrade to 1.32.1 Martin Jansa ` (2 subsequent siblings) 3 siblings, 1 reply; 9+ messages in thread From: Martin Jansa @ 2012-04-29 21:27 UTC (permalink / raw) To: openembedded-core * g_once_init_enter.patch shouldn't be needed after upstream commit 794c1a30bc27b4c8d77537813acb1213d5ac80f2 * LIC_FILES_CHKSUM change is only because PCRE was upgraded and now pcre.h says "Copyright (c) 1997-2012 University of Cambridge" instead of 2010 and COPYING file "Please see the file LICENCE in the PCRE distribution for licensing details." but LICENSE file is not part of glib distribution (but still BSD in standalone PCRE) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../glib-2.0/glib-2.0/configure-libtool.patch | 54 ++++++++++++++------ .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 --------- .../{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} | 6 +-- meta/recipes-core/glib-2.0/glib.inc | 2 +- 4 files changed, 41 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} (91%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch index c21e378..1d69a3f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch @@ -1,15 +1,31 @@ -# Poky renames libtool to $host_alias-libtool. -# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 -# so we can't call # it at this point. We can safely assume a version is available -# from PATH though -# Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> +From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 28 Apr 2012 18:24:50 +0200 +Subject: [PATCH] configure: use $host_alias-libtool instead of libtool + directly + +Poky renames libtool to $host_alias-libtool. +./$host_alias-libtool isn't created until after configure runs with +libtool >= 2.2.2 +so we can't call # it at this point. We can safely assume a version is +available +from PATH though + +Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> +Rebased to glib-2.32.1 by Martin Jansa <Martin.Jansa@gmail.com> Upstream-Status: Inappropriate [configuration] -diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac ---- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 -+++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 -@@ -1385,7 +1385,7 @@ +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a6478c6..9a93d60 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then G_MODULE_LDFLAGS= else export SED @@ -18,16 +34,19 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac fi dnl G_MODULE_IMPL= don't reset, so cmd-line can override G_MODULE_NEED_USCORE=0 -@@ -1450,7 +1450,7 @@ +@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness echo "void glib_plugin_test(void) { }" > plugin.c -- ${SHELL} ./libtool --mode=compile ${CC} -shared \ -+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ - -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], - glib_cv_rtldglobal_broken,[ -@@ -1524,7 +1524,7 @@ +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ + ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1 +- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ ++ ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ + ${LDFLAGS} -module -o plugin.la -export-dynamic \ + -shrext ".o" -avoid-version plugin.lo \ + -rpath /dont/care >/dev/null 2>&1 +@@ -1614,7 +1614,7 @@ fi AC_MSG_CHECKING(for the suffix of module shared libraries) export SED @@ -36,3 +55,6 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac eval $shrext_cmds module=yes eval std_shrext=$shrext_cmds # chop the initial dot +-- +1.7.8.6 + diff --git a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch deleted file mode 100644 index 2eaa19b..0000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch +++ /dev/null @@ -1,24 +0,0 @@ -fix g_once_init_enter compile failure - -Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded -back in the 2.22 timeframe. It appears to still be present in 2.27. - -http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005 - -Signed-off-by: Darren Hart <dvhart@linux.intel.com> - -Upstream-Status: Pending - -Index: glib-2.27.5/glib/gthread.h -=================================================================== ---- glib-2.27.5.orig/glib/gthread.h -+++ glib-2.27.5/glib/gthread.h -@@ -344,7 +344,7 @@ void g_once_init_leav - G_INLINE_FUNC gboolean - g_once_init_enter (volatile gsize *value_location) - { -- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL) -+ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL) - return FALSE; - else - return g_once_init_enter_impl (value_location); diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb similarity index 91% rename from meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb index f1f9217..354620f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb @@ -1,6 +1,5 @@ require glib.inc -PR = "r1" PE = "1" DEPENDS += "libffi python-argparse-native zlib" @@ -12,12 +11,11 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://60_wait-longer-for-threads-to-die.patch \ - file://g_once_init_enter.patch \ file://glib-2.0_fix_for_x32.patch \ file://nodbus.patch \ " -SRC_URI[md5sum] = "0f9fa329c6c1012d0fd861ad3d8a4520" -SRC_URI[sha256sum] = "e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27" +SRC_URI[md5sum] = "032c7cf9868c9aa186b490b155a41144" +SRC_URI[sha256sum] = "484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398" # Only apply this patch for target recipe on uclibc SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 835743a..33f7613 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \ file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ - file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \ + file://glib/pcre/pcre.h;startline=11;endline=35;md5=2ffb79f0a0933f282f4f36cda635683d \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" BUGTRACKER = "http://bugzilla.gnome.org" SECTION = "libs" -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] glib-2.0: upgrade to 2.32.1 2012-04-29 21:27 ` [PATCH 1/3] glib-2.0: upgrade to 2.32.1 Martin Jansa @ 2012-04-30 16:25 ` Saul Wold 2012-04-30 18:59 ` Martin Jansa 0 siblings, 1 reply; 9+ messages in thread From: Saul Wold @ 2012-04-30 16:25 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa On 04/29/2012 02:27 PM, Martin Jansa wrote: > * g_once_init_enter.patch shouldn't be needed after upstream commit > 794c1a30bc27b4c8d77537813acb1213d5ac80f2 > > * LIC_FILES_CHKSUM change is only because PCRE was upgraded and now > pcre.h says "Copyright (c) 1997-2012 University of Cambridge" instead > of 2010 and COPYING file > "Please see the file LICENCE in the PCRE distribution for licensing > details." but LICENSE file is not part of glib distribution (but still > BSD in standalone PCRE) > > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> > --- > .../glib-2.0/glib-2.0/configure-libtool.patch | 54 ++++++++++++++------ > .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 --------- > .../{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} | 6 +-- > meta/recipes-core/glib-2.0/glib.inc | 2 +- > 4 files changed, 41 insertions(+), 45 deletions(-) > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} (91%) > Martin: Did you see any issue similar to what was reported in https://bugzilla.yoctoproject.org/show_bug.cgi?id=2369? There is a new alignment check at configure time requiring updating the site file? Sau! > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > index c21e378..1d69a3f 100644 > --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > @@ -1,15 +1,31 @@ > -# Poky renames libtool to $host_alias-libtool. > -# ./$host_alias-libtool isn't created until after configure runs with libtool>= 2.2.2 > -# so we can't call # it at this point. We can safely assume a version is available > -# from PATH though > -# Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com> > +From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 > +From: Martin Jansa<Martin.Jansa@gmail.com> > +Date: Sat, 28 Apr 2012 18:24:50 +0200 > +Subject: [PATCH] configure: use $host_alias-libtool instead of libtool > + directly > + > +Poky renames libtool to $host_alias-libtool. > +./$host_alias-libtool isn't created until after configure runs with > +libtool>= 2.2.2 > +so we can't call # it at this point. We can safely assume a version is > +available > +from PATH though > + > +Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com> > +Rebased to glib-2.32.1 by Martin Jansa<Martin.Jansa@gmail.com> > > Upstream-Status: Inappropriate [configuration] > > -diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac > ---- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 > -+++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 > -@@ -1385,7 +1385,7 @@ > +Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> > +--- > + configure.ac | 8 ++++---- > + 1 files changed, 4 insertions(+), 4 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index a6478c6..9a93d60 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then > G_MODULE_LDFLAGS= > else > export SED > @@ -18,16 +34,19 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac > fi > dnl G_MODULE_IMPL= don't reset, so cmd-line can override > G_MODULE_NEED_USCORE=0 > -@@ -1450,7 +1450,7 @@ > +@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then > LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" > dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness > echo "void glib_plugin_test(void) { }"> plugin.c > -- ${SHELL} ./libtool --mode=compile ${CC} -shared \ > -+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ > - -export-dynamic -o plugin.o plugin.c 2>&1>/dev/null > - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], > - glib_cv_rtldglobal_broken,[ > -@@ -1524,7 +1524,7 @@ > +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ > ++ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ > + ${CPPFLAGS} -c -o plugin.lo plugin.c>/dev/null 2>&1 > +- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ > ++ ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ > + ${LDFLAGS} -module -o plugin.la -export-dynamic \ > + -shrext ".o" -avoid-version plugin.lo \ > + -rpath /dont/care>/dev/null 2>&1 > +@@ -1614,7 +1614,7 @@ fi > > AC_MSG_CHECKING(for the suffix of module shared libraries) > export SED > @@ -36,3 +55,6 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac > eval $shrext_cmds > module=yes eval std_shrext=$shrext_cmds > # chop the initial dot > +-- > +1.7.8.6 > + > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > deleted file mode 100644 > index 2eaa19b..0000000 > --- a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -fix g_once_init_enter compile failure > - > -Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded > -back in the 2.22 timeframe. It appears to still be present in 2.27. > - > -http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005 > - > -Signed-off-by: Darren Hart<dvhart@linux.intel.com> > - > -Upstream-Status: Pending > - > -Index: glib-2.27.5/glib/gthread.h > -=================================================================== > ---- glib-2.27.5.orig/glib/gthread.h > -+++ glib-2.27.5/glib/gthread.h > -@@ -344,7 +344,7 @@ void g_once_init_leav > - G_INLINE_FUNC gboolean > - g_once_init_enter (volatile gsize *value_location) > - { > -- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL) > -+ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL) > - return FALSE; > - else > - return g_once_init_enter_impl (value_location); > diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb > similarity index 91% > rename from meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb > rename to meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb > index f1f9217..354620f 100644 > --- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb > +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb > @@ -1,6 +1,5 @@ > require glib.inc > > -PR = "r1" > PE = "1" > > DEPENDS += "libffi python-argparse-native zlib" > @@ -12,12 +11,11 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] > SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ > file://configure-libtool.patch \ > file://60_wait-longer-for-threads-to-die.patch \ > - file://g_once_init_enter.patch \ > file://glib-2.0_fix_for_x32.patch \ > file://nodbus.patch \ > " > -SRC_URI[md5sum] = "0f9fa329c6c1012d0fd861ad3d8a4520" > -SRC_URI[sha256sum] = "e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27" > +SRC_URI[md5sum] = "032c7cf9868c9aa186b490b155a41144" > +SRC_URI[sha256sum] = "484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398" > > # Only apply this patch for target recipe on uclibc > SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" > diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc > index 835743a..33f7613 100644 > --- a/meta/recipes-core/glib-2.0/glib.inc > +++ b/meta/recipes-core/glib-2.0/glib.inc > @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ > file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ > file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \ > file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ > - file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \ > + file://glib/pcre/pcre.h;startline=11;endline=35;md5=2ffb79f0a0933f282f4f36cda635683d \ > file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" > BUGTRACKER = "http://bugzilla.gnome.org" > SECTION = "libs" ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] glib-2.0: upgrade to 2.32.1 2012-04-30 16:25 ` Saul Wold @ 2012-04-30 18:59 ` Martin Jansa 2012-04-30 19:29 ` Khem Raj 0 siblings, 1 reply; 9+ messages in thread From: Martin Jansa @ 2012-04-30 18:59 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 9323 bytes --] On Mon, Apr 30, 2012 at 09:25:31AM -0700, Saul Wold wrote: > On 04/29/2012 02:27 PM, Martin Jansa wrote: > > * g_once_init_enter.patch shouldn't be needed after upstream commit > > 794c1a30bc27b4c8d77537813acb1213d5ac80f2 > > > > * LIC_FILES_CHKSUM change is only because PCRE was upgraded and now > > pcre.h says "Copyright (c) 1997-2012 University of Cambridge" instead > > of 2010 and COPYING file > > "Please see the file LICENCE in the PCRE distribution for licensing > > details." but LICENSE file is not part of glib distribution (but still > > BSD in standalone PCRE) > > > > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> > > --- > > .../glib-2.0/glib-2.0/configure-libtool.patch | 54 ++++++++++++++------ > > .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 --------- > > .../{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} | 6 +-- > > meta/recipes-core/glib-2.0/glib.inc | 2 +- > > 4 files changed, 41 insertions(+), 45 deletions(-) > > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > > rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} (91%) > > > Martin: > > Did you see any issue similar to what was reported in > https://bugzilla.yoctoproject.org/show_bug.cgi?id=2369? > > There is a new alignment check at configure time requiring updating the > site file? not while building, but in runtime I've seen some Floating point exceptions where I'm not sure if they are caused by new gcc or glib or something completely different if that's what reporter meant by "div0 crashes in glib" so probably worth trying > > Sau! > > > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > > index c21e378..1d69a3f 100644 > > --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > > +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > > @@ -1,15 +1,31 @@ > > -# Poky renames libtool to $host_alias-libtool. > > -# ./$host_alias-libtool isn't created until after configure runs with libtool>= 2.2.2 > > -# so we can't call # it at this point. We can safely assume a version is available > > -# from PATH though > > -# Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com> > > +From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 > > +From: Martin Jansa<Martin.Jansa@gmail.com> > > +Date: Sat, 28 Apr 2012 18:24:50 +0200 > > +Subject: [PATCH] configure: use $host_alias-libtool instead of libtool > > + directly > > + > > +Poky renames libtool to $host_alias-libtool. > > +./$host_alias-libtool isn't created until after configure runs with > > +libtool>= 2.2.2 > > +so we can't call # it at this point. We can safely assume a version is > > +available > > +from PATH though > > + > > +Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com> > > +Rebased to glib-2.32.1 by Martin Jansa<Martin.Jansa@gmail.com> > > > > Upstream-Status: Inappropriate [configuration] > > > > -diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac > > ---- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 > > -+++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 > > -@@ -1385,7 +1385,7 @@ > > +Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> > > +--- > > + configure.ac | 8 ++++---- > > + 1 files changed, 4 insertions(+), 4 deletions(-) > > + > > +diff --git a/configure.ac b/configure.ac > > +index a6478c6..9a93d60 100644 > > +--- a/configure.ac > > ++++ b/configure.ac > > +@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then > > G_MODULE_LDFLAGS= > > else > > export SED > > @@ -18,16 +34,19 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac > > fi > > dnl G_MODULE_IMPL= don't reset, so cmd-line can override > > G_MODULE_NEED_USCORE=0 > > -@@ -1450,7 +1450,7 @@ > > +@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then > > LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" > > dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness > > echo "void glib_plugin_test(void) { }"> plugin.c > > -- ${SHELL} ./libtool --mode=compile ${CC} -shared \ > > -+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ > > - -export-dynamic -o plugin.o plugin.c 2>&1>/dev/null > > - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], > > - glib_cv_rtldglobal_broken,[ > > -@@ -1524,7 +1524,7 @@ > > +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ > > ++ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ > > + ${CPPFLAGS} -c -o plugin.lo plugin.c>/dev/null 2>&1 > > +- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ > > ++ ${SHELL} ./$host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \ > > + ${LDFLAGS} -module -o plugin.la -export-dynamic \ > > + -shrext ".o" -avoid-version plugin.lo \ > > + -rpath /dont/care>/dev/null 2>&1 > > +@@ -1614,7 +1614,7 @@ fi > > > > AC_MSG_CHECKING(for the suffix of module shared libraries) > > export SED > > @@ -36,3 +55,6 @@ diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac > > eval $shrext_cmds > > module=yes eval std_shrext=$shrext_cmds > > # chop the initial dot > > +-- > > +1.7.8.6 > > + > > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > > deleted file mode 100644 > > index 2eaa19b..0000000 > > --- a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > > +++ /dev/null > > @@ -1,24 +0,0 @@ > > -fix g_once_init_enter compile failure > > - > > -Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded > > -back in the 2.22 timeframe. It appears to still be present in 2.27. > > - > > -http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005 > > - > > -Signed-off-by: Darren Hart<dvhart@linux.intel.com> > > - > > -Upstream-Status: Pending > > - > > -Index: glib-2.27.5/glib/gthread.h > > -=================================================================== > > ---- glib-2.27.5.orig/glib/gthread.h > > -+++ glib-2.27.5/glib/gthread.h > > -@@ -344,7 +344,7 @@ void g_once_init_leav > > - G_INLINE_FUNC gboolean > > - g_once_init_enter (volatile gsize *value_location) > > - { > > -- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL) > > -+ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL) > > - return FALSE; > > - else > > - return g_once_init_enter_impl (value_location); > > diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb > > similarity index 91% > > rename from meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb > > rename to meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb > > index f1f9217..354620f 100644 > > --- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.3.bb > > +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb > > @@ -1,6 +1,5 @@ > > require glib.inc > > > > -PR = "r1" > > PE = "1" > > > > DEPENDS += "libffi python-argparse-native zlib" > > @@ -12,12 +11,11 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1] > > SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ > > file://configure-libtool.patch \ > > file://60_wait-longer-for-threads-to-die.patch \ > > - file://g_once_init_enter.patch \ > > file://glib-2.0_fix_for_x32.patch \ > > file://nodbus.patch \ > > " > > -SRC_URI[md5sum] = "0f9fa329c6c1012d0fd861ad3d8a4520" > > -SRC_URI[sha256sum] = "e6cbb27c71c445993346e785e8609cc75cea2941e32312e544872feba572dd27" > > +SRC_URI[md5sum] = "032c7cf9868c9aa186b490b155a41144" > > +SRC_URI[sha256sum] = "484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398" > > > > # Only apply this patch for target recipe on uclibc > > SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" > > diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc > > index 835743a..33f7613 100644 > > --- a/meta/recipes-core/glib-2.0/glib.inc > > +++ b/meta/recipes-core/glib-2.0/glib.inc > > @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ > > file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ > > file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \ > > file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ > > - file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \ > > + file://glib/pcre/pcre.h;startline=11;endline=35;md5=2ffb79f0a0933f282f4f36cda635683d \ > > file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" > > BUGTRACKER = "http://bugzilla.gnome.org" > > SECTION = "libs" -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] glib-2.0: upgrade to 2.32.1 2012-04-30 18:59 ` Martin Jansa @ 2012-04-30 19:29 ` Khem Raj 2012-04-30 23:48 ` Saul Wold 0 siblings, 1 reply; 9+ messages in thread From: Khem Raj @ 2012-04-30 19:29 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 5142 bytes --] On Monday, April 30, 2012, Martin Jansa <martin.jansa@gmail.com> wrote: > On Mon, Apr 30, 2012 at 09:25:31AM -0700, Saul Wold wrote: >> On 04/29/2012 02:27 PM, Martin Jansa wrote: >> > * g_once_init_enter.patch shouldn't be needed after upstream commit >> > 794c1a30bc27b4c8d77537813acb1213d5ac80f2 >> > >> > * LIC_FILES_CHKSUM change is only because PCRE was upgraded and now >> > pcre.h says "Copyright (c) 1997-2012 University of Cambridge" instead >> > of 2010 and COPYING file >> > "Please see the file LICENCE in the PCRE distribution for licensing >> > details." but LICENSE file is not part of glib distribution (but still >> > BSD in standalone PCRE) >> > >> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> >> > --- >> > .../glib-2.0/glib-2.0/configure-libtool.patch | 54 ++++++++++++++------ >> > .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 --------- >> > .../{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} | 6 +-- >> > meta/recipes-core/glib-2.0/glib.inc | 2 +- >> > 4 files changed, 41 insertions(+), 45 deletions(-) >> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch >> > rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} (91%) >> > >> Martin: >> >> Did you see any issue similar to what was reported in >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2369? >> >> There is a new alignment check at configure time requiring updating the >> site file? > > not while building, but in runtime I've seen some > Floating point exceptions where I'm not sure if they are caused by new > gcc or glib or something completely different if that's what reporter meant by > "div0 crashes in glib" > That patch is good it should be applied along with this upgrade And its got formatted so no need for it to resend to ml > so probably worth trying > >> >> Sau! >> >> > diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch >> > index c21e378..1d69a3f 100644 >> > --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch >> > +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch >> > @@ -1,15 +1,31 @@ >> > -# Poky renames libtool to $host_alias-libtool. >> > -# ./$host_alias-libtool isn't created until after configure runs with libtool>= 2.2.2 >> > -# so we can't call # it at this point. We can safely assume a version is available >> > -# from PATH though >> > -# Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com> >> > +From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 2001 >> > +From: Martin Jansa<Martin.Jansa@gmail.com> >> > +Date: Sat, 28 Apr 2012 18:24:50 +0200 >> > +Subject: [PATCH] configure: use $host_alias-libtool instead of libtool >> > + directly >> > + >> > +Poky renames libtool to $host_alias-libtool. >> > +./$host_alias-libtool isn't created until after configure runs with >> > +libtool>= 2.2.2 >> > +so we can't call # it at this point. We can safely assume a version is >> > +available >> > +from PATH though >> > + >> > +Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com> >> > +Rebased to glib-2.32.1 by Martin Jansa<Martin.Jansa@gmail.com> >> > >> > Upstream-Status: Inappropriate [configuration] >> > >> > -diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac >> > ---- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 >> > -+++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 >> > -@@ -1385,7 +1385,7 @@ >> > +Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> >> > +--- >> > + configure.ac | 8 ++++---- >> > + 1 files changed, 4 insertions(+), 4 deletions(-) >> > + >> > +diff --git a/configure.ac b/configure.ac >> > +index a6478c6..9a93d60 100644 >> > +--- a/configure.ac >> > ++++ b/configure.ac >> > +@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then >> > G_MODULE_LDFLAGS= >> > else >> > export SED >> > @@ -18,16 +34,19 @@ diff -ruN glib-2.27.3-orig/configure.acglib-2.27.3/ configure.ac >> > fi >> > dnl G_MODULE_IMPL= don't reset, so cmd-line can override >> > G_MODULE_NEED_USCORE=0 >> > -@@ -1450,7 +1450,7 @@ >> > +@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then >> > LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" >> > dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness >> > echo "void glib_plugin_test(void) { }"> plugin.c >> > -- ${SHELL} ./libtool --mode=compile ${CC} -shared \ >> > -+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ >> > - -export-dynamic -o plugin.o plugin.c 2>&1>/dev/null >> > - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], >> > - glib_cv_rtldglobal_broken,[ >> > -@@ -1524,7 +1524,7 @@ >> > +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ >> > ++ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ >> > + -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com > [-- Attachment #2: Type: text/html, Size: 7490 bytes --] ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] glib-2.0: upgrade to 2.32.1 2012-04-30 19:29 ` Khem Raj @ 2012-04-30 23:48 ` Saul Wold 0 siblings, 0 replies; 9+ messages in thread From: Saul Wold @ 2012-04-30 23:48 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer On 04/30/2012 12:29 PM, Khem Raj wrote: > > > On Monday, April 30, 2012, Martin Jansa <martin.jansa@gmail.com > <mailto:martin.jansa@gmail.com>> wrote: > > On Mon, Apr 30, 2012 at 09:25:31AM -0700, Saul Wold wrote: > >> On 04/29/2012 02:27 PM, Martin Jansa wrote: > >> > * g_once_init_enter.patch shouldn't be needed after upstream commit > >> > 794c1a30bc27b4c8d77537813acb1213d5ac80f2 > >> > > >> > * LIC_FILES_CHKSUM change is only because PCRE was upgraded and now > >> > pcre.h says "Copyright (c) 1997-2012 University of Cambridge" > instead > >> > of 2010 and COPYING file > >> > "Please see the file LICENCE in the PCRE distribution for licensing > >> > details." but LICENSE file is not part of glib distribution > (but still > >> > BSD in standalone PCRE) > >> > > >> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com > <mailto:Martin.Jansa@gmail.com>> > >> > --- > >> > .../glib-2.0/glib-2.0/configure-libtool.patch | 54 > ++++++++++++++------ > >> > .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 --------- > >> > .../{glib-2.0_2.30.3.bb <http://glib-2.0_2.30.3.bb> => > glib-2.0_2.32.1.bb <http://glib-2.0_2.32.1.bb>} | 6 +-- > >> > meta/recipes-core/glib-2.0/glib.inc | 2 +- > >> > 4 files changed, 41 insertions(+), 45 deletions(-) > >> > delete mode 100644 > meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > >> > rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb > <http://glib-2.0_2.30.3.bb> => glib-2.0_2.32.1.bb > <http://glib-2.0_2.32.1.bb>} (91%) > >> > > >> Martin: > >> > >> Did you see any issue similar to what was reported in > >> https://bugzilla.yoctoproject.org/show_bug.cgi?id=2369? > >> > >> There is a new alignment check at configure time requiring updating the > >> site file? > > > > not while building, but in runtime I've seen some > > Floating point exceptions where I'm not sure if they are caused by new > > gcc or glib or something completely different if that's what reporter > meant by > > "div0 crashes in glib" > > > > That patch is good it should be applied along with this upgrade > And its got formatted so no need for it to resend to ml I will pull it in shortly, but turns out there are other issues with this glib-2.0 update, this update deprecated g_atexit() which is used by evolution_data_server. Sau! > > so probably worth trying > > > >> > >> Sau! > >> > >> > diff --git > a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > >> > index c21e378..1d69a3f 100644 > >> > --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > >> > +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch > >> > @@ -1,15 +1,31 @@ > >> > -# Poky renames libtool to $host_alias-libtool. > >> > -# ./$host_alias-libtool isn't created until after configure runs > with libtool>= 2.2.2 > >> > -# so we can't call # it at this point. We can safely assume a > version is available > >> > -# from PATH though > >> > -# Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com > <mailto:dongxiao.xu@intel.com>> > >> > +From 1c5718648d49e795efee91c220a2bf9386c184f2 Mon Sep 17 00:00:00 > 2001 > >> > +From: Martin Jansa<Martin.Jansa@gmail.com > <mailto:Martin.Jansa@gmail.com>> > >> > +Date: Sat, 28 Apr 2012 18:24:50 +0200 > >> > +Subject: [PATCH] configure: use $host_alias-libtool instead of > libtool > >> > + directly > >> > + > >> > +Poky renames libtool to $host_alias-libtool. > >> > +./$host_alias-libtool isn't created until after configure runs with > >> > +libtool>= 2.2.2 > >> > +so we can't call # it at this point. We can safely assume a > version is > >> > +available > >> > +from PATH though > >> > + > >> > +Rebased to glib-2.27.3 by Dongxiao Xu<dongxiao.xu@intel.com > <mailto:dongxiao.xu@intel.com>> > >> > +Rebased to glib-2.32.1 by Martin Jansa<Martin.Jansa@gmail.com > <mailto:Martin.Jansa@gmail.com>> > >> > > >> > Upstream-Status: Inappropriate [configuration] > >> > > >> > -diff -ruN glib-2.27.3-orig/configure.ac <http://configure.ac> > glib-2.27.3/configure.ac <http://configure.ac> > >> > ---- glib-2.27.3-orig/configure.ac <http://configure.ac> > 2010-11-03 11:02:05.000000000 +0800 > >> > -+++ glib-2.27.3/configure.ac <http://configure.ac> > 2010-11-16 12:38:12.610485990 +0800 > >> > -@@ -1385,7 +1385,7 @@ > >> > +Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com > <mailto:Martin.Jansa@gmail.com>> > >> > +--- > >> > + configure.ac <http://configure.ac> | 8 ++++---- > >> > + 1 files changed, 4 insertions(+), 4 deletions(-) > >> > + > >> > +diff --git a/configure.ac <http://configure.ac> b/configure.ac > <http://configure.ac> > >> > +index a6478c6..9a93d60 100644 > >> > +--- a/configure.ac <http://configure.ac> > >> > ++++ b/configure.ac <http://configure.ac> > >> > +@@ -1470,7 +1470,7 @@ if test x"$glib_native_win32" = xyes; then > >> > G_MODULE_LDFLAGS= > >> > else > >> > export SED > >> > @@ -18,16 +34,19 @@ diff -ruN glib-2.27.3-orig/configure.ac > <http://configure.ac> glib-2.27.3/configure.ac <http://configure.ac> > >> > fi > >> > dnl G_MODULE_IMPL= don't reset, so cmd-line can override > >> > G_MODULE_NEED_USCORE=0 > >> > -@@ -1450,7 +1450,7 @@ > >> > +@@ -1535,9 +1535,9 @@ if test "$G_MODULE_IMPL" = > "G_MODULE_IMPL_DL"; then > >> > LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" > >> > dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness > >> > echo "void glib_plugin_test(void) { }"> plugin.c > >> > -- ${SHELL} ./libtool --mode=compile ${CC} -shared \ > >> > -+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ > >> > - -export-dynamic -o plugin.o plugin.c 2>&1>/dev/null > >> > - AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], > >> > - glib_cv_rtldglobal_broken,[ > >> > -@@ -1524,7 +1524,7 @@ > >> > +- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \ > >> > ++ ${SHELL} ./$host_alias-libtool --mode=compile --tag=CC ${CC} > ${CFLAGS} \ > >> > + -- > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com > <mailto:Martin.Jansa@gmail.com> > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/3] gobject-introspection: upgrade to 1.32.1 2012-04-29 21:27 [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Martin Jansa 2012-04-29 21:27 ` [PATCH 1/3] glib-2.0: upgrade to 2.32.1 Martin Jansa @ 2012-04-29 21:27 ` Martin Jansa 2012-04-29 21:27 ` [PATCH 3/3] libsoup-2.4: upgrade to 2.38.1 Martin Jansa 2012-05-07 16:18 ` [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Saul Wold 3 siblings, 0 replies; 9+ messages in thread From: Martin Jansa @ 2012-04-29 21:27 UTC (permalink / raw) To: openembedded-core * simplify SRC_URI * add COPYING to LIC_FILES_CHKSUM Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- ..._1.31.20.bb => gobject-introspection_1.32.1.bb} | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) rename meta/recipes-gnome/gnome/{gobject-introspection_1.31.20.bb => gobject-introspection_1.32.1.bb} (52%) diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.31.20.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb similarity index 52% rename from meta/recipes-gnome/gnome/gobject-introspection_1.31.20.bb rename to meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb index beb96a6..f51e83e 100644 --- a/meta/recipes-gnome/gnome/gobject-introspection_1.31.20.bb +++ b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb @@ -3,16 +3,19 @@ DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native" DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native" BBCLASSEXTEND = "native" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.31/gobject-introspection-1.31.20.tar.xz \ +SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" +SRC_URI = "\ + ${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \ file://use-usr-bin-env-for-python.patch \ " -SRC_URI[md5sum] = "05d9ac99a5929d002867b86a2a69b8b5" -SRC_URI[sha256sum] = "e1552884b642e7e5a56a175ae85bfdebfd16c29a7bbe4f6ca9cdf591e333f070" +SRC_URI[md5sum] = "7bbdb696c37bb98aef5af02c4b8975e3" +SRC_URI[sha256sum] = "44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858" LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" +LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \ + file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" inherit autotools -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] libsoup-2.4: upgrade to 2.38.1 2012-04-29 21:27 [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Martin Jansa 2012-04-29 21:27 ` [PATCH 1/3] glib-2.0: upgrade to 2.32.1 Martin Jansa 2012-04-29 21:27 ` [PATCH 2/3] gobject-introspection: upgrade to 1.32.1 Martin Jansa @ 2012-04-29 21:27 ` Martin Jansa 2012-05-07 16:18 ` [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Saul Wold 3 siblings, 0 replies; 9+ messages in thread From: Martin Jansa @ 2012-04-29 21:27 UTC (permalink / raw) To: openembedded-core * newer webkit-efl needs 2.37.4 or newer Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- ...libsoup-2.4_2.36.1.bb => libsoup-2.4_2.38.1.bb} | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/libsoup/{libsoup-2.4_2.36.1.bb => libsoup-2.4_2.38.1.bb} (55%) diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.38.1.bb similarity index 55% rename from meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb rename to meta/recipes-support/libsoup/libsoup-2.4_2.38.1.bb index 8e6ef26..c04918e 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.36.1.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.38.1.bb @@ -6,14 +6,14 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "x11/gnome/libs" -PR = "r1" DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3 libgnome-keyring" -SRC_URI = "${GNOME_MIRROR}/libsoup/2.36/libsoup-${PV}.tar.bz2" +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" +SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" -SRC_URI[md5sum] = "9c03fc033da61deaf5b403e9e9c884b8" -SRC_URI[sha256sum] = "c387eefd8214c458965b1d6e3490cea33b5bb6c81798cac90cde96136dc19401" +SRC_URI[md5sum] = "d13fb4968acea24c26b83268a308f580" +SRC_URI[sha256sum] = "71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a" S = "${WORKDIR}/libsoup-${PV}" -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade 2012-04-29 21:27 [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Martin Jansa ` (2 preceding siblings ...) 2012-04-29 21:27 ` [PATCH 3/3] libsoup-2.4: upgrade to 2.38.1 Martin Jansa @ 2012-05-07 16:18 ` Saul Wold 3 siblings, 0 replies; 9+ messages in thread From: Saul Wold @ 2012-05-07 16:18 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa On 04/29/2012 02:27 PM, Martin Jansa wrote: > Tested on my images and fixed failing recipe, mostly it's about including header files like: > glib-2.0/glib/gthread.h:28:2: error: #error "Only<glib.h> can be included directly." > > The following changes since commit 5a1f172d35be610688842a8a9a84f24edb9aeb51: > > bitbake.conf: use TUNE_PKGARCH instead of TARGET_ARCH in SDK_NAME (2012-04-26 10:59:20 +0100) > > are available in the git repository at: > git://git.openembedded.org/openembedded-core-contrib jansa/pull2 > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull2 > > Martin Jansa (3): > glib-2.0: upgrade to 2.32.1 > gobject-introspection: upgrade to 1.32.1 > libsoup-2.4: upgrade to 2.38.1 > > .../glib-2.0/glib-2.0/configure-libtool.patch | 54 ++++++++++++++------ > .../glib-2.0/glib-2.0/g_once_init_enter.patch | 24 --------- > .../{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} | 6 +-- > meta/recipes-core/glib-2.0/glib.inc | 2 +- > ..._1.31.20.bb => gobject-introspection_1.32.1.bb} | 13 +++-- > ...libsoup-2.4_2.36.1.bb => libsoup-2.4_2.38.1.bb} | 8 ++-- > 6 files changed, 53 insertions(+), 54 deletions(-) > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch > rename meta/recipes-core/glib-2.0/{glib-2.0_2.30.3.bb => glib-2.0_2.32.1.bb} (91%) > rename meta/recipes-gnome/gnome/{gobject-introspection_1.31.20.bb => gobject-introspection_1.32.1.bb} (52%) > rename meta/recipes-support/libsoup/{libsoup-2.4_2.36.1.bb => libsoup-2.4_2.38.1.bb} (55%) > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-05-07 16:28 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-04-29 21:27 [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Martin Jansa 2012-04-29 21:27 ` [PATCH 1/3] glib-2.0: upgrade to 2.32.1 Martin Jansa 2012-04-30 16:25 ` Saul Wold 2012-04-30 18:59 ` Martin Jansa 2012-04-30 19:29 ` Khem Raj 2012-04-30 23:48 ` Saul Wold 2012-04-29 21:27 ` [PATCH 2/3] gobject-introspection: upgrade to 1.32.1 Martin Jansa 2012-04-29 21:27 ` [PATCH 3/3] libsoup-2.4: upgrade to 2.38.1 Martin Jansa 2012-05-07 16:18 ` [PATCH 0/3] glib-2.0, gobject-introspection, libsoup-2.4 upgrade Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox