[xenial] unity-base/unity compiling 'make translations' is sometimes …

…not parallel make safe so build translations first with '-j1'
shiznix · May 21, 2016 · 5679518 · 5679518
1 parent 1813002
commit 5679518
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/unity-base/unity/Manifest b/unity-base/unity/Manifest
@@ -12,5 +12,5 @@ DIST unity_7.3.3+15.10.20151203.orig.tar.gz 2685796 SHA256 f44e0971ad29dbac865dc
 DIST unity_7.4.0+16.04.20160415-0ubuntu1.diff.gz 119140 SHA256 7c09d5ce777b1d4b984eac66ca06f6297a04ec98b78db8f6162cebe484d2993f SHA512 a094e95e2e0f158a6f44efa7078988cc637bb6810013eed53c25ca5e2e612e31e4e39508612d6a9c2cc229908ede6740a0cbabc87e569d7afe41520395be4828 WHIRLPOOL e358e3ce6fec4e78cc505b8a187da57942df0d151cd63a64c8ba3f400c7fab0f0ccf890f1a6167b34a1985bcf4291b1754b6eca1da40f253fce5c715b35ec65f
 DIST unity_7.4.0+16.04.20160415.orig.tar.gz 2667862 SHA256 f786948cd571dc74a85f5a6ca4e6391334b376cf7e2869b909eeef632471223a SHA512 9094b63f3b88a3b03256ea093e9af3dcbab154a64eb563791e09dae7facf43c390be8e282d5decbdbab772457784e1734f7ce702e0a5b2c19f13f5d67694a594 WHIRLPOOL 4e0d96d9ae52926ccd918505c8e9a62e2c8f1b651f9b527be0a632e352ad0bbcdafab0c95cca5aef12b540c86b9e298b651182ed53473c1ef8181d1cd24016d4
 EBUILD unity-7.3.3_p0_p01_p20151203-r1.ebuild 8093 SHA256 8943dfa2de87591b22598a23a99f8831b8bdd6420c060832e5b8d31e73f9cead SHA512 ba12b5e38db2777dd18c782f61d54aa90ceb840f9f008b49b4d8897b043eb411ca588b51e948e8dffbfa0ce9fc5feb2ef7229d7076fdbac55da62dc5578dcf78 WHIRLPOOL 5ae6b66b47704fc4ae4077123fb088963dbdb02de4c67693478eaa467a40a123645ae6a76dac6364a4bbe15bd6dfa1ccfb2383ea2184962f85540addb201f9f2
-EBUILD unity-7.4.0_p0_p01_p20160415-r1.ebuild 8497 SHA256 6f30095643b5397217d59675d2be42f0e4161e8ed8f2e0cc1c57beae78ec94b5 SHA512 b3f543c5ab1ac4d7863872d0616ad6983865170a31b4974c8ed52fa413d5cdff6b77c3c657c082dcecd1a71ef2589b23166bac3211c13f22740453cf7900d7a8 WHIRLPOOL 05509646c3b87ebc6c20836168af4d54e768728ae1b3ab2aff96487b1342636b9275f95a7829c6b34689f96eb788fb61ed5743161fbfa4bcb23a8f5fff64e321
+EBUILD unity-7.4.0_p0_p01_p20160415-r1.ebuild 8588 SHA256 8499352676450361b57abf737321ab452db0900eed0604f90b0ddcf2e17a1a52 SHA512 3b4ed87f6bf99d868caa63a32c24861b90be17e73834f4e03b09f46250f4f6e3c5085aa2b9d71e6dd5e4cd3d20a5045c39b57b2c8e74102df0c76330e359cbbe WHIRLPOOL ed0b491cdc8c0802ebc2342f2f04392d87659027be5dca7c84ca2082f5864fdbc8f400c0c061cc5ae9017f437b29f5a3757643e45a6a879f74c92efebe39eaf8
 MISC metadata.xml 362 SHA256 81909e6f96cd35fc7a97a5c9f1669292ff98d12690a7274920e7b8ed31ed02b7 SHA512 74e11b5a19cfe8aa9ed40021a7661aee3abec911b321ea75630d2e6799a4420e4251faef690d3296f689b17a03dc9aad89df56cfd064d84e824d712d3232efe8 WHIRLPOOL 0e8df343ad1219a4269fe1ba0cba1edf07c331e7e83800236294f4d1e7c9d88dfc0073674068f591d80e464389caa50099260f132b52f2b4d4168aa8fbeb4215
diff --git a/unity-base/unity/unity-7.4.0_p0_p01_p20160415-r1.ebuild b/unity-base/unity/unity-7.4.0_p0_p01_p20160415-r1.ebuild
@@ -84,8 +84,6 @@ DEPEND="${RDEPEND}
 		dev-util/dbus-test-runner
 		sys-apps/xorg-gtest )"
 
-MAKEOPTS="${MAKTOPTS} -j1"
-
 pkg_setup() {
 	ubuntu-versionator_pkg_setup
 	python-single-r1_pkg_setup
@@ -183,6 +181,11 @@ src_compile() {
 			distutils-r1_src_compile
 		popd
 	fi
+
+	# 'make translations' is sometimes not parallel make safe #
+	pushd ${CMAKE_BUILD_DIR}
+		emake -j1 translations
+	popd
 	cmake-utils_src_compile || die
 }