diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-05-23 02:23:08 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-24 23:56:03 +0100 |
commit | a28c4978ebfd4b2928ee8beeeabdc9fa631cb619 (patch) | |
tree | 7bc5f8befd3746b66a4a5284b760fb2dcfd458ae | |
parent | 945cf5f02a6bba194c658e66ad5699569415db99 (diff) | |
download | poky-a28c4978ebfd4b2928ee8beeeabdc9fa631cb619.tar.gz |
boost: upgrade 1.72.0 -> 1.73.0
refresh 0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
remove 0001-revert-cease-dependence-on-range.patch
since it is included in 1.73.0
(From OE-Core rev: 1728ecf71f96570913202a54fd0012ac8b01b8ae)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/boost/bjam-native_1.73.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.72.0.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost-1.73.0.inc (renamed from meta/recipes-support/boost/boost-1.72.0.inc) | 4 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | 15 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.73.0.bb (renamed from meta/recipes-support/boost/boost_1.72.0.bb) | 1 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch | 53 |
5 files changed, 12 insertions, 61 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.72.0.bb b/meta/recipes-support/boost/bjam-native_1.73.0.bb index d843eb038c..d843eb038c 100644 --- a/meta/recipes-support/boost/bjam-native_1.72.0.bb +++ b/meta/recipes-support/boost/bjam-native_1.73.0.bb | |||
diff --git a/meta/recipes-support/boost/boost-1.72.0.inc b/meta/recipes-support/boost/boost-1.73.0.inc index 55a095bf1c..b574757199 100644 --- a/meta/recipes-support/boost/boost-1.72.0.inc +++ b/meta/recipes-support/boost/boost-1.73.0.inc | |||
@@ -12,8 +12,8 @@ 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://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" |
15 | SRC_URI[md5sum] = "cb40943d2a2cb8ce08d42bc48b0f84f0" | 15 | SRC_URI[md5sum] = "9273c8c4576423562bbe84574b07b2bd" |
16 | SRC_URI[sha256sum] = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722" | 16 | SRC_URI[sha256sum] = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402" |
17 | 17 | ||
18 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" | 18 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" |
19 | UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" | 19 | UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" |
diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 68d6e6417f..7c6b62e383 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | |||
@@ -1,21 +1,22 @@ | |||
1 | From f4d3fad43d67808d71325ba0df1457555b9a0086 Mon Sep 17 00:00:00 2001 | 1 | From f4d3fad43d67808d71325ba0df1457555b9a0086 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 | 3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 |
4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves | 4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that |
5 | ourselves | ||
5 | 6 | ||
6 | Upstream-Status: Inappropriate | 7 | Upstream-Status: Inappropriate |
7 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 8 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
9 | 10 | ||
10 | --- | 11 | --- |
11 | tools/build/src/tools/gcc.jam | 132 ---------------------------------- | 12 | tools/build/src/tools/gcc.jam | 133 ---------------------------------- |
12 | 1 file changed, 132 deletions(-) | 13 | 1 file changed, 133 deletions(-) |
13 | 14 | ||
14 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam | 15 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
15 | index b9bb9cf2a..c7e3cf3fe 100644 | 16 | index 8910a55f2..ed7e7b20c 100644 |
16 | --- a/tools/build/src/tools/gcc.jam | 17 | --- a/tools/build/src/tools/gcc.jam |
17 | +++ b/tools/build/src/tools/gcc.jam | 18 | +++ b/tools/build/src/tools/gcc.jam |
18 | @@ -1180,135 +1180,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : | 19 | @@ -1195,136 +1195,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : |
19 | <architecture>$(architecture)/<instruction-set>$(instruction-set) | 20 | <architecture>$(architecture)/<instruction-set>$(instruction-set) |
20 | : $(values) ; | 21 | : $(values) ; |
21 | } | 22 | } |
@@ -149,5 +150,9 @@ index b9bb9cf2a..c7e3cf3fe 100644 | |||
149 | -cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; | 150 | -cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; |
150 | -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; | 151 | -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; |
151 | -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; | 152 | -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; |
153 | -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; | ||
152 | -# AIX variant of RS/6000 & PowerPC | 154 | -# AIX variant of RS/6000 & PowerPC |
153 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; | 155 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; |
156 | -- | ||
157 | 2.17.1 | ||
158 | |||
diff --git a/meta/recipes-support/boost/boost_1.72.0.bb b/meta/recipes-support/boost/boost_1.73.0.bb index 0b7badbc76..5e9e0d87d7 100644 --- a/meta/recipes-support/boost/boost_1.72.0.bb +++ b/meta/recipes-support/boost/boost_1.73.0.bb | |||
@@ -7,5 +7,4 @@ SRC_URI += "file://arm-intrinsics.patch \ | |||
7 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ | 7 | file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ |
8 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 8 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
9 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | 9 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ |
10 | file://0001-revert-cease-dependence-on-range.patch \ | ||
11 | " | 10 | " |
diff --git a/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch b/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch deleted file mode 100644 index d6d09a23a5..0000000000 --- a/meta/recipes-support/boost/files/0001-revert-cease-dependence-on-range.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 | ||
2 | From: Oliver Kowalke <oliver.kowalke@gmail.com> | ||
3 | Date: Sun, 1 Dec 2019 20:40:28 +0100 | ||
4 | Subject: [PATCH] Revert "Cease dependence on Range" | ||
5 | |||
6 | This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. | ||
7 | |||
8 | see #44 (One test fails to compile after boostorg/coroutine submodule updated) | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/boostorg/coroutine/commit/9c73b2f7c1759a9508ba8780b38dc15f07f1a447] | ||
11 | |||
12 | Signed-off-by: Andrew Geissler <geissonator@gmail.com> | ||
13 | --- | ||
14 | boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- | ||
15 | 1 file changed, 3 insertions(+), 9 deletions(-) | ||
16 | |||
17 | diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp | ||
18 | index ea96981..640896f 100644 | ||
19 | --- a/boost/coroutine/asymmetric_coroutine.hpp | ||
20 | +++ b/boost/coroutine/asymmetric_coroutine.hpp | ||
21 | @@ -14,6 +14,7 @@ | ||
22 | #include <boost/assert.hpp> | ||
23 | #include <boost/config.hpp> | ||
24 | #include <boost/move/move.hpp> | ||
25 | +#include <boost/range.hpp> | ||
26 | #include <boost/throw_exception.hpp> | ||
27 | #include <boost/utility/explicit_operator_bool.hpp> | ||
28 | |||
29 | @@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) | ||
30 | |||
31 | } | ||
32 | |||
33 | -// forward declaration of Boost.Range traits to break dependency on it | ||
34 | -template<typename C, typename Enabler> | ||
35 | -struct range_mutable_iterator; | ||
36 | - | ||
37 | -template<typename C, typename Enabler> | ||
38 | -struct range_const_iterator; | ||
39 | - | ||
40 | template< typename Arg > | ||
41 | -struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > | ||
42 | +struct range_mutable_iterator< coroutines::push_coroutine< Arg > > | ||
43 | { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; | ||
44 | |||
45 | template< typename R > | ||
46 | -struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > | ||
47 | +struct range_mutable_iterator< coroutines::pull_coroutine< R > > | ||
48 | { typedef typename coroutines::pull_coroutine< R >::iterator type; }; | ||
49 | |||
50 | } | ||
51 | -- | ||
52 | 2.24.1 | ||
53 | |||