Re: [PATCH 2/3] glib-2.0: fix g_once_init_enter compile failure

[Saul Wold <saul.wold@intel.com>]

On 12/29/2010 10:10 AM, Darren Hart wrote:
> 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/msg00529.html
>
Can you add this attribution as well as Signed-off-by in the header of 
the patch file directly, this will help understand with out having to 
dig into the git info.

Thanks

   Sau!

> Signed-off-by: Darren Hart<dvhart@linux.intel.com>
> CC: Tom Zanussi<tom.zanussi@intel.com>
> ---
>   .../glib-2.0-2.27.3/g_once_init_enter.patch        |   13 +++++++++++++
>   meta/recipes-core/glib-2.0/glib-2.0_2.27.3.bb      |    6 ++++--
>   2 files changed, 17 insertions(+), 2 deletions(-)
>   create mode 100644 meta/recipes-core/glib-2.0/glib-2.0-2.27.3/g_once_init_enter.patch
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/g_once_init_enter.patch
> new file mode 100644
> index 0000000..1c4ce50
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/g_once_init_enter.patch
> @@ -0,0 +1,13 @@
> +Index: glib-2.27.3/glib/gthread.h
> +===================================================================
> +--- glib-2.27.3.orig/glib/gthread.h
> ++++ glib-2.27.3/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.27.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.3.bb
> index 30e208a..a9ff3ec 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.3.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.3.bb
> @@ -1,10 +1,12 @@
>   require glib.inc
>
> -PR = "r0"
> +PR = "r1"
>
>   SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \
>              file://configure-libtool.patch \
> -           file://60_wait-longer-for-threads-to-die.patch"
> +           file://60_wait-longer-for-threads-to-die.patch \
> +           file://g_once_init_enter.patch \
> +          "
>
>   SRC_URI[md5sum] = "d3e976ff92b55b6064a0eb3110f36158"
>   SRC_URI[sha256sum] = "c44177b635e88639361eb1daf7aaa33315a00aaf46db5accf2f11920c7ff1919"