[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-122-g2945ddf

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  2945ddf2933e84cec0ae0296b1b42f157638a015 (commit)
      from  d904df43a4654c45275c26a57b263c438f43428c (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 2945ddf2933e84cec0ae0296b1b42f157638a015
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Feb 17 16:54:39 2014 +0100

    [BUILDROOT] Fix application of uclibc patches for accept4 kernel function.

-----------------------------------------------------------------------

Summary of changes:
 .../182-uclibc-add_accept4_declaration_fix.patch   |   80 +------------------
 patches/buildroot/2013.11/cleanup_buildroot.sh     |    2 +
 2 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch
index 2422cd2..ee4be78 100644
--- a/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch
+++ b/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch
@@ -1,11 +1,12 @@
 Fix accept4 declaration in uClibc when not available in Linux Kernel.
+This patch is useful to make new Qt versions (>= 4.8) compile with old Linux kernel (< 2.6.38).
 
 Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
-Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch
+Index: buildroot/package/uclibc/0.9.33.2/uclibc-0055-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
++++ buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch	2014-02-17 16:13:26.000000000 +0100
 @@ -0,0 +1,33 @@
 +From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
 +From: Guillaume Emont <gui...@ig...>
@@ -40,81 +41,10 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch
 +--
 +1.7.4.1
 +
-Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-assume-accept4-in-recent-arm-kernels.patch
+Index: buildroot/package/uclibc/0.9.33.2/uclibc-0056-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
-+++ buildroot/toolchain/uClibc/uClibc-0.9.33-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-assume-accept4-in-recent-arm-kernels.patch
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.33-assume-accept4-in-recent-arm-kernels.patch	2012-03-26 17:04:36.000000000 +0200
++++ buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch	2014-02-17 16:13:41.000000000 +0100
 @@ -0,0 +1,28 @@
 +From c526492ee2284b6ae61040b2eac5b03120fb3185 Mon Sep 17 00:00:00 2001
 +From: Guillaume Emont <gui...@ig...>
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index c8e16cc..89a6f4e 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -80,3 +80,5 @@ rm -rf buildroot/linux/
 rm -rf buildroot/package/freescale-imx/imx-lib/*.patch
 rm -rf buildroot/package/libpng/
 rm -rf buildroot/package/mmc-utils/
+rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
+rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch


hooks/post-receive
-- 
armadeus


