summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-04 18:23:41 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-09 12:33:16 +0000
commit6d3262e3a863823502a9afc4556e5c6546005279 (patch)
tree7601c9b586c33ae314d4e214330c53264b208b5c /meta
parent31eb2baed27fa83073c8718f40a6af7070097c37 (diff)
downloadpoky-6d3262e3a863823502a9afc4556e5c6546005279.tar.gz
boost: update to 1.65.1
Add a patch to fix bjam-native compile error (due to mistyped variable name). Drop upstreamed patch. (From OE-Core rev: ba2d391d8268203895ab2f792f92b7fd92deeb45) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/boost/bjam-native_1.65.1.bb (renamed from meta/recipes-support/boost/bjam-native_1.64.0.bb)3
-rw-r--r--meta/recipes-support/boost/boost-1.65.1.inc (renamed from meta/recipes-support/boost/boost-1.64.0.inc)4
-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.65.1.bb (renamed from meta/recipes-support/boost/boost_1.64.0.bb)1
-rw-r--r--meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch37
5 files changed, 41 insertions, 53 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.64.0.bb b/meta/recipes-support/boost/bjam-native_1.65.1.bb
index 46013f343b..92c86a3ef5 100644
--- a/meta/recipes-support/boost/bjam-native_1.64.0.bb
+++ b/meta/recipes-support/boost/bjam-native_1.65.1.bb
@@ -5,7 +5,8 @@ SECTION = "devel"
5 5
6inherit native 6inherit native
7 7
8SRC_URI += "file://bjam-native-build-bjam.debug.patch" 8SRC_URI += "file://bjam-native-build-bjam.debug.patch \
9 file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch"
9 10
10do_compile() { 11do_compile() {
11 ./bootstrap.sh --with-toolset=gcc 12 ./bootstrap.sh --with-toolset=gcc
diff --git a/meta/recipes-support/boost/boost-1.64.0.inc b/meta/recipes-support/boost/boost-1.65.1.inc
index dc7b1a9c01..f0ca88ca3e 100644
--- a/meta/recipes-support/boost/boost-1.64.0.inc
+++ b/meta/recipes-support/boost/boost-1.65.1.inc
@@ -12,8 +12,8 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
12BOOST_P = "boost_${BOOST_VER}" 12BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" 14SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2"
15SRC_URI[md5sum] = "93eecce2abed9d2442c9676914709349" 15SRC_URI[md5sum] = "41d7542ce40e171f3f7982aff008ff0d"
16SRC_URI[sha256sum] = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332" 16SRC_URI[sha256sum] = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"
17 17
18UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" 18UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
19UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" 19UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/"
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
deleted file mode 100644
index 8a85aac18f..0000000000
--- a/meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch
+++ /dev/null
@@ -1,49 +0,0 @@
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.64.0.bb b/meta/recipes-support/boost/boost_1.65.1.bb
index d1c20e1d06..9ba56703a5 100644
--- a/meta/recipes-support/boost/boost_1.64.0.bb
+++ b/meta/recipes-support/boost/boost_1.65.1.bb
@@ -4,7 +4,6 @@ require boost.inc
4SRC_URI += "\ 4SRC_URI += "\
5 file://arm-intrinsics.patch \ 5 file://arm-intrinsics.patch \
6 file://boost-CVE-2012-2677.patch \ 6 file://boost-CVE-2012-2677.patch \
7 file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \
8 file://boost-math-disable-pch-for-gcc.patch \ 7 file://boost-math-disable-pch-for-gcc.patch \
9 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ 8 file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \
10 file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ 9 file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \
diff --git a/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch b/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
new file mode 100644
index 0000000000..a75133d2bc
--- /dev/null
+++ b/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch
@@ -0,0 +1,37 @@
1From 5685527364198597f25fc1c6236cb64cbc3de44f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 4 Oct 2017 18:16:08 +0300
4Subject: [PATCH] Fix a strange assert typo; how was this released without
5 noticing?
6
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 tools/build/src/engine/debugger.c | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/tools/build/src/engine/debugger.c b/tools/build/src/engine/debugger.c
14index 802f262..152a7e6 100644
15--- a/tools/build/src/engine/debugger.c
16+++ b/tools/build/src/engine/debugger.c
17@@ -1092,7 +1092,7 @@ static void debug_start_child( int argc, const char * * argv )
18 PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 };
19 STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
20 0, 0, 0, 0, 0, 0 };
21- assert( DEBUG_STATE == DEBUG_NO_CHILD );
22+ assert( debug_state == DEBUG_NO_CHILD );
23 if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) )
24 {
25 printf("internal error\n");
26@@ -1176,7 +1176,7 @@ static void debug_start_child( int argc, const char * * argv )
27 int read_fd;
28 int pid;
29 int i;
30- assert( DEBUG_STATE == DEBUG_NO_CHILD );
31+ assert( debug_state == DEBUG_NO_CHILD );
32 pipe(pipe1);
33 pipe(pipe2);
34 pid = fork();
35--
362.14.1
37