Fix from Chromium OS for parallel build failures.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/net-misc/socat/ChangeLog b/net-misc/socat/ChangeLog
index b0c73b5cd88f75ea166ebf201ff2932d7d2ec552..fe54f7d2790189fcfa0f06838d705f4c4fdfc732 100644 (file)
--- a/net-misc/socat/ChangeLog
+++ b/net-misc/socat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/socat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.155 2015/03/08 07:58:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/ChangeLog,v 1.156 2015/04/24 23:11:21 vapier Exp $
+
+  25 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/socat-1.7.3.0-filan-build.patch, socat-1.7.3.0.ebuild:
+  Fix from Chromium OS for parallel build failures.
 
 *socat-9999 (08 Mar 2015)
 

diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 4515240ceee0d43038627745f042f61cef6e4922..9245ce8a4d0bc6cf200fc99f11dbdaa1e3f3af04 100644 (file)
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -3,17 +3,28 @@ Hash: SHA256
 
 AUX socat-1.7.2.1-long-long.patch 1764 SHA256 f343cb0e7365a90aa9c9ab001327e9dbcfcd56e2fd9835a5b8e216355b68006a SHA512 8095a5c4af58f9a2bd751d03b8262cac36c45be4a35fa277e9fd75511a2039d6853b5f004212fff4be56305b7935aace505bc55b6c4cd6b72a928b4b283772fe WHIRLPOOL 274273eb1985d2dff66d949fe8850bb06808c9b3ecb8b481a9cf1b4e46d283c124cc5239e542e937d1cc735b8d713a9588cb65fa0245375a1fd4a2a2bcac1995
 AUX socat-1.7.2.4-linux-3.17.patch 598 SHA256 03552aaedc5d581ae3742419b8516aae8f7c53d8085c424d1714ec4dd5ec3d2e SHA512 a999e219b045c8d60318f44e71739598f0fe75a937123803ab09afdde10476eed1375e524f747c7295ca5047a7ce0f27f5a981bab117fe29566f51218fcd9f79 WHIRLPOOL 44ccf7f94364e336e12454ed4aa85df9d0343b1d3a9533403c9514f118ffb2a490d614b87430bde90a163b5023d1890876c86cbb1ec90860a4f36545c0af4691
+AUX socat-1.7.3.0-filan-build.patch 1164 SHA256 1916386401f633c4d4e74aa61ca3039580cb69b6d89e69e73e0eaf9d463c1c15 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf WHIRLPOOL 187535c491bb3ba7b83df865077038a054c7aa7ba3a39ad3ba868db62db113bc876f4bf3da6cdffc5cfc03ac6f4ac5ceb5058cf8185622a3dce290772306fa41
 DIST socat-1.7.3.0.tar.bz2 474633 SHA256 0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04 SHA512 e567efd6cd31a517ffb1622983640396c6c1db93e8cc4be01b6047ac00b2fbd8474ffb9f96d2af33d24939cddb36ee4b71deb87a5a0101b1f1fb959fa436baad WHIRLPOOL 0ea897879e4d21d678e87c03d11c084a418b5ce179021f0f175db2f5877f250b6d56e42e38f6b9dbcdff7ce0d81970573d41b30a77b1768e659785792e5ae03f
 DIST socat-2.0.0-b7.tar.bz2 466584 SHA256 f3f964e69db2dc9957757185cfed498c6d245af6f5b808e4003c7e9b194bd340 SHA512 1f1e18a901842d98fcc63888ee126bd5d2cc6f2c239589a3b940a10886bc3ec97fef83a1ad3c3436b986e79e2e16e3cc28fd9ba6ac342866a20560b238274b62 WHIRLPOOL 439196b5a560fb859c41d8b2b8881f480168709895fab73b7637c9964c18cf2a1ec4e0dc6273732d783c557a3b0e433356a5c1d37278570aee011f694eec88b2
-EBUILD socat-1.7.3.0.ebuild 1133 SHA256 3ed918cd9e4b0aace945c5dbe0c33a930af5915ae07e647566b905352febb288 SHA512 b3f58b9ae236d66c6877f20b34dc4694755fbea19359cf6128baeccedf815e8509478524c2ea02c56ed74fd8ceaeec884840d93dfc743eb028aa80e4aaf5d269 WHIRLPOOL aace9bb4d89b5470bacfbf27f5d1f9e70bc5f15f0651ef2caea1ee51324adc01182c975c7b3a7f3e6467175e4777ce00c358abd71e69d4c15d2dc72db48757c2
+EBUILD socat-1.7.3.0.ebuild 1200 SHA256 dd37c00435f4f3ec452aba4c72527c80ec508c2af68ad83775b148e9738a3993 SHA512 1226bd45789535b232df9e154d620b7f7cb1e4e8731b39019789edafbf401fb9506781b9296ddb8804f2065783d0c9f6287eece407275e56100881f7871bf638 WHIRLPOOL 7b2ab8e2129c5d4d501a92d67506bf4694a9803b16fc8dcc62c60a308de890057e7d4a3a6762aabd0a9d40b16720e8c3813d5d6bd156cc328fea614e31a6a139
 EBUILD socat-2.0.0_beta7-r1.ebuild 1149 SHA256 74266b01aeeec4aa2ec2a4db130be350ab5c9517360f21627cab9255162716ec SHA512 e72e3a556aee662ca68c80a8681132f09191b52f2b6bd552e2a1a4bb04d409dee7cb5acb97d524cea7db8d2ef31b39458cd60402efbc162a0958f731685b936c WHIRLPOOL fc777a397f8475a4d3cac9d1208fbe89b0b0b097031589b664fb7416533703206fee896940630c1822c5b18fecec8f45b87ca786c8eee5936192cf4a20243d2d
 EBUILD socat-9999.ebuild 1069 SHA256 a7dd1fb78b10286b5e51d55e082bf1d8c2177d4dc864fee0b43bb6455318528a SHA512 0876c503512ee35ff57a8535226f6fcb98f52a009a231ccbfd7d863c19503a93713e5591c0579554f01ec1642f1533b1d50d60b2bd2023256a7ba209d7b68551 WHIRLPOOL 355373daf75cfbcf4819b64abf8361c7283fe5aab1c3b028d7845ce049596cb4e92be7ffc416761eb77da821f1dd8b1f1c04f143b68c8fbca54bfa0b84484a89
