From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx1.pokylinux.org (Postfix) with ESMTP id D679A4C80BD4 for ; Fri, 31 Dec 2010 02:05:27 -0600 (CST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 31 Dec 2010 00:05:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.60,254,1291622400"; d="scan'208";a="873267051" Received: from unknown (HELO [10.255.13.218]) ([10.255.13.218]) by fmsmga001.fm.intel.com with ESMTP; 31 Dec 2010 00:05:27 -0800 Message-ID: <4D1D8EC7.40504@intel.com> Date: Fri, 31 Dec 2010 00:05:27 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100621 Fedora/3.0.5-1.fc13 Lightning/1.0b2pre Thunderbird/3.0.5 MIME-Version: 1.0 To: poky@yoctoproject.org References: In-Reply-To: Subject: Re: [PATCH 2/3] glib-2.0: fix g_once_init_enter compile failure X-BeenThere: poky@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Poky build system developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Dec 2010 08:05:28 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 > CC: Tom Zanussi > --- > .../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"