| 1 |
ssuominen 10/09/06 21:07:20 |
| 2 |
|
| 3 |
Modified: ChangeLog midori-9999.ebuild midori-0.2.7.ebuild |
| 4 |
Log: |
| 5 |
Fix race condition with MAKEOPTS wrt #335119 by Kevin Pyle. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc75/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.36 www-client/midori/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.36&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?rev=1.36&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/ChangeLog?r1=1.35&r2=1.36 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v |
| 19 |
retrieving revision 1.35 |
| 20 |
retrieving revision 1.36 |
| 21 |
diff -u -r1.35 -r1.36 |
| 22 |
--- ChangeLog 24 Aug 2010 19:26:59 -0000 1.35 |
| 23 |
+++ ChangeLog 6 Sep 2010 21:07:20 -0000 1.36 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for www-client/midori |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.35 2010/08/24 19:26:59 darkside Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.36 2010/09/06 21:07:20 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 06 Sep 2010; Samuli Suominen <ssuominen@g.o> midori-0.2.7.ebuild, |
| 31 |
+ midori-9999.ebuild: |
| 32 |
+ Fix race condition with MAKEOPTS wrt #335119 by Kevin Pyle. |
| 33 |
|
| 34 |
24 Aug 2010; Jeremy Olexa <darkside@g.o> midori-9999.ebuild: |
| 35 |
Align -9999 ebuild with 0.2.7, bug 333779 by Michel Ganguin |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.18 www-client/midori/midori-9999.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.18&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?rev=1.18&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-9999.ebuild?r1=1.17&r2=1.18 |
| 44 |
|
| 45 |
Index: midori-9999.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v |
| 48 |
retrieving revision 1.17 |
| 49 |
retrieving revision 1.18 |
| 50 |
diff -u -r1.17 -r1.18 |
| 51 |
--- midori-9999.ebuild 24 Aug 2010 19:29:21 -0000 1.17 |
| 52 |
+++ midori-9999.ebuild 6 Sep 2010 21:07:20 -0000 1.18 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.17 2010/08/24 19:29:21 darkside Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.18 2010/09/06 21:07:20 ssuominen Exp $ |
| 58 |
|
| 59 |
EAPI=2 |
| 60 |
|
| 61 |
@@ -64,7 +64,15 @@ |
| 62 |
} |
| 63 |
|
| 64 |
src_compile() { |
| 65 |
- NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS}) |
| 66 |
+ # This is from dev-libs/boost, keep it synced |
| 67 |
+ jobs=$( echo " ${MAKEOPTS} " | \ |
| 68 |
+ sed -e 's/ --jobs[= ]/ -j /g' \ |
| 69 |
+ -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ |
| 70 |
+ -e 's/ -j\>/ -j1/g' | \ |
| 71 |
+ ( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; |
| 72 |
+ jobs="${j#-j}"; done; echo ${jobs} ) ) |
| 73 |
+ if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; |
| 74 |
+ |
| 75 |
./waf build ${NUMJOBS} || die "build failed" |
| 76 |
} |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.2 www-client/midori/midori-0.2.7.ebuild |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.7.ebuild?rev=1.2&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.7.ebuild?rev=1.2&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/midori/midori-0.2.7.ebuild?r1=1.1&r2=1.2 |
| 86 |
|
| 87 |
Index: midori-0.2.7.ebuild |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.7.ebuild,v |
| 90 |
retrieving revision 1.1 |
| 91 |
retrieving revision 1.2 |
| 92 |
diff -u -r1.1 -r1.2 |
| 93 |
--- midori-0.2.7.ebuild 17 Aug 2010 16:22:18 -0000 1.1 |
| 94 |
+++ midori-0.2.7.ebuild 6 Sep 2010 21:07:20 -0000 1.2 |
| 95 |
@@ -1,6 +1,6 @@ |
| 96 |
# Copyright 1999-2010 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.7.ebuild,v 1.1 2010/08/17 16:22:18 darkside Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.7.ebuild,v 1.2 2010/09/06 21:07:20 ssuominen Exp $ |
| 100 |
|
| 101 |
EAPI=2 |
| 102 |
|
| 103 |
@@ -62,7 +62,15 @@ |
| 104 |
} |
| 105 |
|
| 106 |
src_compile() { |
| 107 |
- NUMJOBS=$(sed -e 's/.*\(\-j[ 0-9]\+\) .*/\1/; s/--jobs=\?/-j/' <<< ${MAKEOPTS}) |
| 108 |
+ # This is from dev-libs/boost, keep it synced |
| 109 |
+ jobs=$( echo " ${MAKEOPTS} " | \ |
| 110 |
+ sed -e 's/ --jobs[= ]/ -j /g' \ |
| 111 |
+ -e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \ |
| 112 |
+ -e 's/ -j\>/ -j1/g' | \ |
| 113 |
+ ( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; |
| 114 |
+ jobs="${j#-j}"; done; echo ${jobs} ) ) |
| 115 |
+ if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi; |
| 116 |
+ |
| 117 |
./waf build ${NUMJOBS} || die "build failed" |
| 118 |
} |
Archives