From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com ([134.134.136.20]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QkHg4-0006JN-PL for openembedded-core@lists.openembedded.org; Fri, 22 Jul 2011 17:30:12 +0200 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 22 Jul 2011 08:26:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,247,1309762800"; d="scan'208";a="30821830" Received: from unknown (HELO [10.255.14.61]) ([10.255.14.61]) by orsmga001.jf.intel.com with ESMTP; 22 Jul 2011 08:26:02 -0700 Message-ID: <4E29968A.8080102@linux.intel.com> Date: Fri, 22 Jul 2011 08:26:02 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc13 Thunderbird/3.1.10 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1311228617-29732-1-git-send-email-raj.khem@gmail.com> In-Reply-To: <1311228617-29732-1-git-send-email-raj.khem@gmail.com> Subject: Re: [PATCH 1/6] mesa-xlib, mesa-dri: Probe for newlocale() before using it. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2011 15:30:13 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 07/20/2011 11:10 PM, Khem Raj wrote: > Signed-off-by: Khem Raj > --- > meta/recipes-graphics/mesa/mesa-dri/uclibc.patch | 40 ++++++++++++++++++++++ > meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 6 ++- > meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 5 ++- > 3 files changed, 48 insertions(+), 3 deletions(-) > create mode 100644 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch > > diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch b/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch > new file mode 100644 > index 0000000..bb5af44 > --- /dev/null > +++ b/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch > @@ -0,0 +1,40 @@ > +Index: Mesa-7.10.2/src/mesa/main/imports.c > +=================================================================== > +--- Mesa-7.10.2.orig/src/mesa/main/imports.c 2011-03-01 12:57:29.000000000 -0800 > ++++ Mesa-7.10.2/src/mesa/main/imports.c 2011-07-20 19:08:49.441785510 -0700 > +@@ -757,7 +757,7 @@ > + float > + _mesa_strtof( const char *s, char **end ) > + { > +-#if defined(_GNU_SOURCE)&& !defined(__CYGWIN__)&& !defined(__FreeBSD__) > ++#if defined(_GNU_SOURCE)&& !defined(__CYGWIN__)&& !defined(__FreeBSD__)&& defined (HAVE_NEWLOCALE) > + static locale_t loc = NULL; > + if (!loc) { > + loc = newlocale(LC_CTYPE_MASK, "C", NULL); > +Index: Mesa-7.10.2/src/glsl/strtod.c > +=================================================================== > +--- Mesa-7.10.2.orig/src/glsl/strtod.c 2011-01-03 16:45:51.000000000 -0800 > ++++ Mesa-7.10.2/src/glsl/strtod.c 2011-07-20 19:10:21.441785488 -0700 > +@@ -44,7 +44,7 @@ > + double > + glsl_strtod(const char *s, char **end) > + { > +-#if defined(_GNU_SOURCE)&& !defined(__CYGWIN__)&& !defined(__FreeBSD__) > ++#if defined(_GNU_SOURCE)&& !defined(__CYGWIN__)&& !defined(__FreeBSD__)&& defined (HAVE_NEWLOCALE) > + static locale_t loc = NULL; > + if (!loc) { > + loc = newlocale(LC_CTYPE_MASK, "C", NULL); > +Index: Mesa-7.10.2/configure.ac > +=================================================================== > +--- Mesa-7.10.2.orig/configure.ac 2011-07-20 19:09:02.000000000 -0700 > ++++ Mesa-7.10.2/configure.ac 2011-07-20 19:09:57.121785492 -0700 > +@@ -450,6 +450,9 @@ > + dnl See if posix_memalign is available > + AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"]) > + > ++dnl See if newlocale is available > ++AC_CHECK_FUNCS_ONCE(newlocale) > ++ > + dnl SELinux awareness. > + AC_ARG_ENABLE([selinux], > + [AS_HELP_STRING([--enable-selinux], > diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb > index c7bd974..aac7a1c 100644 > --- a/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb > +++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb > @@ -8,10 +8,12 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat > > DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native python-native" > > -PR = "r0" > +PR = "r1" > > SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ > - file://crossfix.patch" > + file://crossfix.patch \ > + file://uclibc.patch \ > + " > > SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771" > SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1" > diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb > index b77df2c..511103d 100644 > --- a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb > +++ b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb > @@ -1,6 +1,9 @@ > include mesa-common.inc > > +FILESPATH =. "${FILE_DIRNAME}/mesa-dri:" > + > SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ > + file://uclibc.patch \ > " > > SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771" > @@ -14,6 +17,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ > DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} makedepend-native" > > PE = "1" > -PR = "r0" > +PR = "r1" > > EXTRA_OECONF += "--with-driver=xlib" The series was merged into OE-Core aside from the libiconv, which I believe is getting re-worked. Sau!