From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 87EE51382FE for ; Tue, 12 Jul 2016 08:47:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE751E0AF0; Tue, 12 Jul 2016 08:47:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4ED39E0AF0 for ; Tue, 12 Jul 2016 08:47:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24565340D88 for ; Tue, 12 Jul 2016 08:47:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E4D92416 for ; Tue, 12 Jul 2016 08:47:27 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1468313219.c3ba24531d987bf370d663bb650638f3632d740e.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/boost/boost-1.61.0.ebuild X-VCS-Directories: dev-libs/boost/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: c3ba24531d987bf370d663bb650638f3632d740e X-VCS-Branch: master Date: Tue, 12 Jul 2016 08:47:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 74872fc9-4bc0-43d9-ba68-58d4af1debd9 X-Archives-Hash: 0e33ef6bc9689f05f06e5d78a8908320 commit: c3ba24531d987bf370d663bb650638f3632d740e Author: Fabian Groffen gentoo org> AuthorDate: Tue Jul 12 08:46:59 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jul 12 08:46:59 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ba2453 dev-libs/boost: fix argument handling in 1.61 for Prefix by William Throwe in bug #582612 Package-Manager: portage-2.2.28 dev-libs/boost/boost-1.61.0.ebuild | 63 +++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/dev-libs/boost/boost-1.61.0.ebuild b/dev-libs/boost/boost-1.61.0.ebuild index dec35ad..207c086 100644 --- a/dev-libs/boost/boost-1.61.0.ebuild +++ b/dev-libs/boost/boost-1.61.0.ebuild @@ -132,16 +132,24 @@ src_prepare() { } ejam() { - local b2_opts="--user-config=${BOOST_ROOT}/user-config.jam $@" - echo b2 ${b2_opts} - b2 ${b2_opts} + local b2_opts=( + "--user-config=${BOOST_ROOT}/user-config.jam" + "$@" + ) + echo b2 "${b2_opts[@]}" + b2 "${b2_opts[@]}" } src_configure() { # Workaround for too many parallel processes requested, bug #506064 [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64" - OPTIONS="$(usex debug gentoodebug gentoorelease) -j$(makeopts_jobs) -q -d+2" + OPTIONS=( + $(usex debug gentoodebug gentoorelease) + "-j$(makeopts_jobs)" + -q + -d+2 + ) if [[ ${CHOST} == *-darwin* ]]; then # We need to add the prefix, and in two cases this exceeds, so prepare @@ -166,18 +174,37 @@ src_configure() { # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. append-cxxflags -std=gnu++98 - use icu && OPTIONS+=" -sICU_PATH=${EPREFIX}/usr" - use icu || OPTIONS+=" --disable-icu boost.locale.icu=off" - mpi_needed || OPTIONS+=" --without-mpi" - use nls || OPTIONS+=" --without-locale" - use context || OPTIONS+=" --without-context --without-coroutine --without-coroutine2" - - OPTIONS+=" pch=off" - OPTIONS+=" --boost-build=\"${EPREFIX}\"/usr/share/boost-build --prefix=\"${ED}usr\"" - OPTIONS+=" --layout=system" - OPTIONS+=" threading=$(usex threads multi single) link=$(usex static-libs shared,static shared)" + use icu && OPTIONS+=( + "-sICU_PATH=${EPREFIX}/usr" + ) + use icu || OPTIONS+=( + --disable-icu + boost.locale.icu=off + ) + mpi_needed || OPTIONS+=( + --without-mpi + ) + use nls || OPTIONS+=( + --without-locale + ) + use context || OPTIONS+=( + --without-context + --without-coroutine + --without-coroutine2 + ) - [[ ${CHOST} == *-winnt* ]] && OPTIONS+=" -sNO_BZIP2=1" + OPTIONS+=( + pch=off + --boost-build="${EPREFIX}"/usr/share/boost-build + --prefix="${ED}usr" + --layout=system + threading=$(usex threads multi single) + link=$(usex static-libs shared,static shared) + ) + + [[ ${CHOST} == *-winnt* ]] && OPTIONS+=( + -sNO_BZIP2=1 + ) } multilib_src_compile() { @@ -196,7 +223,7 @@ multilib_src_compile() { fi ejam \ - ${OPTIONS} \ + "${OPTIONS[@]}" \ ${PYTHON_OPTIONS} \ || die "Building of Boost libraries failed" @@ -242,7 +269,7 @@ multilib_src_compile() { pushd tools > /dev/null || die ejam \ - ${OPTIONS} \ + "${OPTIONS[@]}" \ ${PYTHON_OPTIONS} \ || die "Building of Boost tools failed" popd > /dev/null || die @@ -304,7 +331,7 @@ multilib_src_install() { fi ejam \ - ${OPTIONS} \ + "${OPTIONS[@]}" \ ${PYTHON_OPTIONS} \ --includedir="${ED}usr/include" \ --libdir="${ED}usr/$(get_libdir)" \