From: Saul Wold <sgw@linux.intel.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 1/6] mesa-xlib, mesa-dri: Probe for newlocale() before using it.
Date: Fri, 22 Jul 2011 08:26:02 -0700 [thread overview]
Message-ID: <4E29968A.8080102@linux.intel.com> (raw)
In-Reply-To: <1311228617-29732-1-git-send-email-raj.khem@gmail.com>
On 07/20/2011 11:10 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
> 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!
prev parent reply other threads:[~2011-07-22 15:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-21 6:10 [PATCH 1/6] mesa-xlib, mesa-dri: Probe for newlocale() before using it Khem Raj
2011-07-21 6:10 ` [PATCH 2/6] task-core-tools.bb: Exclude lttng-ust for x86_64/uclibc Khem Raj
2011-07-21 6:10 ` [PATCH 3/6] libiconv: Fix build failure on 1.13.1 Khem Raj
2011-07-21 8:12 ` Henning Heinold
2011-07-21 15:53 ` Khem Raj
2011-07-21 6:10 ` [PATCH 4/6] uclibc: Add patch header for sync_file_range2.patch Khem Raj
2011-07-21 6:10 ` [PATCH 5/6] strace: Define own sigmask macro if not defined already in signal.h Khem Raj
2011-07-21 6:10 ` [PATCH 6/6] util-linux: Replace sigsetmask with posix compliant functions Khem Raj
2011-07-22 15:26 ` Saul Wold [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E29968A.8080102@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox