diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-08-23 22:20:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-25 16:00:10 +0100 |
commit | 239efa02ed148f44bed2386457844ceec2f847f2 (patch) | |
tree | 7264404ee0054e1a605303da43837b0324c7d06f /meta/recipes-support | |
parent | c66351edd17a4ae3efe3476781f1ddef9c39575d (diff) | |
download | poky-239efa02ed148f44bed2386457844ceec2f847f2.tar.gz |
boost: update 1.73.0 -> 1.74.0
(From OE-Core rev: 26e25ed710abd100c1963b60981c31ffc7a9de1e)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/boost/bjam-native_1.74.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.73.0.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost-1.74.0.inc (renamed from meta/recipes-support/boost/boost-1.73.0.inc) | 3 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | 22 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch | 30 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.74.0.bb (renamed from meta/recipes-support/boost/boost_1.73.0.bb) | 1 |
5 files changed, 14 insertions, 42 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.73.0.bb b/meta/recipes-support/boost/bjam-native_1.74.0.bb index d843eb038c..d843eb038c 100644 --- a/meta/recipes-support/boost/bjam-native_1.73.0.bb +++ b/meta/recipes-support/boost/bjam-native_1.74.0.bb | |||
diff --git a/meta/recipes-support/boost/boost-1.73.0.inc b/meta/recipes-support/boost/boost-1.74.0.inc index b574757199..b47fdaf099 100644 --- a/meta/recipes-support/boost/boost-1.73.0.inc +++ b/meta/recipes-support/boost/boost-1.74.0.inc | |||
@@ -12,8 +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://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] = "9273c8c4576423562bbe84574b07b2bd" | 15 | SRC_URI[sha256sum] = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1" |
16 | SRC_URI[sha256sum] = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402" | ||
17 | 16 | ||
18 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" | 17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" |
19 | UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" | 18 | 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 7c6b62e383..91ab53efd9 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,7 +1,8 @@ | |||
1 | From f4d3fad43d67808d71325ba0df1457555b9a0086 Mon Sep 17 00:00:00 2001 | 1 | From 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 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 | 4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that |
5 | |||
5 | ourselves | 6 | ourselves |
6 | 7 | ||
7 | Upstream-Status: Inappropriate | 8 | Upstream-Status: Inappropriate |
@@ -9,14 +10,14 @@ Signed-off-by: Christopher Larson <chris_larson@mentor.com> | |||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | 11 | ||
11 | --- | 12 | --- |
12 | tools/build/src/tools/gcc.jam | 133 ---------------------------------- | 13 | tools/build/src/tools/gcc.jam | 139 ---------------------------------- |
13 | 1 file changed, 133 deletions(-) | 14 | 1 file changed, 139 deletions(-) |
14 | 15 | ||
15 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam | 16 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
16 | index 8910a55f2..ed7e7b20c 100644 | 17 | index ff3209f7b..70cbc39a5 100644 |
17 | --- a/tools/build/src/tools/gcc.jam | 18 | --- a/tools/build/src/tools/gcc.jam |
18 | +++ b/tools/build/src/tools/gcc.jam | 19 | +++ b/tools/build/src/tools/gcc.jam |
19 | @@ -1195,136 +1195,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : | 20 | @@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : |
20 | <architecture>$(architecture)/<instruction-set>$(instruction-set) | 21 | <architecture>$(architecture)/<instruction-set>$(instruction-set) |
21 | : $(values) ; | 22 | : $(values) ; |
22 | } | 23 | } |
@@ -66,7 +67,11 @@ index 8910a55f2..ed7e7b20c 100644 | |||
66 | -cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; | 67 | -cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; |
67 | -cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; | 68 | -cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; |
68 | -cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; | 69 | -cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; |
69 | -cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ; | 70 | -cpu-flags gcc OPTIONS : x86 : icelake-client : -march=icelake-client ; |
71 | -cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ; | ||
72 | -cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ; | ||
73 | -cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ; | ||
74 | -cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ; | ||
70 | -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; | 75 | -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; |
71 | -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; | 76 | -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; |
72 | -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; | 77 | -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; |
@@ -92,10 +97,12 @@ index 8910a55f2..ed7e7b20c 100644 | |||
92 | -cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; | 97 | -cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; |
93 | -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; | 98 | -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; |
94 | -cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; | 99 | -cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; |
100 | -cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ; | ||
95 | -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; | 101 | -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; |
96 | -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; | 102 | -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; |
97 | -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; | 103 | -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; |
98 | -cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; | 104 | -cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; |
105 | -cpu-flags gcc OPTIONS : x86 : c7 : -march=c7 ; | ||
99 | -## | 106 | -## |
100 | -cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; | 107 | -cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; |
101 | -# Sparc | 108 | -# Sparc |
@@ -153,6 +160,3 @@ index 8910a55f2..ed7e7b20c 100644 | |||
153 | -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; | 160 | -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; |
154 | -# AIX variant of RS/6000 & PowerPC | 161 | -# AIX variant of RS/6000 & PowerPC |
155 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; | 162 | -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/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch b/meta/recipes-support/boost/boost/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch deleted file mode 100644 index 1edad329ca..0000000000 --- a/meta/recipes-support/boost/boost/0001-Make-index-detail-rtree-visitors-insert-base-class-p.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From aafbceccc76dccb75963dd4f596fd1f10ee34b03 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Wakely <boost@kayari.org> | ||
3 | Date: Fri, 5 Jun 2020 19:29:27 +0100 | ||
4 | Subject: [PATCH] Make index::detail::rtree::visitors::insert base class public | ||
5 | |||
6 | Fixes #721 | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/boostorg/geometry/commit/aafbceccc76dccb75963dd4f596fd1f10ee34b03] | ||
9 | |||
10 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
11 | --- | ||
12 | boost/geometry/index/detail/rtree/visitors/insert.hpp | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/boost/geometry/index/detail/rtree/visitors/insert.hpp b/boost/geometry/index/detail/rtree/visitors/insert.hpp | ||
16 | index 2d324cb7f..5709a930c 100644 | ||
17 | --- a/boost/geometry/index/detail/rtree/visitors/insert.hpp | ||
18 | +++ b/boost/geometry/index/detail/rtree/visitors/insert.hpp | ||
19 | @@ -265,7 +265,7 @@ struct insert_traverse_data | ||
20 | // Default insert visitor | ||
21 | template <typename Element, typename MembersHolder> | ||
22 | class insert | ||
23 | - : MembersHolder::visitor | ||
24 | + : public MembersHolder::visitor | ||
25 | { | ||
26 | protected: | ||
27 | typedef typename MembersHolder::box_type box_type; | ||
28 | -- | ||
29 | 2.26.2 | ||
30 | |||
diff --git a/meta/recipes-support/boost/boost_1.73.0.bb b/meta/recipes-support/boost/boost_1.74.0.bb index 995c14e8cc..5e9e0d87d7 100644 --- a/meta/recipes-support/boost/boost_1.73.0.bb +++ b/meta/recipes-support/boost/boost_1.74.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-Make-index-detail-rtree-visitors-insert-base-class-p.patch \ | ||
11 | " | 10 | " |