Skip to content

Commit

Permalink
dev-libs/boost: Correct find command to delete non-empty dirs, gentoo#2
Browse files Browse the repository at this point in the history
Gentoo-bug: 596216

Package-Manager: portage-2.3.1
  • Loading branch information
SoapGentoo committed Oct 6, 2016
1 parent bd38ebe commit 44540d2
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions dev-libs/boost/boost-1.62.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit 44540d2

Please sign in to comment.