summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2011-07-28 17:58:39 +0000
committerMark Loeser <halcy0n@gentoo.org>2011-07-28 17:58:39 +0000
commit6128804105d82768fd1ed597e6ad47799b2bf502 (patch)
treeb61144ee0cbd201607674617e756ec64d00aeb5a /app-office
parentMore patch updates by Francois Bissey (diff)
downloadgentoo-2-6128804105d82768fd1ed597e6ad47799b2bf502.tar.gz
gentoo-2-6128804105d82768fd1ed597e6ad47799b2bf502.tar.bz2
gentoo-2-6128804105d82768fd1ed597e6ad47799b2bf502.zip
Set num_cpus to 1, and max_jobs to the jobs from MAKEOPTS, otherwise you end up with way more jobs running than intended
(Portage version: 2.1.10.3/cvs/Linux ppc64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/libreoffice-3.4.2.3.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index bb2da40032de..6f6b5bbca17d 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.73 2011/07/28 15:30:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.74 2011/07/28 17:58:39 halcy0n Exp $
+
+ 28 Jul 2011; Mark Loeser <halcy0n@gentoo.org> libreoffice-3.4.2.3.ebuild:
+ Set num_cpus to 1, and max_jobs to the jobs from MAKEOPTS, otherwise you end
+ up with way more jobs running than intended
28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
files/libreoffice-as-needed-gtk.patch:
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index f19f3afcb5c7..319437f6340a 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.9 2011/07/28 14:22:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.10 2011/07/28 17:58:39 halcy0n Exp $
EAPI=3
@@ -470,7 +470,7 @@ src_configure() {
--with-external-tar="${DISTDIR}" \
--with-lang="${LINGUAS_OOO}" \
--with-max-jobs=${jbs} \
- --with-num-cpus=${jbs} \
+ --with-num-cpus=1 \
--with-theme="${themes}" \
--with-unix-wrapper=libreoffice \
--with-vendor="Gentoo Foundation" \