summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2016-09-03 01:12:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-05 11:56:01 +0100
commit02d82eacc793cff197142fa0ffb265a09e7a9bc3 (patch)
tree6d6f9ce868455ad2be34f42fb66de23909c4d34c /meta
parentd7268e9bbae93455a591bb4f73bfe4bf76497a1b (diff)
downloadpoky-02d82eacc793cff197142fa0ffb265a09e7a9bc3.tar.gz
boost: fix a musl compilation warning
Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419 (From OE-Core rev: 03b553e1b2b11ddd7d72a3bb0180d18f36da53b5) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch49
-rw-r--r--meta/recipes-support/boost/boost_1.61.0.bb1
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch b/meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch
new file mode 100644
index 0000000000..8a85aac18f
--- /dev/null
+++ b/meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch
@@ -0,0 +1,49 @@
1From 40192301130dcd913aa6d9cb9dba9e5f8dbd9d16 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
3Date: Wed, 24 Aug 2016 21:01:43 +0100
4Subject: [PATCH 1/4] use POSIX poll.h instead of sys/poll.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9POSIX specifies that <poll.h> is the correct header to
10include for poll()
11 http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
12whereas <sys/poll.h> is only needed for ancient glibc (<2.3),
13so let's follow POSIX instead.
14
15As a side-effect, this silences a warning when compiling
16against the musl C-library:
17
18In file included from ./boost/asio/detail/socket_types.hpp:61:0,
19 from ./boost/asio/ip/address_v4.hpp:21,
20 from ./boost/asio/ip/address.hpp:21,
21 from libs/log/src/init_from_settings.cpp:65:
22<sysroot>/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
23 #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
24 ^~~~~~~
25
26etc.
27
28Signed-off-by: André Draszik <adraszik@tycoint.com>
29---
30Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419
31 boost/asio/detail/socket_types.hpp | 2 +-
32 1 file changed, 1 insertion(+), 1 deletion(-)
33
34diff --git a/boost/asio/detail/socket_types.hpp b/boost/asio/detail/socket_types.hpp
35index e8c7109..7e65d3c 100644
36--- a/boost/asio/detail/socket_types.hpp
37+++ b/boost/asio/detail/socket_types.hpp
38@@ -58,7 +58,7 @@
39 #else
40 # include <sys/ioctl.h>
41 # if !defined(__SYMBIAN32__)
42-# include <sys/poll.h>
43+# include <poll.h>
44 # endif
45 # include <sys/types.h>
46 # include <sys/stat.h>
47--
482.9.3
49
diff --git a/meta/recipes-support/boost/boost_1.61.0.bb b/meta/recipes-support/boost/boost_1.61.0.bb
index 1116444ceb..41ff203272 100644
--- a/meta/recipes-support/boost/boost_1.61.0.bb
+++ b/meta/recipes-support/boost/boost_1.61.0.bb
@@ -5,4 +5,5 @@ SRC_URI += "\
5 file://arm-intrinsics.patch \ 5 file://arm-intrinsics.patch \
6 file://consider-hardfp.patch \ 6 file://consider-hardfp.patch \
7 file://boost-CVE-2012-2677.patch \ 7 file://boost-CVE-2012-2677.patch \
8 file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \
8" 9"