[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-30-g81c54ed
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-30-g81c54ed
|
From: jorasse <jo...@us...> - 2012-10-30 23:29:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 81c54ed902086d880cfc6ae1ca82699304ae7f74 (commit)
from 058224b8f31878f6777494c1ecb3cee0d177d123 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 81c54ed902086d880cfc6ae1ca82699304ae7f74
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 31 00:29:47 2012 +0100
[BUILROOT] uclibc : patch cleanup and extand accept4 patches to uclibc 0.9.33.2 - to fix QT compilation issue
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2012.11/047-uclibc-config.patch | 32 ---------
.../182-uclibc-add_accept4_declaration_fix.patch | 71 ++++++++++++++++++++
2 files changed, 71 insertions(+), 32 deletions(-)
delete mode 100644 patches/buildroot/2012.11/047-uclibc-config.patch
diff --git a/patches/buildroot/2012.11/047-uclibc-config.patch b/patches/buildroot/2012.11/047-uclibc-config.patch
deleted file mode 100644
index f80184c..0000000
--- a/patches/buildroot/2012.11/047-uclibc-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Make uClibc 0.9.33 as Buildroot's default version
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/toolchain/uClibc/uclibc.mk
-===================================================================
---- buildroot.orig/toolchain/uClibc/uclibc.mk 2012-02-29 23:19:47.000000000 +0100
-+++ buildroot/toolchain/uClibc/uclibc.mk 2012-03-23 16:57:54.000000000 +0100
-@@ -102,23 +102,6 @@
- -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \
- $(UCLIBC_DIR)/.oldconfig
- ifeq ($(UCLIBC_TARGET_ARCH),arm)
-- (/bin/echo "# CONFIG_GENERIC_ARM is not set"; \
-- /bin/echo "# CONFIG_ARM610 is not set"; \
-- /bin/echo "# CONFIG_ARM710 is not set"; \
-- /bin/echo "# CONFIG_ARM7TDMI is not set"; \
-- /bin/echo "# CONFIG_ARM720T is not set"; \
-- /bin/echo "# CONFIG_ARM920T is not set"; \
-- /bin/echo "# CONFIG_ARM922T is not set"; \
-- /bin/echo "# CONFIG_ARM926T is not set"; \
-- /bin/echo "# CONFIG_ARM10T is not set"; \
-- /bin/echo "# CONFIG_ARM1136JF_S is not set"; \
-- /bin/echo "# CONFIG_ARM1176JZ_S is not set"; \
-- /bin/echo "# CONFIG_ARM1176JZF_S is not set"; \
-- /bin/echo "# CONFIG_ARM_SA110 is not set"; \
-- /bin/echo "# CONFIG_ARM_SA1100 is not set"; \
-- /bin/echo "# CONFIG_ARM_XSCALE is not set"; \
-- /bin/echo "# CONFIG_ARM_IWMMXT is not set"; \
-- ) >> $(UCLIBC_DIR)/.oldconfig
- $(SED) 's/^\(CONFIG_[^_]*[_]*ARM[^=]*\)=.*/# \1 is not set/g' \
- $(UCLIBC_DIR)/.oldconfig
- $(SED) 's/^.*$(UCLIBC_ARM_TYPE).*/$(UCLIBC_ARM_TYPE)=y/g' $(UCLIBC_DIR)/.oldconfig
diff --git a/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch
index e5bcac0..2422cd2 100644
--- a/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch
+++ b/patches/buildroot/2012.11/182-uclibc-add_accept4_declaration_fix.patch
@@ -2,6 +2,77 @@ Fix accept4 declaration in uClibc when not available in Linux Kernel.
Signed-off-by: Jérémie Scheer <jer...@ar...>
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch 2012-03-26 16:34:32.000000000 +0200
+@@ -0,0 +1,33 @@
++From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
++From: Guillaume Emont <gui...@ig...>
++Date: Thu, 15 Sep 2011 20:19:19 +0200
++Subject: [PATCH 1/2] Only expose accept4 in headers if it is available
++
++---
++ include/sys/socket.h | 3 ++-
++ 1 files changed, 2 insertions(+), 1 deletions(-)
++
++diff --git a/include/sys/socket.h b/include/sys/socket.h
++index 6037f92..53b56ea 100644
++--- a/include/sys/socket.h
+++++ b/include/sys/socket.h
++@@ -22,6 +22,7 @@
++ #define _SYS_SOCKET_H 1
++
++ #include <features.h>
+++#include <bits/kernel-features.h>
++
++ __BEGIN_DECLS
++
++@@ -227,7 +228,7 @@ extern int accept (int __fd, __SOCKADDR_ARG __addr,
++ socklen_t *__restrict __addr_len);
++ libc_hidden_proto(accept)
++
++-#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU
+++#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU && defined __ASSUME_ACCEPT4
++ /* Similar to 'accept' but takes an additional parameter to specify flags.
++
++ This function is a cancellation point and therefore not marked with
++--
++1.7.4.1
++
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-assume-accept4-in-recent-arm-kernels.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33.2-assume-accept4-in-recent-arm-kernels.patch 2012-03-26 17:04:36.000000000 +0200
+@@ -0,0 +1,28 @@
++From c526492ee2284b6ae61040b2eac5b03120fb3185 Mon Sep 17 00:00:00 2001
++From: Guillaume Emont <gui...@ig...>
++Date: Thu, 15 Sep 2011 20:19:57 +0200
++Subject: [PATCH 2/2] define __ASSUME_ACCEPT4 for arm for kernels >= 2.6.36
++
++---
++ libc/sysdeps/linux/common/bits/kernel-features.h | 5 +++++
++ 1 files changed, 5 insertions(+), 0 deletions(-)
++
++diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
++index 6bf5544..be92f90 100644
++--- a/libc/sysdeps/linux/common/bits/kernel-features.h
+++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
++@@ -479,6 +479,11 @@
++ # define __ASSUME_ACCEPT4 1
++ #endif
++
+++/* Correct support for the accept4 syscall for arm was added in 2.6.36. */
+++#if __LINUX_KERNEL_VERSION >= 0x020624 && defined __arm__
+++# define __ASSUME_ACCEPT4 1
+++#endif
+++
++ /* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */
++ #if __LINUX_KERNEL_VERSION >= 0x02061d
++ # define __ASSUME_FUTEX_CLOCK_REALTIME 1
++--
++1.7.4.1
++
Index: buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
hooks/post-receive
--
armadeus
|
