From ba2d391d8268203895ab2f792f92b7fd92deeb45 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Oct 2017 18:23:41 +0300 Subject: [PATCH] boost: update to 1.65.1 Add a patch to fix bjam-native compile error (due to mistyped variable name). Drop upstreamed patch. Signed-off-by: Alexander Kanavin --- ...native_1.64.0.bb => bjam-native_1.65.1.bb} | 3 +- .../{boost-1.64.0.inc => boost-1.65.1.inc} | 4 +- ...l-socket_types.hpp-fix-poll.h-includ.patch | 49 ------------------- .../{boost_1.64.0.bb => boost_1.65.1.bb} | 1 - ...sert-typo-how-was-this-released-with.patch | 37 ++++++++++++++ 5 files changed, 41 insertions(+), 53 deletions(-) rename meta/recipes-support/boost/{bjam-native_1.64.0.bb => bjam-native_1.65.1.bb} (68%) rename meta/recipes-support/boost/{boost-1.64.0.inc => boost-1.65.1.inc} (85%) delete mode 100644 meta/recipes-support/boost/boost/0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch rename meta/recipes-support/boost/{boost_1.64.0.bb => boost_1.65.1.bb} (85%) create mode 100644 meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch diff --git a/meta/recipes-support/boost/bjam-native_1.64.0.bb b/meta/recipes-support/boost/bjam-native_1.65.1.bb similarity index 68% rename from meta/recipes-support/boost/bjam-native_1.64.0.bb rename to 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" inherit native -SRC_URI += "file://bjam-native-build-bjam.debug.patch" +SRC_URI += "file://bjam-native-build-bjam.debug.patch \ + file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch" do_compile() { ./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 similarity index 85% rename from meta/recipes-support/boost/boost-1.64.0.inc rename to 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])}" BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "93eecce2abed9d2442c9676914709349" -SRC_URI[sha256sum] = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332" +SRC_URI[md5sum] = "41d7542ce40e171f3f7982aff008ff0d" +SRC_URI[sha256sum] = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P.*)/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 @@ -From 40192301130dcd913aa6d9cb9dba9e5f8dbd9d16 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= -Date: Wed, 24 Aug 2016 21:01:43 +0100 -Subject: [PATCH 1/4] use POSIX poll.h instead of sys/poll.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -POSIX specifies that is the correct header to -include for poll() - http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html -whereas is only needed for ancient glibc (<2.3), -so let's follow POSIX instead. - -As a side-effect, this silences a warning when compiling -against the musl C-library: - -In file included from ./boost/asio/detail/socket_types.hpp:61:0, - from ./boost/asio/ip/address_v4.hpp:21, - from ./boost/asio/ip/address.hpp:21, - from libs/log/src/init_from_settings.cpp:65: -/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include to [-Wcpp] - #warning redirecting incorrect #include to - ^~~~~~~ - -etc. - -Signed-off-by: André Draszik ---- -Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419 - boost/asio/detail/socket_types.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/boost/asio/detail/socket_types.hpp b/boost/asio/detail/socket_types.hpp -index e8c7109..7e65d3c 100644 ---- a/boost/asio/detail/socket_types.hpp -+++ b/boost/asio/detail/socket_types.hpp -@@ -58,7 +58,7 @@ - #else - # include - # if !defined(__SYMBIAN32__) --# include -+# include - # endif - # include - # include --- -2.9.3 - diff --git a/meta/recipes-support/boost/boost_1.64.0.bb b/meta/recipes-support/boost/boost_1.65.1.bb similarity index 85% rename from meta/recipes-support/boost/boost_1.64.0.bb rename to 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 SRC_URI += "\ file://arm-intrinsics.patch \ file://boost-CVE-2012-2677.patch \ - file://0001-boost-asio-detail-socket_types.hpp-fix-poll.h-includ.patch \ file://boost-math-disable-pch-for-gcc.patch \ file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ 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 @@ +From 5685527364198597f25fc1c6236cb64cbc3de44f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 4 Oct 2017 18:16:08 +0300 +Subject: [PATCH] Fix a strange assert typo; how was this released without + noticing? + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + tools/build/src/engine/debugger.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/build/src/engine/debugger.c b/tools/build/src/engine/debugger.c +index 802f262..152a7e6 100644 +--- a/tools/build/src/engine/debugger.c ++++ b/tools/build/src/engine/debugger.c +@@ -1092,7 +1092,7 @@ static void debug_start_child( int argc, const char * * argv ) + PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 }; + STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }; +- assert( DEBUG_STATE == DEBUG_NO_CHILD ); ++ assert( debug_state == DEBUG_NO_CHILD ); + if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) ) + { + printf("internal error\n"); +@@ -1176,7 +1176,7 @@ static void debug_start_child( int argc, const char * * argv ) + int read_fd; + int pid; + int i; +- assert( DEBUG_STATE == DEBUG_NO_CHILD ); ++ assert( debug_state == DEBUG_NO_CHILD ); + pipe(pipe1); + pipe(pipe2); + pid = fork(); +-- +2.14.1 + -- 2.40.1