diff options
author | wangmy <wangmy@fujitsu.com> | 2022-04-18 20:10:52 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-19 14:14:12 +0100 |
commit | 79d8fb1da2d10e5392ca0911d083e7f981d6181d (patch) | |
tree | c2311c497b11646855a5e9d6829976dcb1ff79a1 /meta/recipes-support/boost | |
parent | 72bb57ed0ba0b2c0e6ebf4b14289fdef8e4d05c2 (diff) | |
download | poky-79d8fb1da2d10e5392ca0911d083e7f981d6181d.tar.gz |
boost: upgrade 1.78.0 -> 1.79.0
0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch
de657e01635306085488290ea83de541ec393f8b.patch
removed since they're included in 1.79.0
Changelog:
https://www.boost.org/users/history/version_1_79_0.html
(From OE-Core rev: 091d73e893081bf15afa19a71203e941ac46b306)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r-- | meta/recipes-support/boost/boost-1.79.0.inc (renamed from meta/recipes-support/boost/boost-1.78.0.inc) | 2 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch | 36 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch | 30 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.79.0.bb (renamed from meta/recipes-support/boost/boost_1.78.0.bb) | 2 |
4 files changed, 1 insertions, 69 deletions
diff --git a/meta/recipes-support/boost/boost-1.78.0.inc b/meta/recipes-support/boost/boost-1.79.0.inc index 729a47b54f..f90c463931 100644 --- a/meta/recipes-support/boost/boost-1.78.0.inc +++ b/meta/recipes-support/boost/boost-1.79.0.inc | |||
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" | |||
12 | BOOST_P = "boost_${BOOST_VER}" | 12 | BOOST_P = "boost_${BOOST_VER}" |
13 | 13 | ||
14 | SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" |
15 | SRC_URI[sha256sum] = "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc" | 15 | SRC_URI[sha256sum] = "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" | 17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" |
18 | UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" | 18 | UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" |
diff --git a/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch b/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch deleted file mode 100644 index 20dc3ca54e..0000000000 --- a/meta/recipes-support/boost/boost/0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From b15d8d0754bb545ba10d0cfba8bbfdfb22a62c38 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 20 Feb 2022 22:03:14 -0800 | ||
4 | Subject: [PATCH] futex: fix build on 32-bit architectures using 64-bit time_t | ||
5 | |||
6 | Fix the following build failure on 32-bit architectures using 64-bit | ||
7 | time_t (e.g. riscv32): | ||
8 | | ./boost/fiber/detail/futex.hpp:31:23: error: use of undeclared identifier 'SYS_futex' | ||
9 | | return ::syscall( SYS_futex, addr, op, x, nullptr, nullptr, 0); | ||
10 | | ^ | ||
11 | | 1 error generated. | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/boostorg/fiber/pull/292] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | boost/fiber/detail/futex.hpp | 4 ++++ | ||
17 | 1 file changed, 4 insertions(+) | ||
18 | |||
19 | diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp | ||
20 | index e64bd5990..d0353e9e5 100644 | ||
21 | --- a/boost/fiber/detail/futex.hpp | ||
22 | +++ b/boost/fiber/detail/futex.hpp | ||
23 | @@ -12,6 +12,10 @@ | ||
24 | |||
25 | #include <boost/fiber/detail/config.hpp> | ||
26 | |||
27 | +#ifndef SYS_futex | ||
28 | +#define SYS_futex SYS_futex_time64 | ||
29 | +#endif | ||
30 | + | ||
31 | #if BOOST_OS_LINUX | ||
32 | extern "C" { | ||
33 | #include <linux/futex.h> | ||
34 | -- | ||
35 | 2.35.1 | ||
36 | |||
diff --git a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch b/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch deleted file mode 100644 index 867ec03ba6..0000000000 --- a/meta/recipes-support/boost/boost/de657e01635306085488290ea83de541ec393f8b.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Leonardo Neumann <leonardo@neumann.dev.br> | ||
3 | Date: Mon, 13 Dec 2021 01:07:20 -0300 | ||
4 | Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems | ||
5 | |||
6 | Boost 1.78.0 fails to build on musl-based systems because musl does | ||
7 | not include sys/stat.h by default. | ||
8 | |||
9 | Fixes #161 ("Boost compiler error") | ||
10 | Upstream-Status: Submitted [https://github.com/boostorg/interprocess/pull/162] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | include/boost/interprocess/permissions.hpp | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp | ||
17 | index ab55411e..0b21a685 100644 | ||
18 | --- a/boost/interprocess/permissions.hpp | ||
19 | +++ b/boost/interprocess/permissions.hpp | ||
20 | @@ -29,6 +29,10 @@ | ||
21 | |||
22 | #include <boost/interprocess/detail/win32_api.hpp> | ||
23 | |||
24 | +#else | ||
25 | + | ||
26 | +#include <sys/stat.h> | ||
27 | + | ||
28 | #endif | ||
29 | |||
30 | #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED | ||
diff --git a/meta/recipes-support/boost/boost_1.78.0.bb b/meta/recipes-support/boost/boost_1.79.0.bb index 58be9dcf12..dd5d6eadd6 100644 --- a/meta/recipes-support/boost/boost_1.78.0.bb +++ b/meta/recipes-support/boost/boost_1.79.0.bb | |||
@@ -5,6 +5,4 @@ SRC_URI += "file://boost-CVE-2012-2677.patch \ | |||
5 | file://boost-math-disable-pch-for-gcc.patch \ | 5 | file://boost-math-disable-pch-for-gcc.patch \ |
6 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 6 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
7 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | 7 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ |
8 | file://de657e01635306085488290ea83de541ec393f8b.patch \ | ||
9 | file://0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch \ | ||
10 | " | 8 | " |