1 |
commit: 027516d3af563328344e22b0447960081ad16f4f |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 16 21:30:27 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 16 21:30:27 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=027516d3 |
7 |
|
8 |
Bump boost to v1.71.0 |
9 |
|
10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
11 |
|
12 |
gkbuilds/boost-build.gkbuild | 30 ++++++------ |
13 |
.../boost-build-1.50.0-respect-c_ld-flags.patch | 53 ---------------------- |
14 |
.../1.70.0/boost-build-1.55.0-ppc-aix.patch | 13 ------ |
15 |
.../boost-build-1.48.0-disable_python_rpath.patch | 11 +++++ |
16 |
...boost-build-1.62.0-sparc-no-default-flags.patch | 0 |
17 |
...ost-build-1.66.0-add-none-feature-options.patch | 0 |
18 |
.../boost-build-1.71.0-respect-c_ld-flags.patch | 9 ++++ |
19 |
.../boost/1.71.0/boost-1.69.0-context-x32.patch | 38 ++++++++++++++++ |
20 |
8 files changed, 71 insertions(+), 83 deletions(-) |
21 |
|
22 |
diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild |
23 |
index 17673c1..b2883ed 100644 |
24 |
--- a/gkbuilds/boost-build.gkbuild |
25 |
+++ b/gkbuilds/boost-build.gkbuild |
26 |
@@ -8,19 +8,15 @@ QA_IGNORE_DYNAMICALLY_LINKED_PROGRAM='(bjam|b2)$' |
27 |
src_prepare() { |
28 |
default |
29 |
|
30 |
- # Force regeneration |
31 |
- rm engine/jambase.c \ |
32 |
- || die "Failed to remove 'engine/jambase.c'!" |
33 |
- |
34 |
- # This patch allows us to fully control optimization |
35 |
- # and stripping flags when bjam is used as build-system |
36 |
- # We simply extend the optimization and debug-symbols feature |
37 |
- # with empty dummies called 'none' |
38 |
- sed -i \ |
39 |
- -e 's/\(off speed space\)/\1 none/' \ |
40 |
- -e 's/\(debug-symbols : on off\)/\1 none/' \ |
41 |
- tools/builtin.jam \ |
42 |
- || die "sed failed" |
43 |
+ # remove default -march/-mcpu definitions |
44 |
+ # bjam is trying to be clever and injects -march= in order to |
45 |
+ # optimize code for you. This breaks on 32-bit builds, because |
46 |
+ # -march=i686 will not work on an i486 CHOST. |
47 |
+ # https://bugs.gentoo.org/624616 |
48 |
+ sed -e '/^cpu-flags\s*gcc\s*OPTIONS/d' \ |
49 |
+ -e '/toolset\.flags\s*gcc\s*OPTIONS/d' \ |
50 |
+ -e "/cpu_flags('gcc',\s*'OPTIONS'/d" \ |
51 |
+ -i tools/gcc.{jam,py} || die "Failed removing -march/-mcpu" |
52 |
} |
53 |
|
54 |
src_compile() { |
55 |
@@ -28,20 +24,20 @@ src_compile() { |
56 |
|
57 |
local myargs=( |
58 |
./build.sh |
59 |
- cc |
60 |
+ cxx |
61 |
-d+2 |
62 |
--without-python |
63 |
) |
64 |
|
65 |
- CC=$(tc-getBUILD_CC) gkexec "${myargs[*]}" |
66 |
+ CC=$(tc-getBUILD_CC) CXX=$(tc-getBUILD_CXX) gkexec "${myargs[*]}" |
67 |
} |
68 |
|
69 |
src_install() { |
70 |
mkdir -p "${D}"/usr/bin \ |
71 |
|| die "Failed to create '${D}/usr/bin'!" |
72 |
|
73 |
- cp --target-directory="${D}/usr/bin" engine/bin.*/{bjam,b2} \ |
74 |
- || die "Failed to install 'engine/bin.*/{bjam,b2}' to '${D}/usr/bin'!" |
75 |
+ cp --target-directory="${D}/usr/bin" engine/{bjam,b2} \ |
76 |
+ || die "Failed to install 'engine/{bjam,b2}' to '${D}/usr/bin'!" |
77 |
|
78 |
mkdir -p "${D}"/usr/share/boost-build \ |
79 |
|| die "Failed to create '${D}/usr/share/boost-build'!" |
80 |
|
81 |
diff --git a/patches/boost-build/1.70.0/boost-build-1.50.0-respect-c_ld-flags.patch b/patches/boost-build/1.70.0/boost-build-1.50.0-respect-c_ld-flags.patch |
82 |
deleted file mode 100644 |
83 |
index 8775583..0000000 |
84 |
--- a/patches/boost-build/1.70.0/boost-build-1.50.0-respect-c_ld-flags.patch |
85 |
+++ /dev/null |
86 |
@@ -1,53 +0,0 @@ |
87 |
---- a/engine/build.jam |
88 |
-+++ b/engine/build.jam |
89 |
-@@ -3,7 +3,7 @@ |
90 |
- #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) |
91 |
- |
92 |
- # Clean env vars of any "extra" empty values. |
93 |
--for local v in ARGV CC CFLAGS LIBS |
94 |
-+for local v in ARGV CC CFLAGS LDFLAGS LIBS |
95 |
- { |
96 |
- local values ; |
97 |
- for local x in $($(v)) |
98 |
-@@ -179,10 +179,10 @@ |
99 |
- if ! $(CC) { CC = cc ; } |
100 |
- toolset cc $(CC) : "-o " : -D |
101 |
- : $(CFLAGS) |
102 |
-- [ opt --release : -s -O ] |
103 |
-+ [ opt --release : ] |
104 |
- [ opt --debug : -g ] |
105 |
- -I$(--python-include) -I$(--extra-include) |
106 |
-- : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; |
107 |
-+ : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; |
108 |
- ## Comeau C/C++ 4.x |
109 |
- toolset como como : "-o " : -D |
110 |
- : --c |
111 |
-@@ -201,11 +201,11 @@ |
112 |
- ## MacOSX Darwin, using GCC 2.9.x, 3.x |
113 |
- toolset darwin cc : "-o " : -D |
114 |
- : |
115 |
-- [ opt --release : -Wl,-x -O3 -finline-functions ] |
116 |
-+ [ opt --release : -Wl,-x -finline-functions ] |
117 |
- [ opt --debug : -g -O0 -fno-inline -pg ] |
118 |
- [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ] |
119 |
- -I$(--python-include) -I$(--extra-include) |
120 |
-- : -L$(--python-lib[1]) -l$(--python-lib[2]) ; |
121 |
-+ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; |
122 |
- ## GCC 2.x, 3.x, 4.x |
123 |
- toolset gcc gcc : "-o " : -D |
124 |
- : -pedantic -fno-strict-aliasing |
125 |
---- a/engine/build.sh |
126 |
-+++ b/engine/build.sh |
127 |
-@@ -224,9 +224,9 @@ |
128 |
- cc) |
129 |
- if test -z "$CC" ; then CC=cc ; fi |
130 |
- BOOST_JAM_CC=$CC |
131 |
-- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS" |
132 |
-- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS" |
133 |
-- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS" |
134 |
-+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS" |
135 |
-+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS" |
136 |
-+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS" |
137 |
- ;; |
138 |
- |
139 |
- qcc) |
140 |
|
141 |
diff --git a/patches/boost-build/1.70.0/boost-build-1.55.0-ppc-aix.patch b/patches/boost-build/1.70.0/boost-build-1.55.0-ppc-aix.patch |
142 |
deleted file mode 100644 |
143 |
index d8b6a5a..0000000 |
144 |
--- a/patches/boost-build/1.70.0/boost-build-1.55.0-ppc-aix.patch |
145 |
+++ /dev/null |
146 |
@@ -1,13 +0,0 @@ |
147 |
-https://svn.boost.org/trac/boost/ticket/10122 |
148 |
- |
149 |
---- a/engine/mem.h |
150 |
-+++ b/engine/mem.h |
151 |
-@@ -8,6 +8,8 @@ |
152 |
- #ifndef BJAM_MEM_H |
153 |
- #define BJAM_MEM_H |
154 |
- |
155 |
-+#include "jam.h" |
156 |
-+ |
157 |
- #ifdef OPT_BOEHM_GC |
158 |
- |
159 |
- /* Use Boehm GC memory allocator. */ |
160 |
|
161 |
diff --git a/patches/boost-build/1.71.0/boost-build-1.48.0-disable_python_rpath.patch b/patches/boost-build/1.71.0/boost-build-1.48.0-disable_python_rpath.patch |
162 |
new file mode 100644 |
163 |
index 0000000..84734f7 |
164 |
--- /dev/null |
165 |
+++ b/patches/boost-build/1.71.0/boost-build-1.48.0-disable_python_rpath.patch |
166 |
@@ -0,0 +1,11 @@ |
167 |
+--- a/tools/python.jam |
168 |
++++ b/tools/python.jam |
169 |
+@@ -961,7 +961,7 @@ |
170 |
+ # linux). |
171 |
+ : $(usage-requirements) |
172 |
+ <testing.launcher>$(set-PYTHONPATH) |
173 |
+- <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib |
174 |
++ <library-path>$(libraries) <library>python.lib |
175 |
+ ; |
176 |
+ } |
177 |
+ |
178 |
|
179 |
diff --git a/patches/boost-build/1.70.0/boost-build-1.62.0-sparc-no-default-flags.patch b/patches/boost-build/1.71.0/boost-build-1.62.0-sparc-no-default-flags.patch |
180 |
similarity index 100% |
181 |
rename from patches/boost-build/1.70.0/boost-build-1.62.0-sparc-no-default-flags.patch |
182 |
rename to patches/boost-build/1.71.0/boost-build-1.62.0-sparc-no-default-flags.patch |
183 |
|
184 |
diff --git a/patches/boost-build/1.70.0/boost-build-1.66.0-add-none-feature-options.patch b/patches/boost-build/1.71.0/boost-build-1.66.0-add-none-feature-options.patch |
185 |
similarity index 100% |
186 |
rename from patches/boost-build/1.70.0/boost-build-1.66.0-add-none-feature-options.patch |
187 |
rename to patches/boost-build/1.71.0/boost-build-1.66.0-add-none-feature-options.patch |
188 |
|
189 |
diff --git a/patches/boost-build/1.71.0/boost-build-1.71.0-respect-c_ld-flags.patch b/patches/boost-build/1.71.0/boost-build-1.71.0-respect-c_ld-flags.patch |
190 |
new file mode 100644 |
191 |
index 0000000..f51abea |
192 |
--- /dev/null |
193 |
+++ b/patches/boost-build/1.71.0/boost-build-1.71.0-respect-c_ld-flags.patch |
194 |
@@ -0,0 +1,9 @@ |
195 |
+--- a/engine/build.sh |
196 |
++++ b/engine/build.sh |
197 |
+@@ -439,5 +439,5 @@ |
198 |
+ if check_debug_build "$@" ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" |
199 |
+ else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" |
200 |
+ fi |
201 |
+-echo_run ${B2_CXX} ${CXXFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 |
202 |
++echo_run ${B2_CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 |
203 |
+ echo_run cp b2 bjam |
204 |
|
205 |
diff --git a/patches/boost/1.71.0/boost-1.69.0-context-x32.patch b/patches/boost/1.71.0/boost-1.69.0-context-x32.patch |
206 |
new file mode 100644 |
207 |
index 0000000..9ee3d54 |
208 |
--- /dev/null |
209 |
+++ b/patches/boost/1.71.0/boost-1.69.0-context-x32.patch |
210 |
@@ -0,0 +1,38 @@ |
211 |
+--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S |
212 |
++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S |
213 |
+@@ -24,6 +24,10 @@ |
214 |
+ * * |
215 |
+ ****************************************************************************************/ |
216 |
+ |
217 |
++#ifdef __x86_64__ |
218 |
++#include "jump_x86_64_sysv_elf_gas.S" |
219 |
++#else |
220 |
++ |
221 |
+ .file "jump_i386_sysv_elf_gas.S" |
222 |
+ .text |
223 |
+ .globl jump_fcontext |
224 |
+@@ -81,3 +85,5 @@ |
225 |
+ |
226 |
+ /* Mark that we don't need executable stack. */ |
227 |
+ .section .note.GNU-stack,"",%progbits |
228 |
++ |
229 |
++#endif |
230 |
+--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S |
231 |
++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S |
232 |
+@@ -24,6 +24,10 @@ |
233 |
+ * * |
234 |
+ ****************************************************************************************/ |
235 |
+ |
236 |
++#ifdef __x86_64__ |
237 |
++#include "make_x86_64_sysv_elf_gas.S" |
238 |
++#else |
239 |
++ |
240 |
+ .file "make_i386_sysv_elf_gas.S" |
241 |
+ .text |
242 |
+ .globl make_fcontext |
243 |
+@@ -105,3 +109,5 @@ |
244 |
+ |
245 |
+ /* Mark that we don't need executable stack. */ |
246 |
+ .section .note.GNU-stack,"",%progbits |
247 |
++ |
248 |
++#endif |