Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 582612 | Differences between
and this patch

Collapse All | Expand All

(-)a/boost-1.60.0.ebuild (-18 / +20 lines)
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=("--user-config=${BOOST_ROOT}/user-config.jam" "$@")
138
	echo b2 ${b2_opts}
138
	echo b2 "${b2_opts[@]}"
139
	b2 ${b2_opts}
139
	b2 "${b2_opts[@]}"
140
}
140
}
141
141
142
src_configure() {
142
src_configure() {
143
	# Workaround for too many parallel processes requested, bug #506064
143
	# Workaround for too many parallel processes requested, bug #506064
144
	[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
144
	[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
145
145
146
	OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2"
146
	OPTIONS=($(usex debug gentoodebug gentoorelease) "-j$(makeopts_jobs)" -q -d+2)
147
147
148
	if [[ ${CHOST} == *-darwin* ]]; then
148
	if [[ ${CHOST} == *-darwin* ]]; then
149
		# We need to add the prefix, and in two cases this exceeds, so prepare
149
		# 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.
168
	# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
169
	append-cxxflags -std=gnu++98
169
	append-cxxflags -std=gnu++98
170
170
171
	use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr"
171
	use icu && OPTIONS+=("-sICU_PATH=${EPREFIX}/usr")
172
	use icu || OPTIONS+=" --disable-icu boost.locale.icu=off"
172
	use icu || OPTIONS+=(--disable-icu boost.locale.icu=off)
173
	mpi_needed || OPTIONS+=" --without-mpi"
173
	mpi_needed || OPTIONS+=(--without-mpi)
174
	use nls || OPTIONS+=" --without-locale"
174
	use nls || OPTIONS+=(--without-locale)
175
	use context || OPTIONS+=" --without-context --without-coroutine --without-coroutine2"
175
	use context || OPTIONS+=(--without-context --without-coroutine --without-coroutine2)
176
176
177
	OPTIONS+=" pch=off"
177
	OPTIONS+=(
178
	OPTIONS+=" --boost-build=\"${EPREFIX}\"/usr/share/boost-build --prefix=\"${ED}usr\""
178
		pch=off
179
	OPTIONS+=" --layout=system"
179
		--boost-build="${EPREFIX}"/usr/share/boost-build --prefix="${ED}usr"
180
	OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)"
180
		--layout=system
181
		threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)
182
	)
181
183
182
	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1"
184
	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=(-sNO_BZIP2=1)
183
}
185
}
184
186
185
multilib_src_compile() {
187
multilib_src_compile() {
Lines 198-204 Link Here
198
		fi
200
		fi
199
201
200
		ejam \
202
		ejam \
201
			${OPTIONS} \
203
			"${OPTIONS[@]}" \
202
			${PYTHON_OPTIONS} \
204
			${PYTHON_OPTIONS} \
203
			|| die "Building of Boost libraries failed"
205
			|| die "Building of Boost libraries failed"
204
206
Lines 244-250 Link Here
244
		pushd tools > /dev/null || die
246
		pushd tools > /dev/null || die
245
247
246
		ejam \
248
		ejam \
247
			${OPTIONS} \
249
			"${OPTIONS[@]}" \
248
			${PYTHON_OPTIONS} \
250
			${PYTHON_OPTIONS} \
249
			|| die "Building of Boost tools failed"
251
			|| die "Building of Boost tools failed"
250
		popd > /dev/null || die
252
		popd > /dev/null || die
Lines 306-312 Link Here
306
		fi
308
		fi
307
309
308
		ejam \
310
		ejam \
309
			${OPTIONS} \
311
			"${OPTIONS[@]}" \
310
			${PYTHON_OPTIONS} \
312
			${PYTHON_OPTIONS} \
311
			--includedir="${ED}usr/include" \
313
			--includedir="${ED}usr/include" \
312
			--libdir="${ED}usr/$(get_libdir)" \
314
			--libdir="${ED}usr/$(get_libdir)" \

Return to bug 582612