Set the open file limit to 2048 for tests, bug 485772. Add working support for cross-compilation.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 40 insertions, 13 deletions

diff --git a/dev-util/ninja/ChangeLog b/dev-util/ninja/ChangeLog
index d88e61e8b669..37d3ce6fd237 100644
--- a/dev-util/ninja/ChangeLog
+++ b/dev-util/ninja/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ninja
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.21 2013/09/23 03:15:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.22 2013/09/23 21:53:00 floppym Exp $
+
+  23 Sep 2013; Mike Gilbert <floppym@gentoo.org> ninja-1.4.0.ebuild:
+  Set the open file limit to 2048 for tests, bug 485772. Add working support for
+  cross-compilation.
 
 *ninja-1.4.0 (23 Sep 2013)
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 9813c922cdbc..f9688fae31b2 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -6,13 +6,13 @@ DIST ninja-1.3.4.tar.gz 148750 SHA256 e71066b1db7b68f0aada6e93639ae8986844491d18
 DIST ninja-1.4.0.tar.gz 152385 SHA256 701cab33c5c69bcdeedad7a3f7bff4c3e61d38e8c2a0ab79d86e3b702de4c317 SHA512 8c939d586f30db884b2f3783fa6cd9a6f1b0904d231d1cd9b9196efdc0144585cdff11f5d7821f0f7d45643b82f65889e5fc950d7ae2c6d83c57c2cd43ba9361 WHIRLPOOL b052b3afe42c905236117fad27db7c69deac539417ac6d9bf8a505fc39ffb8567e2772f481c96534db57cf41f482573439314154721ce9d92bbc446cf93c1e54
 EBUILD ninja-1.3.3.ebuild 2206 SHA256 2ca975cd394315318623d01fc765da42842d845b5f2815cfa5e4df3c5637158f SHA512 78ef23f9fa86ddc959d7601de0ff7bf09adacd7b4f6a64dcb63d3633e891dab3cdfee52b39409dcc4967211ce8795a6f6cb16fa95fa8b3f17b09f9d959ceab93 WHIRLPOOL da7ce299a61da07e5730c328b1ef008648940a72fd043432864ced050a5ab52bba75ccdfc60c90b5f6848e8d3295c75559f63ed82ace638dc7d7fe48219b5734
 EBUILD ninja-1.3.4.ebuild 2214 SHA256 4eacd12d8acd59b93492d4c9572d0aaf8b403ec453d1d991ed9b76f499ef17a1 SHA512 03689a69721506c3fb2addc95ee4f0f92c6d28814a652ba1275252bce6cce98eb39d9ae63debc1660bc21791844604f40aa7ac06fd586fb27d128cb697f4678f WHIRLPOOL 8d0c62be8986a44f05ed48db744fd0198fa253a86e312cd740acba8cf59de19337e48627db1a8dfd79ed89c37c1face1ba6db4fb6cf8b69f099fac219281029e
