Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: eutils.eclass
Date: Thu, 07 Jun 2012 05:59:29
Message-Id: 20120607055920.8174F20047@flycatcher.gentoo.org
1 vapier 12/06/07 05:59:20
2
3 Modified: eutils.eclass
4 Log:
5 makeopts_jobs has been moved to multiprocessing.eclass, and all consumers should be upated now
6
7 Revision Changes Path
8 1.396 eclass/eutils.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.396&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.396&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.395&r2=1.396
13
14 Index: eutils.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
17 retrieving revision 1.395
18 retrieving revision 1.396
19 diff -u -r1.395 -r1.396
20 --- eutils.eclass 6 Jun 2012 15:37:50 -0000 1.395
21 +++ eutils.eclass 7 Jun 2012 05:59:20 -0000 1.396
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2012 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.395 2012/06/06 15:37:50 mgorny Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.396 2012/06/07 05:59:20 vapier Exp $
27
28 # @ECLASS: eutils.eclass
29 # @MAINTAINER:
30 @@ -1379,26 +1379,6 @@
31 # otherwise echo [false output][false suffix] (defaults to "no").
32 usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963
33
34 -# @FUNCTION: makeopts_jobs
35 -# @USAGE: [${MAKEOPTS}]
36 -# @DESCRIPTION:
37 -# Searches the arguments (defaults to ${MAKEOPTS}) and extracts the jobs number
38 -# specified therein. Useful for running non-make tools in parallel too.
39 -# i.e. if the user has MAKEOPTS=-j9, this will show "9".
40 -# We can't return the number as bash normalizes it to [0, 255]. If the flags
41 -# haven't specified a -j flag, then "1" is shown as that is the default `make`
42 -# uses. Since there's no way to represent infinity, we return 999 if the user
43 -# has -j without a number.
44 -makeopts_jobs() {
45 - [[ $# -eq 0 ]] && set -- ${MAKEOPTS}
46 - # This assumes the first .* will be more greedy than the second .*
47 - # since POSIX doesn't specify a non-greedy match (i.e. ".*?").
48 - local jobs=$(echo " $* " | sed -r -n \
49 - -e 's:.*[[:space:]](-j|--jobs[=[:space:]])[[:space:]]*([0-9]+).*:\2:p' \
50 - -e 's:.*[[:space:]](-j|--jobs)[[:space:]].*:999:p')
51 - echo ${jobs:-1}
52 -}
53 -
54 # @FUNCTION: prune_libtool_files
55 # @USAGE: [--all]
56 # @DESCRIPTION: