1 |
commit: d048380872f0cac62de2e91d367da9db64e4f3b7 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 8 21:11:43 2021 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 8 21:20:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d0483808 |
7 |
|
8 |
Bump boost to v1.75.0 |
9 |
|
10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
11 |
|
12 |
.../boost-build-1.71.0-disable_python_rpath.patch | 0 |
13 |
.../boost-build-1.71.0-respect-c_ld-flags.patch | 0 |
14 |
...ost-build-1.73.0-add-none-feature-options.patch | 0 |
15 |
...ost-build-1.74.0-no-implicit-march-flags.patch} | 34 ++++++++++++++-------- |
16 |
.../boost-1.71.0-context-x32.patch | 0 |
17 |
.../boost-1.71.0-disable_icu_rpath.patch | 0 |
18 |
.../boost-1.73-property-tree-include.patch | 0 |
19 |
7 files changed, 22 insertions(+), 12 deletions(-) |
20 |
|
21 |
diff --git a/patches/boost-build/1.73.0/boost-build-1.71.0-disable_python_rpath.patch b/patches/boost-build/1.75.0/boost-build-1.71.0-disable_python_rpath.patch |
22 |
similarity index 100% |
23 |
rename from patches/boost-build/1.73.0/boost-build-1.71.0-disable_python_rpath.patch |
24 |
rename to patches/boost-build/1.75.0/boost-build-1.71.0-disable_python_rpath.patch |
25 |
|
26 |
diff --git a/patches/boost-build/1.73.0/boost-build-1.71.0-respect-c_ld-flags.patch b/patches/boost-build/1.75.0/boost-build-1.71.0-respect-c_ld-flags.patch |
27 |
similarity index 100% |
28 |
rename from patches/boost-build/1.73.0/boost-build-1.71.0-respect-c_ld-flags.patch |
29 |
rename to patches/boost-build/1.75.0/boost-build-1.71.0-respect-c_ld-flags.patch |
30 |
|
31 |
diff --git a/patches/boost-build/1.73.0/boost-build-1.73.0-add-none-feature-options.patch b/patches/boost-build/1.75.0/boost-build-1.73.0-add-none-feature-options.patch |
32 |
similarity index 100% |
33 |
rename from patches/boost-build/1.73.0/boost-build-1.73.0-add-none-feature-options.patch |
34 |
rename to patches/boost-build/1.75.0/boost-build-1.73.0-add-none-feature-options.patch |
35 |
|
36 |
diff --git a/patches/boost-build/1.73.0/boost-build-1.73.0-no-implicit-march-flags.patch b/patches/boost-build/1.75.0/boost-build-1.74.0-no-implicit-march-flags.patch |
37 |
similarity index 91% |
38 |
rename from patches/boost-build/1.73.0/boost-build-1.73.0-no-implicit-march-flags.patch |
39 |
rename to patches/boost-build/1.75.0/boost-build-1.74.0-no-implicit-march-flags.patch |
40 |
index ef6de89..894af8f 100644 |
41 |
--- a/patches/boost-build/1.73.0/boost-build-1.73.0-no-implicit-march-flags.patch |
42 |
+++ b/patches/boost-build/1.75.0/boost-build-1.74.0-no-implicit-march-flags.patch |
43 |
@@ -1,14 +1,6 @@ |
44 |
-Prevent bjam from injecting what it thinks are great -march/-mcpu flags |
45 |
-in order to optimize code for you. This breaks on 32-bit builds, because |
46 |
--march=i686 will not work on an i486 CHOST. |
47 |
- |
48 |
-See also: |
49 |
-https://bugs.gentoo.org/624616 |
50 |
- |
51 |
---- a/tools/gcc.jam |
52 |
--- a/tools/gcc.jam |
53 |
+++ b/tools/gcc.jam |
54 |
-@@ -1202,129 +1202,8 @@ |
55 |
+@@ -1224,135 +1224,9 @@ |
56 |
# x86 and compatible |
57 |
# The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. |
58 |
# Use i686 instead for 32-bit. |
59 |
@@ -51,7 +43,11 @@ https://bugs.gentoo.org/624616 |
60 |
-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; |
61 |
-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; |
62 |
-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; |
63 |
--cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ; |
64 |
+-cpu-flags gcc OPTIONS : x86 : icelake-client : -march=icelake-client ; |
65 |
+-cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ; |
66 |
+-cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ; |
67 |
+-cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ; |
68 |
+-cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ; |
69 |
-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; |
70 |
-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; |
71 |
-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; |
72 |
@@ -77,13 +73,15 @@ https://bugs.gentoo.org/624616 |
73 |
-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; |
74 |
-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; |
75 |
-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; |
76 |
+-cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ; |
77 |
-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; |
78 |
-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; |
79 |
-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; |
80 |
-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; |
81 |
+-cpu-flags gcc OPTIONS : x86 : c7 : -march=c7 ; |
82 |
## |
83 |
-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; |
84 |
--# Sparc |
85 |
+ # Sparc |
86 |
-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; |
87 |
-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; |
88 |
-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; |
89 |
@@ -140,7 +138,7 @@ https://bugs.gentoo.org/624616 |
90 |
toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; |
91 |
--- a/tools/gcc.py |
92 |
+++ b/tools/gcc.py |
93 |
-@@ -745,126 +745,14 @@ |
94 |
+@@ -745,138 +745,14 @@ |
95 |
# x86 and compatible |
96 |
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32']) |
97 |
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64']) |
98 |
@@ -178,6 +176,15 @@ https://bugs.gentoo.org/624616 |
99 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i']) |
100 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i']) |
101 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt']) |
102 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'broadwell', ['-march=broadwell']) |
103 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'skylake', ['-march=skylake']) |
104 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'skylake-avx512', ['-march=skylake-avx512']) |
105 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'cannonlake', ['-march=skylake-avx512', '-mavx512vbmi', '-mavx512ifma', '-msha']) |
106 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'icelake-client', ['-march=icelake-client']) |
107 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'icelake-server', ['-march=icelake-server']) |
108 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'cascadelake', ['-march=skylake-avx512', '-mavx512vnni']) |
109 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'cooperlake', ['-march=cooperlake']) |
110 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'tigerlake', ['-march=tigerlake']) |
111 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6']) |
112 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2']) |
113 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3']) |
114 |
@@ -201,10 +208,13 @@ https://bugs.gentoo.org/624616 |
115 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3']) |
116 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1']) |
117 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2']) |
118 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'znver1', ['-march=znver1']) |
119 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'znver2', ['-march=znver2']) |
120 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6']) |
121 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2']) |
122 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3']) |
123 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2']) |
124 |
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'c7', ['-march=c7']) |
125 |
## |
126 |
-cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom']) |
127 |
# Sparc |
128 |
|
129 |
diff --git a/patches/boost/1.73.0/boost-1.71.0-context-x32.patch b/patches/boost/1.75.0/boost-1.71.0-context-x32.patch |
130 |
similarity index 100% |
131 |
rename from patches/boost/1.73.0/boost-1.71.0-context-x32.patch |
132 |
rename to patches/boost/1.75.0/boost-1.71.0-context-x32.patch |
133 |
|
134 |
diff --git a/patches/boost/1.73.0/boost-1.71.0-disable_icu_rpath.patch b/patches/boost/1.75.0/boost-1.71.0-disable_icu_rpath.patch |
135 |
similarity index 100% |
136 |
rename from patches/boost/1.73.0/boost-1.71.0-disable_icu_rpath.patch |
137 |
rename to patches/boost/1.75.0/boost-1.71.0-disable_icu_rpath.patch |
138 |
|
139 |
diff --git a/patches/boost/1.73.0/boost-1.73-property-tree-include.patch b/patches/boost/1.75.0/boost-1.73-property-tree-include.patch |
140 |
similarity index 100% |
141 |
rename from patches/boost/1.73.0/boost-1.73-property-tree-include.patch |
142 |
rename to patches/boost/1.75.0/boost-1.73-property-tree-include.patch |