mesa3d: fix build failure bug #3313

Add patch to fix the build failure as reported in bug #3313

---
 package/x11r7/mesa3d/mesa3d-uclibc.patch |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 package/x11r7/mesa3d/mesa3d-uclibc.patch

new file mode 100644
index 0000000..37f620b
@@ -0,0 +1,12 @@
+diff -Nura Mesa-7.6.1/src/mesa/main/imports.c Mesa-7.6.1.uclibc/src/mesa/main/imports.c
+--- Mesa-7.6.1/src/mesa/main/imports.c	2009-12-21 23:08:13.000000000 -0300
++++ Mesa-7.6.1.uclibc/src/mesa/main/imports.c	2011-03-02 15:09:56.342618892 -0300
+@@ -915,7 +915,7 @@
+ double
+ _mesa_strtod( const char *s, char **end )
+ {
+-#ifdef _GNU_SOURCE
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);

1.7.3.4

---
 package/xterm/Config.in |    1 +
 package/xterm/xterm.mk  |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

index 9473fad..99c89cf 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XTERM
 	bool "xterm"
+	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_XLIB_LIBXAW
 	depends on BR2_PACKAGE_XORG7
 	help

index 8952e24..ab3fc10 100644
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-XTERM_VERSION:=262
-XTERM_SOURCE:=xterm-$(XTERM_VERSION).tgz
-XTERM_SITE:=ftp://invisible-island.net/xterm
-XTERM_DEPENDENCIES = xserver_xorg-server xlib_libXaw
+XTERM_VERSION = 267
+XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
+XTERM_SITE = ftp://invisible-island.net/xterm
+XTERM_DEPENDENCIES = ncurses xserver_xorg-server xlib_libXaw
 XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 $(eval $(call AUTOTARGETS,package,xterm))

1.7.3.4

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Bye, Peter Korsgaard

---
 .../xdriver_xf86-video-sis.mk                      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 0fb335c..4cc3e13 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.2
+XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.3
 XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES

1.7.3.4

---
 package/webkit/webkit.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index 6ab609b..f764eea 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-WEBKIT_VERSION = 1.2.6
+WEBKIT_VERSION = 1.2.7
 WEBKIT_SITE = http://www.webkitgtk.org
 WEBKIT_INSTALL_STAGING = YES
 WEBKIT_DEPENDENCIES = host-flex host-gperf icu libcurl libxml2 libxslt \

1.7.3.4

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Bye, Peter Korsgaard

Hi,
About webkit, I found that we still can't compile it
with uClibc 0.9.32-rc3 and Thread library implementation, linuxthreads (stable/old)

giving this error:
JavaScriptCore/runtime/Collector.cpp: In function 'void* JSC::currentThreadStackBase()':
JavaScriptCore/runtime/Collector.cpp:667: error: 'pthread_getattr_np' was not declared in this scope
CXX JavaScriptCore/runtime/libJavaScriptCore_la-DateConstructor.lo

http://git.buildroot.net/buildroot/tree/package/webkit/webkit-pthread_getattr_np.patch
webkit-pthread_getattr_np.patch, is for uClibc <= 0.9.31, but should be also applied if Thread library implementation is linuxthreads (stable/old) on 0.9.32.

if I change for Native POSIX Threading (NPTL)
BR2_PTHREADS_NATIVE=y
I could compile webkit successfully

hope that helps something,

S?rgio M. B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3309 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20110331/5c250bef/attachment.bin>

---
 package/midori/midori.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

index af227d4..5f6315f 100644
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-MIDORI_VERSION = 0.2.9
+MIDORI_VERSION = 0.3.2
 MIDORI_SOURCE = midori-$(MIDORI_VERSION).tar.bz2
-MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.2/
+MIDORI_SITE = http://archive.xfce.org/src/apps/midori/0.3/
 MIDORI_INSTALL_TARGET = YES
 
 MIDORI_DEPENDENCIES = host-pkg-config host-intltool webkit libsexy libgtk2

1.7.3.4

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]>

Committed, thanks.

Bye, Peter Korsgaard

Gustavo> Add patch to fix the build failure as reported in bug #3313 Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/x11r7/mesa3d/mesa3d-uclibc.patch |   12 ++++++++++++

Gustavo> 1 files changed, 12 insertions(+), 0 deletions(-) Gustavo> create mode 100644 package/x11r7/mesa3d/mesa3d-uclibc.patch

Gustavo> diff --git a/package/x11r7/mesa3d/mesa3d-uclibc.patch b/package/x11r7/mesa3d/mesa3d-uclibc.patch Gustavo> new file mode 100644
Gustavo> index 0000000..37f620b
Gustavo> --- /dev/null
Gustavo> +++ b/package/x11r7/mesa3d/mesa3d-uclibc.patch
Gustavo> @@ -0,0 +1,12 @@
Gustavo> +diff -Nura Mesa-7.6.1/src/mesa/main/imports.c Mesa-7.6.1.uclibc/src/mesa/main/imports.c
Gustavo> +--- Mesa-7.6.1/src/mesa/main/imports.c 2009-12-21 23:08:13.000000000 -0300
Gustavo> ++++ Mesa-7.6.1.uclibc/src/mesa/main/imports.c 2011-03-02 15:09:56.342618892 -0300
Gustavo> +@@ -915,7 +915,7 @@
Gustavo> + double
Gustavo> + _mesa_strtod( const char *s, char **end )
Gustavo> + {
Gustavo> +-#ifdef _GNU_SOURCE
Gustavo> ++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
Gustavo> + static locale_t loc = NULL;
Gustavo> + if (!loc) {
Gustavo> + loc = newlocale(LC_CTYPE_MASK, "C", NULL);

Hmm, that looks wrong - uClibc has newlocale() if you have locale support enabled, so I guess you'll need something like:

#ifdef _GNU_SOURCE
#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_LOCALE__) ..

Bye, Peter Korsgaard