-MISC ChangeLog 19492 SHA256 0ff83c401e303485ee58529f4f4473a3dfcb6192b1b67225709ea9f3e228f906 SHA512 9e5d3ca078208a898dfd1ecc126e7278d44b47c1f9ce20a8d5fc816e4e6e2fb757f12bb6d5277f6ed65a43f0263de0f1c4596f8fb11afdd29c31335eec264a44 WHIRLPOOL c24af9c9d0eea0ee16925ba92cd1f9a565607e64ea0974068384cf1bf823aa38548a9b6b858de38f4de618aa9536bc6996915e4b1ba272af0a5f0107d47cb066
+MISC ChangeLog 19662 SHA256 4c8e94554caba05dda8f47f9de1a83b76d3fbb20b2a29635afb41b06a8b4a7f4 SHA512 46dd16789b20d785c735607c43fae227d9cbf3ed6fe4fc338aea5b5918c858c1ef151e645244de60ea5a5a2b99779d66bc3d1c4b91399e4ed3a647d0ac4a7c92 WHIRLPOOL 204152de0d8141fe248a54f8a33b83ff4b7f2c9f4b9e056c3c2351e32007149efb93ac0af1203e129c75188b579362da013dbb155ef37c1f4566c3649570e412
 MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT8ASkACgkQVWmRsqeSphMS2wCcC8iIbsP0U/wt5cSkap2ruyTx
-10UAn1ynf8hDT1OP2YV6HGJRI00hFhZA
-=0mwK
+iQIcBAEBCAAGBQJVOwXaAAoJEPGu1DbS6WIA0McP/iS0EfShsTyu3p9DfMWJjBR6
+ZAc6O7f20r8cSvfrnN/97H8W6Vpb1Xob5T9tt/twd78up2OfAHWZuauGYHehwRKN
+ywVyJKtYTl3GDv92hIzNcMhs8runFxRsQIBRauEnZ2Hf6qmAEtGjLoLx/NSAXSKi
+8mS8hXF0CPKbyIkOyX6lvMKaF73VNJFX305NkKjQCUax1u0jn//Nx4uQWRwpB3t3
+VdGKRiqb9oKlcNhMWBMP7a93dbjVc2b59N67VJ2UvITVAT4Uq74rdroCM80QrkfZ
++hilC+n2o0lgbahtYjtSJDHnkMVI23ix2nK1b+bqzjRS2WDuEAL47JF2tl22EX3W
+Njd7CW+0W9VI/SDuhDsU3ycE3/zbjqEUoEHxfS/gSwjz4CTzTdc819Nm1c6Ihle+
+mj2CwdjfpnPFl5qyQmXClO0r1MLSuu2X3Fg36hFEZ8qsLzfiC+NO0p9TKNvJ/aFc
+OW+zZQnKwzYTJPgceXQlXntu0zb+mQJCOkXUMd3ueEJSP+JcfMa2fNZN/bS7liRV
+HDzScFEaHrPVBp/47iLIzLuZHyhoXE8+ZQyTQARz2x8jklfIUJW/QfT4omwyuiSD
+5oeJsjkQQuZ11Lk7WIIz7XANAZ/K97a5tsn9c4I7fnV+qxrwJZuu17sm5wwRdYbo
+pGlXhmLfZTRdHc97RUZ7
+=vCfd
 -----END PGP SIGNATURE-----

diff --git a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
new file mode 100644 (file)
index 0000000..861c673
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
@@ -0,0 +1,30 @@
+From aae2ea107b543fa908956f2fdcdf6db684e4a2e6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 24 Apr 2015 23:06:37 -0400
+Subject: [PATCH] filan: fix depend list
+
+The link line contains more objects than the depend line; sync them like
+procan does.  Otherwise, parallel builds randomly fail.
+---
+ Makefile.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f2a6edb..0c00459 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
+ procan: $(PROCAN_OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
+ 
+-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
++FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
++filan: $(FILAN_OBJS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS)
+ 
+ libxio.a: $(XIOOBJS) $(UTLOBJS)
+       $(AR) r $@ $(XIOOBJS) $(UTLOBJS)
+-- 
+2.3.5
+

diff --git a/net-misc/socat/socat-1.7.3.0.ebuild b/net-misc/socat/socat-1.7.3.0.ebuild
index 1857cc957b7e33326c243c90e2b2c99b36325c2c..9a37af0a67b81eef98f948c8d0c348adaab43592 100644 (file)
--- a/net-misc/socat/socat-1.7.3.0.ebuild
+++ b/net-misc/socat/socat-1.7.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.3.0.ebuild,v 1.10 2015/03/08 07:58:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.3.0.ebuild,v 1.11 2015/04/24 23:11:21 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
@@ -29,6 +29,10 @@ DOCS=(
        BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
 )
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-filan-build.patch
+}
+
 src_configure() {
        filter-flags '-Wno-error*' #293324
        tc-export AR