| 1 |
commit: 44540d2c38618b766626b88798bcd5c4bb506836 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 18:15:16 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 6 18:15:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44540d2c |
| 7 |
|
| 8 |
dev-libs/boost: Correct find command to delete non-empty dirs, #2 |
| 9 |
|
| 10 |
Gentoo-bug: 596216 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.1 |
| 13 |
|
| 14 |
dev-libs/boost/boost-1.62.0-r1.ebuild | 18 ++++++++++-------- |
| 15 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/boost/boost-1.62.0-r1.ebuild b/dev-libs/boost/boost-1.62.0-r1.ebuild |
| 18 |
index 03a15bc..690b792 100644 |
| 19 |
--- a/dev-libs/boost/boost-1.62.0-r1.ebuild |
| 20 |
+++ b/dev-libs/boost/boost-1.62.0-r1.ebuild |
| 21 |
@@ -107,12 +107,12 @@ __EOF__ |
| 22 |
|
| 23 |
pkg_setup() { |
| 24 |
# Bail out on unsupported build configuration, bug #456792 |
| 25 |
- if [[ -f "${EROOT}etc/site-config.jam" ]]; then |
| 26 |
- grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q gentoodebug "${EROOT}etc/site-config.jam" || |
| 27 |
+ if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then |
| 28 |
+ grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" || |
| 29 |
( |
| 30 |
- eerror "You are using custom ${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets." |
| 31 |
+ eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." |
| 32 |
eerror "Boost can not be built in such configuration." |
| 33 |
- eerror "Please, either remove this file or add targets from ${EROOT}usr/share/boost-build/site-config.jam to it." |
| 34 |
+ eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it." |
| 35 |
die |
| 36 |
) |
| 37 |
fi |
| 38 |
@@ -139,7 +139,7 @@ ejam() { |
| 39 |
|
| 40 |
src_configure() { |
| 41 |
# Workaround for too many parallel processes requested, bug #506064 |
| 42 |
- [ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64" |
| 43 |
+ [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" |
| 44 |
|
| 45 |
OPTIONS=( |
| 46 |
$(usex debug gentoodebug gentoorelease) |
| 47 |
@@ -294,9 +294,11 @@ multilib_src_install_all() { |
| 48 |
fi |
| 49 |
|
| 50 |
if use doc; then |
| 51 |
- find libs/*/* -depth \( -iname 'test' -o -iname 'src' \) -delete || die |
| 52 |
- find doc -depth \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -delete || die |
| 53 |
- find tools -depth \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -delete || die |
| 54 |
+ # find extraneous files that shouldn't be installed |
| 55 |
+ # as part of the documentation and remove them. |
| 56 |
+ find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die |
| 57 |
+ find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die |
| 58 |
+ find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die |
| 59 |
|
| 60 |
docinto html |
| 61 |
dodoc *.{htm,html,png,css} |
Archives