summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-11-21 09:52:19 +0000
committerMike Frysinger <vapier@gentoo.org>2014-11-21 09:52:19 +0000
commit43786571ccbe07a747e550b49c6b09ee691dcfbd (patch)
treea84a9cf3f39d9c1d3ee1d9e428e02b9d5b7e0ddd /dev-java/icedtea/icedtea-6.1.13.4.ebuild
parentVersion bump to stable to fix bug #491430. (diff)
downloadhistorical-43786571ccbe07a747e550b49c6b09ee691dcfbd.tar.gz
historical-43786571ccbe07a747e550b49c6b09ee691dcfbd.tar.bz2
historical-43786571ccbe07a747e550b49c6b09ee691dcfbd.zip
Backport makeopts_jobs to older ebuilds to stop parsing MAKEOPTS directly.
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-java/icedtea/icedtea-6.1.13.4.ebuild')
-rw-r--r--dev-java/icedtea/icedtea-6.1.13.4.ebuild11
1 files changed, 3 insertions, 8 deletions
diff --git a/dev-java/icedtea/icedtea-6.1.13.4.ebuild b/dev-java/icedtea/icedtea-6.1.13.4.ebuild
index 3fc73573a170..9ae5493d5bab 100644
--- a/dev-java/icedtea/icedtea-6.1.13.4.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.4.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-java/icedtea/icedtea-6.1.13.4.ebuild,v 1.2 2014/11/02 08:28:40 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.4.ebuild,v 1.3 2014/11/21 09:52:17 vapier Exp $
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
# *********************************************************
@@ -9,7 +9,7 @@
EAPI="5"
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
ICEDTEA_BRANCH=$(get_version_component_range 1-3)
@@ -193,12 +193,7 @@ src_configure() {
config="${config} --enable-cacao"
fi
- # OpenJDK-specific parallelism support. Bug #389791, #337827
- # Implementation modified from waf-utils.eclass
- # Note that "-j" is converted to "-j1" as the system doesn't support --load-average
- local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
- config="${config} --with-parallel-jobs=${procs}";
- einfo "Configuring using --with-parallel-jobs=${procs}"
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
if use javascript ; then
config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"