summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2014-08-07 06:17:20 +0000
committerSergey Popov <pinkbyte@gentoo.org>2014-08-07 06:17:20 +0000
commite4d3c659cd0d5f03a78366ba0c09003c2063ce1f (patch)
tree46199b49e87e738159045add7f371fa6bc479170 /dev-libs/boost
parentSupport building with db6 - bug #518994 (diff)
downloadgentoo-2-e4d3c659cd0d5f03a78366ba0c09003c2063ce1f.tar.gz
gentoo-2-e4d3c659cd0d5f03a78366ba0c09003c2063ce1f.tar.bz2
gentoo-2-e4d3c659cd0d5f03a78366ba0c09003c2063ce1f.zip
Backport fix for bug #498134, wrt bug #518840. Thanks to Michael Jones <gentoo AT jonesmz.com> for discovering this issue
(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'dev-libs/boost')
-rw-r--r--dev-libs/boost/ChangeLog6
-rw-r--r--dev-libs/boost/boost-1.52.0-r7.ebuild5
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index d647ceaf4633..1941fe5da338 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/boost
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.322 2014/07/30 21:26:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.323 2014/08/07 06:17:20 pinkbyte Exp $
+
+ 07 Aug 2014; Sergey Popov <pinkbyte@gentoo.org> boost-1.52.0-r7.ebuild:
+ Backport fix for bug #498134, wrt bug #518840. Thanks to Michael Jones
+ <gentoo AT jonesmz.com> for discovering this issue
30 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> boost-1.52.0-r7.ebuild:
Whitespace
diff --git a/dev-libs/boost/boost-1.52.0-r7.ebuild b/dev-libs/boost/boost-1.52.0-r7.ebuild
index 9c619431c9e7..e66087a77ed4 100644
--- a/dev-libs/boost/boost-1.52.0-r7.ebuild
+++ b/dev-libs/boost/boost-1.52.0-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r7.ebuild,v 1.4 2014/07/30 21:26:35 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.52.0-r7.ebuild,v 1.5 2014/08/07 06:17:20 pinkbyte Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -107,6 +107,9 @@ ejam() {
}
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 --user-config=${S}/user-config.jam"
if [[ ${CHOST} == *-darwin* ]]; then