| 1 |
commit: c3ba24531d987bf370d663bb650638f3632d740e |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 08:46:59 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 08:46:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ba2453 |
| 7 |
|
| 8 |
dev-libs/boost: fix argument handling in 1.61 for Prefix by William Throwe in bug #582612 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
dev-libs/boost/boost-1.61.0.ebuild | 63 +++++++++++++++++++++++++++----------- |
| 13 |
1 file changed, 45 insertions(+), 18 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-libs/boost/boost-1.61.0.ebuild b/dev-libs/boost/boost-1.61.0.ebuild |
| 16 |
index dec35ad..207c086 100644 |
| 17 |
--- a/dev-libs/boost/boost-1.61.0.ebuild |
| 18 |
+++ b/dev-libs/boost/boost-1.61.0.ebuild |
| 19 |
@@ -132,16 +132,24 @@ src_prepare() { |
| 20 |
} |
| 21 |
|
| 22 |
ejam() { |
| 23 |
- local b2_opts="--user-config=${BOOST_ROOT}/user-config.jam $@" |
| 24 |
- echo b2 ${b2_opts} |
| 25 |
- b2 ${b2_opts} |
| 26 |
+ local b2_opts=( |
| 27 |
+ "--user-config=${BOOST_ROOT}/user-config.jam" |
| 28 |
+ "$@" |
| 29 |
+ ) |
| 30 |
+ echo b2 "${b2_opts[@]}" |
| 31 |
+ b2 "${b2_opts[@]}" |
| 32 |
} |
| 33 |
|
| 34 |
src_configure() { |
| 35 |
# Workaround for too many parallel processes requested, bug #506064 |
| 36 |
[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64" |
| 37 |
|
| 38 |
- OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2" |
| 39 |
+ OPTIONS=( |
| 40 |
+ $(usex debug gentoodebug gentoorelease) |
| 41 |
+ "-j$(makeopts_jobs)" |
| 42 |
+ -q |
| 43 |
+ -d+2 |
| 44 |
+ ) |
| 45 |
|
| 46 |
if [[ ${CHOST} == *-darwin* ]]; then |
| 47 |
# We need to add the prefix, and in two cases this exceeds, so prepare |
| 48 |
@@ -166,18 +174,37 @@ src_configure() { |
| 49 |
# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. |
| 50 |
append-cxxflags -std=gnu++98 |
| 51 |
|
| 52 |
- use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr" |
| 53 |
- use icu || OPTIONS+=" --disable-icu boost.locale.icu=off" |
| 54 |
- mpi_needed || OPTIONS+=" --without-mpi" |
| 55 |
- use nls || OPTIONS+=" --without-locale" |
| 56 |
- use context || OPTIONS+=" --without-context --without-coroutine --without-coroutine2" |
| 57 |
- |
| 58 |
- OPTIONS+=" pch=off" |
| 59 |
- OPTIONS+=" --boost-build=\"${EPREFIX}\"/usr/share/boost-build --prefix=\"${ED}usr\"" |
| 60 |
- OPTIONS+=" --layout=system" |
| 61 |
- OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)" |
| 62 |
+ use icu && OPTIONS+=( |
| 63 |
+ "-sICU_PATH=${EPREFIX}/usr" |
| 64 |
+ ) |
| 65 |
+ use icu || OPTIONS+=( |
| 66 |
+ --disable-icu |
| 67 |
+ boost.locale.icu=off |
| 68 |
+ ) |
| 69 |
+ mpi_needed || OPTIONS+=( |
| 70 |
+ --without-mpi |
| 71 |
+ ) |
| 72 |
+ use nls || OPTIONS+=( |
| 73 |
+ --without-locale |
| 74 |
+ ) |
| 75 |
+ use context || OPTIONS+=( |
| 76 |
+ --without-context |
| 77 |
+ --without-coroutine |
| 78 |
+ --without-coroutine2 |
| 79 |
+ ) |
| 80 |
|
| 81 |
- [[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1" |
| 82 |
+ OPTIONS+=( |
| 83 |
+ pch=off |
| 84 |
+ --boost-build="${EPREFIX}"/usr/share/boost-build |
| 85 |
+ --prefix="${ED}usr" |
| 86 |
+ --layout=system |
| 87 |
+ threading=$(usex threads multi single) |
| 88 |
+ link=$(usex static-libs shared,static shared) |
| 89 |
+ ) |
| 90 |
+ |
| 91 |
+ [[ ${CHOST} == *-winnt* ]] && OPTIONS+=( |
| 92 |
+ -sNO_BZIP2=1 |
| 93 |
+ ) |
| 94 |
} |
| 95 |
|
| 96 |
multilib_src_compile() { |
| 97 |
@@ -196,7 +223,7 @@ multilib_src_compile() { |
| 98 |
fi |
| 99 |
|
| 100 |
ejam \ |
| 101 |
- ${OPTIONS} \ |
| 102 |
+ "${OPTIONS[@]}" \ |
| 103 |
${PYTHON_OPTIONS} \ |
| 104 |
|| die "Building of Boost libraries failed" |
| 105 |
|
| 106 |
@@ -242,7 +269,7 @@ multilib_src_compile() { |
| 107 |
pushd tools > /dev/null || die |
| 108 |
|
| 109 |
ejam \ |
| 110 |
- ${OPTIONS} \ |
| 111 |
+ "${OPTIONS[@]}" \ |
| 112 |
${PYTHON_OPTIONS} \ |
| 113 |
|| die "Building of Boost tools failed" |
| 114 |
popd > /dev/null || die |
| 115 |
@@ -304,7 +331,7 @@ multilib_src_install() { |
| 116 |
fi |
| 117 |
|
| 118 |
ejam \ |
| 119 |
- ${OPTIONS} \ |
| 120 |
+ "${OPTIONS[@]}" \ |
| 121 |
${PYTHON_OPTIONS} \ |
| 122 |
--includedir="${ED}usr/include" \ |
| 123 |
--libdir="${ED}usr/$(get_libdir)" \ |
Archives