-EBUILD ninja-1.4.0.ebuild 2221 SHA256 d08ecce234289e2229f8fa64134585c5ae4f4bd1adf21cf756e25d24b5f11f75 SHA512 fae3197c755ec677f2adb7ec26f0d2967d62b5d2f2b1ad9417dd2d57f85987ce57729265272b50df03dfef002081dd84accb9de59eaa95a3f1d58fd9307b8ef2 WHIRLPOOL 2fe31055969fa85b48ac997d4f5a83c23bbe656de9aaea02176204402b993eb5601f99503ff4b38ff37dcb54206fba36a465bab8119023bd41d52fb08dfab9ab
-MISC ChangeLog 2771 SHA256 2a75d3321ea024568b00943fbbfb1b85ee754e50d8c983742776c0addb80007a SHA512 946eeb5faa08e76318e05cc7b4ee642eb90ae111d5f7dcdb0d0124ec097d0e06342c90c47bada2efa673d2b20dc15d605f36b06fb0ef9639f84f1b9b1ab6c4d3 WHIRLPOOL c91377e970b5274db8f02253f810e9d0cbd887f7381ebc4a9de3752368471e7eb105b9d54e7e5d02caf7183f46f160017d2335010d1febfe06e52b161b440e47
+EBUILD ninja-1.4.0.ebuild 2647 SHA256 41a20902d1c4a71254d147b142e4f31db2c177df7ede91d378d5a7823cbd4cac SHA512 283c4e31264859ef357f968b4b2ed0d418b158f40dc881f9b0f2763d5c4b095aa2f7ed41ffbd3620ac02d95b4b22a44e0b3766ae837b6eec4f03d34d3d4f4887 WHIRLPOOL 52d1d870e0a4d333c6bba55cd4f95508a77a5ce117459bc2d83ed76c608cb670ef6b549174f878a73d3522a6b8a22df020f4108dc7f3584f6053877231bd162a
+MISC ChangeLog 2940 SHA256 c7155c87581d891a898d2e57803581d41002d9639960db5c4a8167b7f21e1b25 SHA512 612c6a797937f433465be70e3d0b19c95e208b4564371620b688b860cf16ef766fabaf5a1911a3a659fa00f1b254b5d7501664c7b673f84c907230cc11f35208 WHIRLPOOL a1098361299c1d217f5beab1b2a834b675c0d1f695c0a5a2fe69aefd9437b86ed4734d681519b2221c3e50c2301870e8ae4512e82e30499ba5ea306daec335ab
 MISC metadata.xml 240 SHA256 caac354df74906d7606c88d7a5d83921d448eada98dde1d7f64adf2fbd1af949 SHA512 f2f8acaa676739cfaa332bb42e7f1ae8a55b2c954af075bc77fd66d93d67a6c1eee2b0d5c040b8a130411631edf9296301ebb741771fd08906800c32a7dde8d9 WHIRLPOOL 347bf9d228f83878ce5cf99bd36d54dd96aee791fd4ad34f628b3596c52324371f4f2d9d94ecd0df7cc9311541522d98099fd7c1ac21dc0152c726301339786c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlI/slwACgkQuUQtlDBCeQLk6wCdGk2gDP/Z8pSYkEszT6sPPLJq
-pR0AnicoS9M336QKAiNig1kqge/q25gI
-=YXsJ
+iF4EAREIAAYFAlJAuEAACgkQC77qH+pIQ6RBCgD/aY8caFp/zhQCROIIb6o8cckP
+o4t9Jf91WGNIEIdYYZQA/2wl3xy8fgIMb872izKM3PmNc2qORxZHKJo9BT0nXeFT
+=yntR
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ninja/ninja-1.4.0.ebuild b/dev-util/ninja/ninja-1.4.0.ebuild
index eb4f7bdfcb59..cfbf8d2957b4 100644
--- a/dev-util/ninja/ninja-1.4.0.ebuild
+++ b/dev-util/ninja/ninja-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.4.0.ebuild,v 1.1 2013/09/23 03:15:30 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.4.0.ebuild,v 1.2 2013/09/23 21:53:00 floppym Exp $
 
 EAPI=5
 
@@ -46,14 +46,33 @@ RDEPEND="
 	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=${BUILD_CXXFLAGS}
+	fi
+	"$@"
+}
+
 src_compile() {
-	# If somebody wants to cross-compile, we will probably need to do 2 builds.
 	tc-export AR CXX
 
-	"${PYTHON}" bootstrap.py --verbose || die
+	# configure.py uses CFLAGS instead of CXXFLAGS 
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" bootstrap.py --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
 
 	if use doc; then
-		./ninja -v doxygen manual || die
+		./ninja-build -v doxygen manual || die
 	fi
 
 	if use emacs; then
@@ -62,8 +81,12 @@ src_compile() {
 }
 
 src_test() {
-	./ninja -v ninja_test || die
-	./ninja_test || die
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
 }
 
 src_install() {