summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/boost/bjam-native_1.66.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.65.1.bb)0
-rw-r--r--meta/recipes-support/boost/boost-1.66.0.inc (renamed from meta/recipes-support/boost/boost-1.65.1.inc)4
-rw-r--r--meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch28
-rw-r--r--meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch138
-rw-r--r--meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch22
-rw-r--r--meta/recipes-support/boost/boost_1.66.0.bb (renamed from meta/recipes-support/boost/boost_1.65.1.bb)1
6 files changed, 70 insertions, 123 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.65.1.bb b/meta/recipes-support/boost/bjam-native_1.66.0.bb
index 92c86a3ef5..92c86a3ef5 100644
--- a/meta/recipes-support/boost/bjam-native_1.65.1.bb
+++ b/meta/recipes-support/boost/bjam-native_1.66.0.bb
diff --git a/meta/recipes-support/boost/boost-1.65.1.inc b/meta/recipes-support/boost/boost-1.66.0.inc
index f0ca88ca3e..fe2b8639f7 100644
--- a/meta/recipes-support/boost/boost-1.65.1.inc
+++ b/meta/recipes-support/boost/boost-1.66.0.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] = "41d7542ce40e171f3f7982aff008ff0d" 15SRC_URI[md5sum] = "b2dfbd6c717be4a7bb2d88018eaccf75"
16SRC_URI[sha256sum] = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81" 16SRC_URI[sha256sum] = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"
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-correct-error-which-appeared-when-compiling-non-c-co.patch b/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch
deleted file mode 100644
index f96005ebc7..0000000000
--- a/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 02fa5cee1b8d0321787113e2dc10b162c657f333 Mon Sep 17 00:00:00 2001
2From: Robert Ramey <ramey@rrsd.com>
3Date: Wed, 1 Feb 2017 16:43:59 -0800
4Subject: [PATCH] correct error which appeared when compiling non c++ compliant
5 code for arrays
6
7Upstream-Status: Backport [expected to be released in v1.65]
8
9---
10 boost/serialization/array.hpp | 2 ++
11 1 file changed, 2 insertions(+)
12
13diff --git a/boost/serialization/array.hpp b/boost/serialization/array.hpp
14index 61708b3..612d1a6 100644
15--- a/boost/serialization/array.hpp
16+++ b/boost/serialization/array.hpp
17@@ -23,6 +23,8 @@ namespace std{
18 } // namespace std
19 #endif
20
21+#include <boost/serialization/array_wrapper.hpp>
22+
23 #ifndef BOOST_NO_CXX11_HDR_ARRAY
24
25 #include <array>
26--
272.9.3
28
diff --git a/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
index e9c7e4c555..26f3cbb051 100644
--- a/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
+++ b/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch
@@ -1,97 +1,65 @@
1From c0e785f8da2caa6617052b1c7b347e0dffb1520d Mon Sep 17 00:00:00 2001 1From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com> 2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 10:29:17 -0700 3Date: Tue, 13 Dec 2016 10:29:17 -0700
4Subject: [PATCH 2/3] Don't set up -m32/-m64, we do that ourselves 4Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7Signed-off-by: Christopher Larson <chris_larson@mentor.com> 7Signed-off-by: Christopher Larson <chris_larson@mentor.com>
8
8--- 9---
9 tools/build/src/tools/gcc.jam | 10 ---------- 10 tools/build/src/tools/gcc.jam | 39 ---------------------------------------
10 1 file changed, 10 deletions(-) 11 1 file changed, 39 deletions(-)
11 12
12diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam 13diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
13index 0f346a5..942f141 100644 14index e4fc6c32..37914fd0 100644
14--- a/tools/build/src/tools/gcc.jam 15--- a/tools/build/src/tools/gcc.jam
15+++ b/tools/build/src/tools/gcc.jam 16+++ b/tools/build/src/tools/gcc.jam
16@@ -509,7 +509,6 @@ rule compile.c++.pch ( targets * : sources * : properties * ) 17@@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * )
17 { 18 {
18 setup-threading $(targets) : $(sources) : $(properties) ; 19 local option ;
19 setup-fpic $(targets) : $(sources) : $(properties) ; 20 local target-os = [ feature.get-values target-os : $(properties) ] ;
20- setup-address-model $(targets) : $(sources) : $(properties) ; 21- if $(target-os) = aix
21 } 22- {
22 23- if $(model) = 32
23 actions compile.c++.pch 24- {
24@@ -521,7 +520,6 @@ rule compile.c.pch ( targets * : sources * : properties * ) 25- option = -maix32 ;
25 { 26- }
26 setup-threading $(targets) : $(sources) : $(properties) ; 27- else
27 setup-fpic $(targets) : $(sources) : $(properties) ; 28- {
28- setup-address-model $(targets) : $(sources) : $(properties) ; 29- option = -maix64 ;
29 } 30- }
30 31- }
31 actions compile.c.pch 32- else if $(target-os) = hpux
32@@ -533,7 +531,6 @@ rule compile.c++.preprocess ( targets * : sources * : properties * ) 33- {
33 { 34- if $(model) = 32
34 setup-threading $(targets) : $(sources) : $(properties) ; 35- {
35 setup-fpic $(targets) : $(sources) : $(properties) ; 36- option = -milp32 ;
36- setup-address-model $(targets) : $(sources) : $(properties) ; 37- }
37 38- else
38 # Some extensions are compiled as C++ by default. For others, we need to 39- {
39 # pass -x c++. We could always pass -x c++ but distcc does not work with it. 40- option = -mlp64 ;
40@@ -548,7 +545,6 @@ rule compile.c.preprocess ( targets * : sources * : properties * ) 41- }
41 { 42- }
42 setup-threading $(targets) : $(sources) : $(properties) ; 43- else
43 setup-fpic $(targets) : $(sources) : $(properties) ; 44- {
44- setup-address-model $(targets) : $(sources) : $(properties) ; 45- local arch = [ feature.get-values architecture : $(properties) ] ;
45 46- if $(arch) = power || $(arch) = sparc || $(arch) = x86
46 # If we use the name g++ then default file suffix -> language mapping does 47- {
47 # not work. So have to pass -x option. Maybe, we can work around this by 48- if $(model) = 32
48@@ -564,7 +560,6 @@ rule compile.c++ ( targets * : sources * : properties * ) 49- {
49 { 50- option = -m32 ;
50 setup-threading $(targets) : $(sources) : $(properties) ; 51- }
51 setup-fpic $(targets) : $(sources) : $(properties) ; 52- else if $(model) = 64
52- setup-address-model $(targets) : $(sources) : $(properties) ; 53- {
53 54- option = -m64 ;
54 # Some extensions are compiled as C++ by default. For others, we need to 55- }
55 # pass -x c++. We could always pass -x c++ but distcc does not work with it. 56- }
56@@ -594,7 +589,6 @@ rule compile.c ( targets * : sources * : properties * ) 57- # For darwin, the model can be 32_64. darwin.jam will handle that
57 { 58- # on its own.
58 setup-threading $(targets) : $(sources) : $(properties) ; 59- }
59 setup-fpic $(targets) : $(sources) : $(properties) ; 60 OPTIONS on $(targets) += $(option) ;
60- setup-address-model $(targets) : $(sources) : $(properties) ; 61 }
61
62 # If we use the name g++ then default file suffix -> language mapping does
63 # not work. So have to pass -x option. Maybe, we can work around this by
64@@ -610,7 +604,6 @@ rule compile.fortran ( targets * : sources * : properties * )
65 {
66 setup-threading $(targets) : $(sources) : $(properties) ;
67 setup-fpic $(targets) : $(sources) : $(properties) ;
68- setup-address-model $(targets) : $(sources) : $(properties) ;
69 } 62 }
70
71 actions compile.c++ bind PCH_FILE
72@@ -641,7 +634,6 @@ actions compile.fortran
73 rule compile.asm ( targets * : sources * : properties * )
74 {
75 setup-fpic $(targets) : $(sources) : $(properties) ;
76- setup-address-model $(targets) : $(sources) : $(properties) ;
77 LANG on $(<) = "-x assembler-with-cpp" ;
78 }
79
80@@ -950,7 +942,6 @@ rule quote-rpath ( targets * )
81 rule link ( targets * : sources * : properties * )
82 {
83 setup-threading $(targets) : $(sources) : $(properties) ;
84- setup-address-model $(targets) : $(sources) : $(properties) ;
85 SPACE on $(targets) = " " ;
86 # Serialize execution of the 'link' action, since running N links in
87 # parallel is just slower. For now, serialize only gcc links, it might be a
88@@ -1018,7 +1009,6 @@ actions piecemeal archive
89 rule link.dll ( targets * : sources * : properties * )
90 {
91 setup-threading $(targets) : $(sources) : $(properties) ;
92- setup-address-model $(targets) : $(sources) : $(properties) ;
93 SPACE on $(targets) = " " ;
94 JAM_SEMAPHORE on $(targets) = <s>gcc-link-semaphore ;
95 quote-rpath $(targets) ;
96-- 63--
972.8.0 642.15.1
65
diff --git a/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
index 6bb25f885c..fb6d9711b9 100644
--- a/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
+++ b/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
@@ -1,20 +1,21 @@
1From 7c49525812567f1219706c4ed330b3bd2cc8e94a Mon Sep 17 00:00:00 2001 1From 0868761e7d2d75d472090e3ef96f3d2f9ced27f3 Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com> 2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 10:29:32 -0700 3Date: Tue, 13 Dec 2016 10:29:32 -0700
4Subject: [PATCH 3/3] Don't set up arch/instruction-set flags, we do that 4Subject: [PATCH 5/6] Don't set up arch/instruction-set flags, we do that
5 ourselves 5 ourselves
6 6
7Upstream-Status: Inappropriate 7Upstream-Status: Inappropriate
8Signed-off-by: Christopher Larson <chris_larson@mentor.com> 8Signed-off-by: Christopher Larson <chris_larson@mentor.com>
9
9--- 10---
10 tools/build/src/tools/gcc.jam | 121 ------------------------------------------ 11 tools/build/src/tools/gcc.jam | 127 ------------------------------------------
11 1 file changed, 121 deletions(-) 12 1 file changed, 127 deletions(-)
12 13
13diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam 14diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam
14index 942f141..d062c20 100644 15index e3b1b952..e4fc6c32 100644
15--- a/tools/build/src/tools/gcc.jam 16--- a/tools/build/src/tools/gcc.jam
16+++ b/tools/build/src/tools/gcc.jam 17+++ b/tools/build/src/tools/gcc.jam
17@@ -1068,124 +1068,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : 18@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
18 <architecture>$(architecture)/<instruction-set>$(instruction-set) 19 <architecture>$(architecture)/<instruction-set>$(instruction-set)
19 : $(values) ; 20 : $(values) ;
20 } 21 }
@@ -60,6 +61,10 @@ index 942f141..d062c20 100644
60-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; 61-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
61-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; 62-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
62-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; 63-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
64-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
65-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
66-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
67-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
63-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; 68-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
64-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; 69-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
65-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; 70-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
@@ -81,8 +86,10 @@ index 942f141..d062c20 100644
81-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ; 86-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
82-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ; 87-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
83-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ; 88-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
89-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
84-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; 90-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
85-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; 91-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
92-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
86-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; 93-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
87-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; 94-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
88-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; 95-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
@@ -140,4 +147,5 @@ index 942f141..d062c20 100644
140-# AIX variant of RS/6000 & PowerPC 147-# AIX variant of RS/6000 & PowerPC
141-toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; 148-toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
142-- 149--
1432.8.0 1502.15.1
151
diff --git a/meta/recipes-support/boost/boost_1.65.1.bb b/meta/recipes-support/boost/boost_1.66.0.bb
index 9ba56703a5..63b82a5995 100644
--- a/meta/recipes-support/boost/boost_1.65.1.bb
+++ b/meta/recipes-support/boost/boost_1.66.0.bb
@@ -8,5 +8,4 @@ SRC_URI += "\
8 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 \
9 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 \
10 file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ 10 file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \
11 file://0001-correct-error-which-appeared-when-compiling-non-c-co.patch \
12" 11"