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 C096A138330 for ; Thu, 6 Oct 2016 18:15:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1000DE0C17; Thu, 6 Oct 2016 18:15:56 +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 D87B6E0C17 for ; Thu, 6 Oct 2016 18:15:55 +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 ACB863412EE for ; Thu, 6 Oct 2016 18:15:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 077522490 for ; Thu, 6 Oct 2016 18:15:53 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1475777740.44540d2c38618b766626b88798bcd5c4bb506836.soap@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.62.0-r1.ebuild X-VCS-Directories: dev-libs/boost/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 44540d2c38618b766626b88798bcd5c4bb506836 X-VCS-Branch: master Date: Thu, 6 Oct 2016 18:15:53 +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: 54c4e587-2aca-4094-b618-5dcd39ab049b X-Archives-Hash: a025afa8167eb063c9001ef8bbac926f commit: 44540d2c38618b766626b88798bcd5c4bb506836 Author: David Seifert gentoo org> AuthorDate: Thu Oct 6 18:15:16 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Oct 6 18:15:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44540d2c dev-libs/boost: Correct find command to delete non-empty dirs, #2 Gentoo-bug: 596216 Package-Manager: portage-2.3.1 dev-libs/boost/boost-1.62.0-r1.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-libs/boost/boost-1.62.0-r1.ebuild b/dev-libs/boost/boost-1.62.0-r1.ebuild index 03a15bc..690b792 100644 --- a/dev-libs/boost/boost-1.62.0-r1.ebuild +++ b/dev-libs/boost/boost-1.62.0-r1.ebuild @@ -107,12 +107,12 @@ __EOF__ pkg_setup() { # Bail out on unsupported build configuration, bug #456792 - if [[ -f "${EROOT}etc/site-config.jam" ]]; then - grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q gentoodebug "${EROOT}etc/site-config.jam" || + if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then + grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" || ( - eerror "You are using custom ${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets." + eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." eerror "Boost can not be built in such configuration." - eerror "Please, either remove this file or add targets from ${EROOT}usr/share/boost-build/site-config.jam to it." + eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it." die ) fi @@ -139,7 +139,7 @@ ejam() { src_configure() { # Workaround for too many parallel processes requested, bug #506064 - [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64" + [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" OPTIONS=( $(usex debug gentoodebug gentoorelease) @@ -294,9 +294,11 @@ multilib_src_install_all() { fi if use doc; then - find libs/*/* -depth \( -iname 'test' -o -iname 'src' \) -delete || die - find doc -depth \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -delete || die - find tools -depth \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -delete || die + # find extraneous files that shouldn't be installed + # as part of the documentation and remove them. + find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die + find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die + find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die docinto html dodoc *.{htm,html,png,css}