Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/boost-build/files/, dev-util/boost-build/
Date: Sat, 03 Sep 2022 20:28:40
Message-Id: 1662236906.83a9d34ca794ea0fec5ea5deb5dce8fd8a56bdbf.soap@gentoo
1 commit: 83a9d34ca794ea0fec5ea5deb5dce8fd8a56bdbf
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 3 20:28:26 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 3 20:28:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a9d34c
7
8 dev-util/boost-build: add 1.80.0
9
10 Bug: https://bugs.gentoo.org/858320
11 Bug: https://bugs.gentoo.org/865527
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 dev-util/boost-build/Manifest | 1 +
15 dev-util/boost-build/boost-build-1.80.0.ebuild | 66 +++++++++
16 ...ost-build-1.80.0-add-none-feature-options.patch | 22 +++
17 ...oost-build-1.80.0-no-implicit-march-flags.patch | 148 +++++++++++++++++++++
18 .../boost-build/files/boost-build-1.80.0-odr.patch | 54 ++++++++
19 .../boost-build-1.80.0-respect-user-flags.patch | 11 ++
20 6 files changed, 302 insertions(+)
21
22 diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
23 index 7e0c56594141..ba3e5b485af8 100644
24 --- a/dev-util/boost-build/Manifest
25 +++ b/dev-util/boost-build/Manifest
26 @@ -1 +1,2 @@
27 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
28 +DIST boost_1_80_0.tar.bz2 115869904 BLAKE2B 507e811be7659442c41bc2d99811bd02a236dc94932e1a7a8cf256243b479f2d2707819cd99e016a51c9dadc215713e803afdd9ea4c105af8d5d2d28d3d06a1f SHA512 829a95b463473d69ff79ea41799c68429bb79d3b2321fbdb71df079af237ab01de9ad7e9612d8783d925730acada010068d2d1aa856c34244ee5c0ece16f208f
29
30 diff --git a/dev-util/boost-build/boost-build-1.80.0.ebuild b/dev-util/boost-build/boost-build-1.80.0.ebuild
31 new file mode 100644
32 index 000000000000..dcacdf3a18df
33 --- /dev/null
34 +++ b/dev-util/boost-build/boost-build-1.80.0.ebuild
35 @@ -0,0 +1,66 @@
36 +# Copyright 1999-2022 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=8
40 +
41 +inherit flag-o-matic toolchain-funcs
42 +
43 +MY_PV="$(ver_rs 1- _)"
44 +
45 +DESCRIPTION="A system for large project software construction, simple to use and powerful"
46 +HOMEPAGE="https://www.boost.org/build/"
47 +SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
48 +S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
49 +
50 +LICENSE="Boost-1.0"
51 +SLOT="0"
52 +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
53 +IUSE="examples"
54 +RESTRICT="test"
55 +
56 +PATCHES=(
57 + "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
58 + "${FILESDIR}"/${PN}-1.78.0-darwin-gentoo-toolchain.patch
59 + "${FILESDIR}"/${PN}-1.80.0-add-none-feature-options.patch
60 + "${FILESDIR}"/${PN}-1.80.0-respect-user-flags.patch
61 + "${FILESDIR}"/${PN}-1.80.0-no-implicit-march-flags.patch
62 + "${FILESDIR}"/${PN}-1.80.0-odr.patch
63 +)
64 +
65 +src_unpack() {
66 + tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
67 +}
68 +
69 +src_configure() {
70 + # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
71 + append-lfs-flags
72 +}
73 +
74 +src_compile() {
75 + cd engine || die
76 + ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed"
77 +}
78 +
79 +src_test() {
80 + # Forget tests, bjam is a lost cause
81 + :
82 +}
83 +
84 +src_install() {
85 + dobin engine/b2
86 +
87 + insinto /usr/share/b2/src
88 + doins -r "${FILESDIR}/site-config.jam" \
89 + bootstrap.jam build-system.jam ../example/user-config.jam \
90 + build kernel options tools util
91 +
92 + find "${ED}"/usr/share/b2/src -iname '*.py' -delete || die
93 +
94 + dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
95 +
96 + if use examples; then
97 + docinto examples
98 + dodoc -r ../example/.
99 + docompress -x /usr/share/doc/${PF}/examples
100 + fi
101 +}
102
103 diff --git a/dev-util/boost-build/files/boost-build-1.80.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.80.0-add-none-feature-options.patch
104 new file mode 100644
105 index 000000000000..620dea0af51b
106 --- /dev/null
107 +++ b/dev-util/boost-build/files/boost-build-1.80.0-add-none-feature-options.patch
108 @@ -0,0 +1,22 @@
109 +--- a/tools/features/debug-feature.jam
110 ++++ b/tools/features/debug-feature.jam
111 +@@ -18,7 +18,7 @@ common usage is to build release variant with debugging information.
112 + |# # end::doc[]
113 +
114 + feature.feature debug-symbols
115 +- : on off
116 ++ : on off none
117 + : propagated ;
118 +
119 + #| tag::prof-doc[]
120 +--- a/tools/features/optimization-feature.jam
121 ++++ b/tools/features/optimization-feature.jam
122 +@@ -16,7 +16,7 @@ smaller binary.
123 + |# # end::doc[]
124 +
125 + feature.feature optimization
126 +- : off speed space minimal debug
127 ++ : off none speed space minimal debug
128 + : propagated ;
129 +
130 + #| tag::inline-doc[]
131
132 diff --git a/dev-util/boost-build/files/boost-build-1.80.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.80.0-no-implicit-march-flags.patch
133 new file mode 100644
134 index 000000000000..2845d6e52f84
135 --- /dev/null
136 +++ b/dev-util/boost-build/files/boost-build-1.80.0-no-implicit-march-flags.patch
137 @@ -0,0 +1,148 @@
138 +--- a/tools/gcc.jam
139 ++++ b/tools/gcc.jam
140 +@@ -1131,145 +1131,11 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + :
141 + # x86 and compatible
142 + # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.
143 + # Use i686 instead for 32-bit.
144 +-toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ;
145 +-cpu-flags gcc OPTIONS : x86 : native : -march=native ;
146 +-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
147 +-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
148 +-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
149 +-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ;
150 +-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ;
151 +-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ;
152 +-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ;
153 +-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ;
154 +-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ;
155 +-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ;
156 +-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ;
157 +-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
158 +-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
159 +-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
160 +-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
161 +-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ;
162 +-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ;
163 +-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ;
164 +-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ;
165 +-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ;
166 +-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ;
167 +-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ;
168 +-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ;
169 +-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ;
170 +-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ;
171 +-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ;
172 +-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ;
173 +-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ;
174 +-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ;
175 +-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ;
176 +-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
177 +-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
178 +-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
179 +-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
180 +-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
181 +-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
182 +-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
183 +-cpu-flags gcc OPTIONS : x86 : icelake-client : -march=icelake-client ;
184 +-cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ;
185 +-cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ;
186 +-cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ;
187 +-cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ;
188 +-cpu-flags gcc OPTIONS : x86 : rocketlake : -march=rocketlake ;
189 +-cpu-flags gcc OPTIONS : x86 : alderlake : -march=alderlake ;
190 +-cpu-flags gcc OPTIONS : x86 : sapphirerapids : -march=sapphirerapids ;
191 +-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
192 +-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
193 +-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
194 +-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ;
195 +-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ;
196 +-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ;
197 +-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ;
198 +-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ;
199 + ##
200 +-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ;
201 +-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ;
202 +-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ;
203 +-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ;
204 +-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ;
205 +-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ;
206 +-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ;
207 +-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ;
208 +-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ;
209 +-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
210 +-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
211 +-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
212 +-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
213 +-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
214 +-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
215 +-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
216 +-cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ;
217 +-cpu-flags gcc OPTIONS : x86 : znver3 : -march=znver3 ;
218 +-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
219 +-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
220 +-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
221 +-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
222 +-cpu-flags gcc OPTIONS : x86 : c7 : -march=c7 ;
223 + ##
224 +-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
225 + # Sparc
226 +-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
227 +-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
228 +-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
229 +-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
230 +-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
231 +-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
232 +-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
233 +-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
234 +-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
235 +-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
236 +-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
237 +-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
238 +-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
239 +-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
240 + # RS/6000 & PowerPC
241 +-cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
242 +-cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
243 +-cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ;
244 +-cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ;
245 +-cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ;
246 +-cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ;
247 +-cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ;
248 +-cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ;
249 +-cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ;
250 +-cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ;
251 +-cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ;
252 +-cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ;
253 +-cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ;
254 +-cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ;
255 +-cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ;
256 +-cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ;
257 +-cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ;
258 +-cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ;
259 +-cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ;
260 +-cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ;
261 +-cpu-flags gcc OPTIONS : power : power : -mcpu=power ;
262 +-cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ;
263 +-cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ;
264 +-cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ;
265 +-cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ;
266 +-cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ;
267 +-cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ;
268 +-cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ;
269 +-cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ;
270 +-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
271 +-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
272 +-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
273 +-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
274 +-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
275 +-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
276 +-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
277 +-cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ;
278 + # ARM
279 +-cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ;
280 +-cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ;
281 +-cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ;
282 +-cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ;
283 + # AIX variant of RS/6000 & PowerPC
284 + toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
285 +
286
287 diff --git a/dev-util/boost-build/files/boost-build-1.80.0-odr.patch b/dev-util/boost-build/files/boost-build-1.80.0-odr.patch
288 new file mode 100644
289 index 000000000000..62cbca189640
290 --- /dev/null
291 +++ b/dev-util/boost-build/files/boost-build-1.80.0-odr.patch
292 @@ -0,0 +1,54 @@
293 +Avoid ODR violations by giving "_stack" internal linkage
294 +https://bugs.gentoo.org/858320
295 +
296 +--- a/engine/function.cpp
297 ++++ b/engine/function.cpp
298 +@@ -213,11 +213,11 @@
299 + } JAM_FUNCTION;
300 +
301 +
302 ++namespace
303 ++{
304 + typedef struct _stack STACK;
305 + typedef STACK* stack_ptr;
306 +
307 +-namespace
308 +-{
309 + template <typename T>
310 + using remove_cref_t
311 + = typename std::remove_const<
312 +@@ -260,7 +260,6 @@
313 + typename select_last_impl<(sizeof...(A) == 1), type_list<A...> >
314 + ::template type<A...>;
315 + #endif
316 +-}
317 +
318 + struct _stack
319 + {
320 +@@ -439,6 +438,8 @@
321 + cleanups_size += n;
322 + }
323 +
324 ++}
325 ++
326 + static STACK * stack_global()
327 + {
328 + static _stack singleton;
329 +--- a/engine/make1.cpp
330 ++++ b/engine/make1.cpp
331 +@@ -86,6 +86,7 @@
332 + #define T_STATE_MAKE1B 1 /* make1b() should be called */
333 + #define T_STATE_MAKE1C 2 /* make1c() should be called */
334 +
335 ++namespace {
336 + typedef struct _state state;
337 + struct _state
338 + {
339 +@@ -94,6 +95,7 @@
340 + TARGET * parent; /* parent argument necessary for MAKE1A */
341 + int32_t curstate; /* current state */
342 + };
343 ++}
344 +
345 + static void make1a( state * const );
346 + static void make1b( state * const );
347
348 diff --git a/dev-util/boost-build/files/boost-build-1.80.0-respect-user-flags.patch b/dev-util/boost-build/files/boost-build-1.80.0-respect-user-flags.patch
349 new file mode 100644
350 index 000000000000..b0de4f0e885f
351 --- /dev/null
352 +++ b/dev-util/boost-build/files/boost-build-1.80.0-respect-user-flags.patch
353 @@ -0,0 +1,11 @@
354 +--- a/engine/build.sh
355 ++++ b/engine/build.sh
356 +@@ -496,7 +496,7 @@ modules/set.cpp \
357 + if test_true ${B2_DEBUG_OPT} ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}"
358 + else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG"
359 + fi
360 +- ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 )
361 ++ ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${CPPFLAGS} ${B2_CXXFLAGS} ${LDFLAGS} ${B2_SOURCES} -o b2 )
362 + }
363 +
364 + if test_true ${B2_VERBOSE_OPT} ; then