diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-06 21:07:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-06 21:07:20 +0000 |
| commit | 282a6510fda105588374474dc1cbb692d0ab6484 (patch) | |
| tree | 79afd0b84288529ded87284491333f2557003cfe | |
| parent | Marking bind-tools-9.4.3_p5 ppc64 for bug 335840 (diff) | |
| download | gentoo-2-282a6510fda105588374474dc1cbb692d0ab6484.tar.gz gentoo-2-282a6510fda105588374474dc1cbb692d0ab6484.tar.bz2 gentoo-2-282a6510fda105588374474dc1cbb692d0ab6484.zip | |
Fix race condition with MAKEOPTS wrt #335119 by Kevin Pyle.
(Portage version: 2.2_rc75/cvs/Linux x86_64)
| -rw-r--r-- | www-client/midori/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/midori/midori-0.2.7.ebuild | 12 | ||||
| -rw-r--r-- | www-client/midori/midori-9999.ebuild | 12 |
3 files changed, 25 insertions, 5 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog index f183fd7f52bd..6f784c844c45 100644 --- a/www-client/midori/ChangeLog +++ b/www-client/midori/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/midori # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.35 2010/08/24 19:26:59 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.36 2010/09/06 21:07:20 ssuominen Exp $ + + 06 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.7.ebuild, + midori-9999.ebuild: + Fix race condition with MAKEOPTS wrt #335119 by Kevin Pyle. 24 Aug 2010; Jeremy Olexa <darkside@gentoo.org> midori-9999.ebuild: Align -9999 ebuild with 0.2.7, bug 333779 by Michel Ganguin diff --git a/www-client/midori/midori-0.2.7.ebuild b/www-client/midori/midori-0.2.7.ebuild index 47c96f833ebd..e668b0f3909a 100644 --- a/www-client/midori/midori-0.2.7.ebuild +++ b/www-client/midori/midori-0.2.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.7.ebuild,v 1.1 2010/08/17 16:22:18 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.7.ebuild,v 1.2 2010/09/06 21:07:20 ssuominen Exp $ EAPI=2 @@ -62,7 +62,15 @@ src_configure() { } src_compile() { - NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS}) + # This is from dev-libs/boost, keep it synced + jobs=$( echo " ${MAKEOPTS} " | \ + sed -e 's/ --jobs[= ]/ -j /g' \ + -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ + -e 's/ -j\>/ -j1/g' | \ + ( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; + jobs="${j#-j}"; done; echo ${jobs} ) ) + if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; + ./waf build ${NUMJOBS} || die "build failed" } diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild index 81cc04492631..ebd48811470d 100644 --- a/www-client/midori/midori-9999.ebuild +++ b/www-client/midori/midori-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.17 2010/08/24 19:29:21 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.18 2010/09/06 21:07:20 ssuominen Exp $ EAPI=2 @@ -64,7 +64,15 @@ src_configure() { } src_compile() { - NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS}) + # This is from dev-libs/boost, keep it synced + jobs=$( echo " ${MAKEOPTS} " | \ + sed -e 's/ --jobs[= ]/ -j /g' \ + -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ + -e 's/ -j\>/ -j1/g' | \ + ( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; + jobs="${j#-j}"; done; echo ${jobs} ) ) + if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; + ./waf build ${NUMJOBS} || die "build failed" } |