|
Lines 134-149
Link Here
|
| 134 |
} |
134 |
} |
| 135 |
|
135 |
|
| 136 |
ejam() { |
136 |
ejam() { |
| 137 |
local b2_opts="--user-config=${BOOST_ROOT}/user-config.jam $@" |
137 |
local b2_opts=( |
| 138 |
echo b2 ${b2_opts} |
138 |
"--user-config=${BOOST_ROOT}/user-config.jam" |
| 139 |
b2 ${b2_opts} |
139 |
"$@" |
|
|
140 |
) |
| 141 |
echo b2 "${b2_opts[@]}" |
| 142 |
b2 "${b2_opts[@]}" |
| 140 |
} |
143 |
} |
| 141 |
|
144 |
|
| 142 |
src_configure() { |
145 |
src_configure() { |
| 143 |
# Workaround for too many parallel processes requested, bug #506064 |
146 |
# Workaround for too many parallel processes requested, bug #506064 |
| 144 |
[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64" |
147 |
[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64" |
| 145 |
|
148 |
|
| 146 |
OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2" |
149 |
OPTIONS=( |
|
|
150 |
$(usex debug gentoodebug gentoorelease) |
| 151 |
"-j$(makeopts_jobs)" |
| 152 |
-q |
| 153 |
-d+2 |
| 154 |
) |
| 147 |
|
155 |
|
| 148 |
if [[ ${CHOST} == *-darwin* ]]; then |
156 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 149 |
# We need to add the prefix, and in two cases this exceeds, so prepare |
157 |
# We need to add the prefix, and in two cases this exceeds, so prepare |
|
Lines 168-185
Link Here
|
| 168 |
# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. |
176 |
# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. |
| 169 |
append-cxxflags -std=gnu++98 |
177 |
append-cxxflags -std=gnu++98 |
| 170 |
|
178 |
|
| 171 |
use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr" |
179 |
use icu && OPTIONS+=( |
| 172 |
use icu || OPTIONS+=" --disable-icu boost.locale.icu=off" |
180 |
"-sICU_PATH=${EPREFIX}/usr" |
| 173 |
mpi_needed || OPTIONS+=" --without-mpi" |
181 |
) |
| 174 |
use nls || OPTIONS+=" --without-locale" |
182 |
use icu || OPTIONS+=( |
| 175 |
use context || OPTIONS+=" --without-context --without-coroutine --without-coroutine2" |
183 |
--disable-icu |
| 176 |
|
184 |
boost.locale.icu=off |
| 177 |
OPTIONS+=" pch=off" |
185 |
) |
| 178 |
OPTIONS+=" --boost-build=\"${EPREFIX}\"/usr/share/boost-build --prefix=\"${ED}usr\"" |
186 |
mpi_needed || OPTIONS+=( |
| 179 |
OPTIONS+=" --layout=system" |
187 |
--without-mpi |
| 180 |
OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)" |
188 |
) |
| 181 |
|
189 |
use nls || OPTIONS+=( |
| 182 |
[[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1" |
190 |
--without-locale |
|
|
191 |
) |
| 192 |
use context || OPTIONS+=( |
| 193 |
--without-context |
| 194 |
--without-coroutine |
| 195 |
--without-coroutine2 |
| 196 |
) |
| 197 |
|
| 198 |
OPTIONS+=( |
| 199 |
pch=off |
| 200 |
--boost-build="${EPREFIX}"/usr/share/boost-build |
| 201 |
--prefix="${ED}usr" |
| 202 |
--layout=system |
| 203 |
threading=$(usex threads multi single) |
| 204 |
link=$(usex static-libs shared,static shared) |
| 205 |
) |
| 206 |
|
| 207 |
[[ ${CHOST} == *-winnt* ]] && OPTIONS+=( |
| 208 |
-sNO_BZIP2=1 |
| 209 |
) |
| 183 |
} |
210 |
} |
| 184 |
|
211 |
|
| 185 |
multilib_src_compile() { |
212 |
multilib_src_compile() { |
|
Lines 198-204
Link Here
|
| 198 |
fi |
225 |
fi |
| 199 |
|
226 |
|
| 200 |
ejam \ |
227 |
ejam \ |
| 201 |
${OPTIONS} \ |
228 |
"${OPTIONS[@]}" \ |
| 202 |
${PYTHON_OPTIONS} \ |
229 |
${PYTHON_OPTIONS} \ |
| 203 |
|| die "Building of Boost libraries failed" |
230 |
|| die "Building of Boost libraries failed" |
| 204 |
|
231 |
|
|
Lines 244-250
Link Here
|
| 244 |
pushd tools > /dev/null || die |
271 |
pushd tools > /dev/null || die |
| 245 |
|
272 |
|
| 246 |
ejam \ |
273 |
ejam \ |
| 247 |
${OPTIONS} \ |
274 |
"${OPTIONS[@]}" \ |
| 248 |
${PYTHON_OPTIONS} \ |
275 |
${PYTHON_OPTIONS} \ |
| 249 |
|| die "Building of Boost tools failed" |
276 |
|| die "Building of Boost tools failed" |
| 250 |
popd > /dev/null || die |
277 |
popd > /dev/null || die |
|
Lines 306-312
Link Here
|
| 306 |
fi |
333 |
fi |
| 307 |
|
334 |
|
| 308 |
ejam \ |
335 |
ejam \ |
| 309 |
${OPTIONS} \ |
336 |
"${OPTIONS[@]}" \ |
| 310 |
${PYTHON_OPTIONS} \ |
337 |
${PYTHON_OPTIONS} \ |
| 311 |
--includedir="${ED}usr/include" \ |
338 |
--includedir="${ED}usr/include" \ |
| 312 |
--libdir="${ED}usr/$(get_libdir)" \ |
339 |
--libdir="${ED}usr/$(get_libdir)" \ |
