/usr/bin/install patch to avoid parallel make install bugs.

Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386

4 files changed, 40 insertions, 8 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 963910e3bed2..3c2baa7c8518 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.65 2010/03/19 11:50:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.66 2010/03/24 11:04:55 the_paya Exp $
+
+  24 Mar 2010; Javier Villavicencio <the_paya@gentoo.org>
+  freebsd-ubin-8.0.ebuild, +files/freebsd-ubin-8.0-xinstall.patch:
+  Fix for parallel make install bugs when they use our /usr/bin/install.
 
 *freebsd-ubin-8.0 (19 Mar 2010)
 
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 2a1ee6b39484..14eb86d8b638 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -5,6 +5,7 @@ AUX freebsd-ubin-6.0-bsdcmp.patch 413 RMD160 e8f9d8f9c873077d7113af6a1efd642a3ee
 AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 RMD160 9fed268f43c4b8949f734900cb18d3e66a639a3d SHA1 2abad53b6e3783a9c175cf15a686868c532cad08 SHA256 318406fa003c5188163e0dac551d4cc5fed7653cc3ff0f6baa64f23572de6d7b
 AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 RMD160 d0cc816e7835b236c94c79a4ee2c45938d5246ff SHA1 9c4d8dde1fafd247980bb1367104ef89cc0adb98 SHA256 71f41de71568dd819e39c871dd5e570141f243dbabb23d855505c38bec4e9de9
 AUX freebsd-ubin-8.0-bsdar.patch 556 RMD160 113f6bd5a8c0b230645bc57c2a6bb73b6fc91221 SHA1 388f149e08678292f94066f005aed1c92a124d42 SHA256 cb81663b4cbb91372b492f2d8c430c166fe4f425fc464a94bb08ea43e23f278d
+AUX freebsd-ubin-8.0-xinstall.patch 1013 RMD160 5bcd51a1c13fa527f019968968dbf40018696679 SHA1 17e404c6ee4930c70f6094d7fc124b3cecaf0c0e SHA256 9a24aa62515cba954c15b89240952a7572215a2fabcf31473ec61834cce7d7c5
 AUX freebsd-ubin-lint-stdarg.patch 792 RMD160 673ce804ebd887121160da5d1993787334099903 SHA1 948ade4052f3ec1865ee782116495a508bf70183 SHA256 ec86f4c77b7c57f9f1651bb5f38641d198123594e770cc31d77d6775fd851bd6
 AUX freebsd-ubin-setXid.patch 3723 RMD160 f08790ad10346a69c7e84df111ec1219862298da SHA1 cff080269398d3b5ef5c990ac51e294cd9dc1f8d SHA256 961ac8dcd9efa4f1aab18f56b26c6210d1d5bf441410aae392160e7c0242d16d
 AUX locate-updatedb-cron 94 RMD160 2dc29c647124053fda6aff801d4f3a6950ba4645 SHA1 7c53ec741dc424b6883bef2723ef0c1616c2d3aa SHA256 ef062eb2e780b6c323a904c0e1cf8fc911954d05a0194033b37419003f64f14c
@@ -30,13 +31,13 @@ DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 EBUILD freebsd-ubin-7.2.ebuild 4077 RMD160 25eb82e31f1729aa79c2b7239216d8fb95f9ff42 SHA1 59d7de0659bf7f2eb4b9712866c8679e775a0d21 SHA256 0b3b36c131dbb747ee296bcb5e18f6b83fee0d711e2e72df34ab725c11726a85
-EBUILD freebsd-ubin-8.0.ebuild 4443 RMD160 a1b3ea25d2853aaa75c37a648010589e322a7af7 SHA1 f8ed13e7050d434e22448359769a61dcf18e87cb SHA256 70680169fbbd78565072d9c3f1bd8b4f80a07377ceff75aa84804773bd664082
-MISC ChangeLog 14685 RMD160 7db133f940e8186dd63fb83d073990c20328f58e SHA1 2070a4aea8a97a0e44ac9a646742b67106045dae SHA256 ad6a778133f7e4abfa4e9078dc2a9751b2071a949fdadd52f5851ddd37089995
+EBUILD freebsd-ubin-8.0.ebuild 4483 RMD160 12ea9a487b4f004964eebc6ded77b5d4a0411630 SHA1 402133c557deeb1f35f7d1aaef31479521b3327b SHA256 f3cfb44634cea441415d082747fb3fdd60518d20db0beb7ee5bd6884cb96bac8
+MISC ChangeLog 14884 RMD160 0c6def5b3ed1d85d09dea5c0c2e91925eb3df4e7 SHA1 ec3df945034c72c0a24717de7107b1c2d70cf0db SHA256 fb698073ab31759771cbae28b529065b72bb72bb9073cd263721064e7f7ed5fb
 MISC metadata.xml 692 RMD160 ecb15a5894b6f31b822951faf3f2ce8270620f7f SHA1 b54ed38724e56583dcd435d2776fd33e0141b963 SHA256 9d7a61c414fb50713568dc2782c2de6460bac1eff7ca6a9f8a2d25979b48e811
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.14 (FreeBSD)
 
-iEYEARECAAYFAkujZUUACgkQvFcC4BYPU0qQ3QCff4rNaMT8O7Pyat2/GF4TFRqQ
-GVgAoLmoi2ETIr2bcePmXviVQ0YN9HRf
-=PVgC
+iEYEARECAAYFAkup8eEACgkQgvV6MZSadQrRjwCfVooXFIe2k5grPyLkq+Jz4JAe
+BxUAnA5/R2z1Pb/XR9TMc45VzjiCTttt
+=Ipzk
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
new file mode 100644
index 000000000000..099c0437211e
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-xinstall.patch
@@ -0,0 +1,26 @@
+Parallel make installs often cause 2 concurrent install -d to fail
+while they are creating the path to the target dirs.
+This patch changes the failure to a warning so that a make -j6 install doesn't
+fails as often as it does on Gentoo/FreeBSD, if it uses /usr/bin/install.
+
+--- usr.bin/xinstall/xinstall.c.orig
++++ usr.bin/xinstall/xinstall.c
+@@ -748,9 +748,17 @@
+ 			ch = *p;
+ 			*p = '\0';
+ 			if (stat(path, &sb)) {
+-				if (errno != ENOENT || mkdir(path, 0755) < 0) {
++				if (errno != ENOENT) {
+ 					err(EX_OSERR, "mkdir %s", path);
+ 					/* NOTREACHED */
++				} else if (mkdir(path, 0755) < 0) {
++					/* Previos errno from stat() says that the directory didn't exist (ENOENT)
++					 * But if errno is now EEXIST, then we just hit a parallel make bug.
++					 */
++					if (errno == EEXIST)
++						warn("mkdir: %s now exists!", path); /* let me know when this happens */
++					else
++						err(EX_OSERR, "mkdir %s", path);
+ 				} else if (verbose)
+ 					(void)printf("install: mkdir %s\n",
+ 						     path);
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild
index 2bd37dbe3d37..83efa61d4b87 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.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/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild,v 1.1 2010/03/19 11:50:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-8.0.ebuild,v 1.2 2010/03/24 11:04:55 the_paya Exp $
 
 EAPI=2
 
@@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
 	"${FILESDIR}/${PN}-setXid.patch"
 	"${FILESDIR}/${PN}-lint-stdarg.patch"
 	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
+	"${FILESDIR}/${PN}-8.0-xinstall.patch"
 	"${FILESDIR}/${PN}-8.0-bsdar.patch" )
 
 # Here we remove some sources we don't need because they are already