rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buidlroot to version 2016.08.1

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 22:07:29 +01:00
parent 807ab03547
commit a1061efbc2
3636 changed files with 59539 additions and 25783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
bsp/buildroot/package/omniorb/0001-fix-unistd-sys-time-includes.patch Normal file
View File

@@ -0,0 +1,61 @@
omniorb/thread: use proper autoconf macros for header inclusion
src/lib/omnithread/posix.cc uses sleep() and usleep(), defined in
<unistd.h> on numerous platforms, and struct timeval/gettimeofday(),
defined in <sys/time.h> on various platforms.
Since those header files are not available on all platforms, posix.cc
currently uses the following condition:
#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(__SCO_VERSION__) || defined(__aix__) || defined (__cygwin__) || defined(__darwin__) || defined(__macos__)
Unfortunately, this falls short on Linux systems based on the musl C
library. Indeed, the musl C library does not define the __GLIBC__
symbol, but does have the sleep()/usleep() definitions in <unistd.h>,
and the struct timeval/gettimeofday() definitions in <sys/time.h>,
like any Linux system. Also, the musl C library does not define any
constant like __MUSL__ to distinguish it.
Due to this, on musl based systems, <unistd.h> and <sys/time.h> are
not included, causing a build failure:
posix.cc:864:22: error: '::sleep' has not been declared
while ((secs = ::sleep(secs))) ;
^
posix.cc:866:43: error: 'usleep' was not declared in this scope
usleep(secs * 1000000 + (nanosecs / 1000));
^
posix.cc: In static member function 'static void omni_thread::get_time(long unsigned int*, long unsigned int*, long unsigned int, long unsigned int)':
posix.cc:904:20: error: aggregate 'omni_thread::get_time(long unsigned int*, long unsigned int*, long unsigned int, long unsigned int)::timeval tv' has incomplete type and cannot be defined
struct timeval tv;
^
posix.cc:905:24: error: 'gettimeofday' was not declared in this scope
gettimeofday(&tv, 0);
It turns out that the configure.ac already checks for the availability
of <unistd.h> and <sys/time.h>. So all what this patch does is use the
C defines generated by the configure script to decide whether
<unistd.h> and <sys/time.h> can be included or not.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/src/lib/omnithread/posix.cc
===================================================================
--- a/src/lib/omnithread/posix.cc
+++ b/src/lib/omnithread/posix.cc
@@ -78,10 +78,14 @@
#include <errno.h>
#include <time.h>
#include <omnithread.h>
+#include <omniORB4/acconfig.h>
-#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(__SCO_VERSION__) || defined(__aix__) || defined (__cygwin__) || defined(__darwin__) || defined(__macos__)
// typedef of struct timeval and gettimeofday();
+#if defined(HAVE_SYS_TIME_H)
#include <sys/time.h>
+#endif
+
+#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#endif

19
bsp/buildroot/package/omniorb/0001-uclinux-is-also-linux.patch
View File

@@ -1,19 +0,0 @@
uclinux is also linux
Patch status: sent upstream
(http://www.omniorb-support.com/pipermail/omniorb-list/2014-November/031628.html)
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
diff -Nuar omniORB-4.1.6-orig/configure.ac omniORB-4.1.6/configure.ac
--- omniORB-4.1.6-orig/configure.ac 2011-06-25 00:37:28.000000000 +0300
+++ omniORB-4.1.6/configure.ac 2014-11-20 07:05:25.072634260 +0200
@@ -183,6 +183,7 @@
case "$host" in
*-*-linux-*) plat_name="Linux"; plat_def="__linux__"; os_v="2";;
+ *-*-uclinux-*) plat_name="Linux"; plat_def="__linux__"; os_v="2";;
*-*-cygwin*) plat_name="Cygwin"; plat_def="__cygwin__"; os_v="1";;
*-*-solaris*) plat_name="SunOS"; plat_def="__sunos__"; os_v="5";;
*-*-osf3*) plat_name="OSF1"; plat_def="__osf1__"; os_v="3";;

6
bsp/buildroot/package/omniorb/omniorb.hash
View File

@@ -1,3 +1,3 @@
# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.0/
sha1 cc52c636f4f329e0481d6bb97b1f0a4bfb21fb3d omniORB-4.2.0.tar.bz2
md5 f1e104d0a2df92829c1b37a853f4805d omniORB-4.2.0.tar.bz2
# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.1/
sha1 cf0f3ca7caab901c9485ca8afd85087c080c9684 omniORB-4.2.1.tar.bz2
md5 dbe349d2bd929d349083b303bb4317e5 omniORB-4.2.1.tar.bz2

5
bsp/buildroot/package/omniorb/omniorb.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
OMNIORB_VERSION = 4.2.0
OMNIORB_VERSION = 4.2.1
OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION)
OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2
OMNIORB_INSTALL_STAGING = YES
@@ -13,9 +13,6 @@ OMNIORB_LICENSE_FILES = COPYING COPYING.LIB
OMNIORB_DEPENDENCIES = host-omniorb
HOST_OMNIORB_DEPENDENCIES = host-python
# 0001-uclinux-is-also-linux.patch touches configure.ac
OMNIORB_AUTORECONF = YES
# omniorb is not python3 friendly, so force the python interpreter
OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2