Fix parallel builds #511892 by eroen. Fix by Shawn Wallace for cross-compiling.

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

5 files changed, 115 insertions, 23 deletions

diff --git a/net-libs/daq/ChangeLog b/net-libs/daq/ChangeLog
index 55cf4a21e2b5..e8911a296ed4 100644
--- a/net-libs/daq/ChangeLog
+++ b/net-libs/daq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/daq
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.25 2014/02/03 07:33:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/ChangeLog,v 1.26 2014/06/03 16:54:59 vapier Exp $
+
+  03 Jun 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/daq-2.0.2-libpcap-check.patch, +files/daq-2.0.2-parallel-grammar.patch,
+  daq-2.0.2.ebuild:
+  Fix parallel builds #511892 by eroen. Fix by Shawn Wallace for cross-
+  compiling.
 
 *daq-2.0.2 (03 Feb 2014)
 
diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 062d575463ac..2d97ffa897a8 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX daq-2.0.2-libpcap-check.patch 1000 SHA256 10f12cc3f73e12d09f4d377e8bb5141fe388131552815f608a4a8ab7d7f14c1f SHA512 9382026f9d93ae922299ae25a98b6e38c2bbb0619009f73feef6a7ce1ce499b5bde886323be80c7863cf8ed0c245f2b04d244166073f2435c6db915ca5afa17f WHIRLPOOL 685e66d9dc945f1abcbc1bad6c6023d3e3c10296e403361ef374698b408a98f7b138a0264298b8741ee831daa9d5e9a7b39ee3a21f0fa60ceef09129c2cb6236
+AUX daq-2.0.2-parallel-grammar.patch 1355 SHA256 7494c8c8123b95221dd86835dc95bfae6beff40ec3609e05f911149560eab2e1 SHA512 18ba4e4cdaf9551504d201b76f3983e3eb33a267c2f5952006e9297e7c5de88ff1464adb103ffce9dba99339bdbbffc616ff6b659ce20179c55a1bb0173b4483 WHIRLPOOL 0f52257399d9b1eadb912248ed412ed4ec5aed02da09f75b4227a5fbeb177d999b3d2f826543a87bb383f06abf0380614efd13815bd2075bb128e0d318d52e4b
 DIST daq-0.6.2.tar.gz 451581 SHA256 0159865b5dc127ed2faf8d6732d781939f27e38b7c7deabcd369a22ea9e42f26 SHA512 da19034f210d9c202f5e3ba7ddf60645498ed8bdaf28410811922ebb1338b56c55c8e992e46e1c7b9b89de6148b471129826a02ab2a45c7232bc4091a4e53125 WHIRLPOOL 01e7b47e27b71d11648936911bb9bd2657b387fd15eb41f5939b23b3e2da9753d66165eddd0831ba4e827ab67ee2f61ee963cb98788ad4a7ca9d03f921031ff6
 DIST daq-2.0.0.tar.gz 480030 SHA256 fbafc8e362a96fcadc69731f91203ef90845507aae0a4774d5c2825e9d2c1c38 SHA512 aa79e06473592c0ee57a3a2da60f01f35e6268a126fcb3a992ee7c6da48a079cf359db7439be3778997e774c340630d768712c9efea10c570feb4961f9a00b3c WHIRLPOOL c1eb41df6718a7ece0da95599f78f080a32337a3522181ad31db46a0285d584dfd46e2fffce5e73ef3ba0409bd033b59ac0b272df1d7ee104f6160edc69bc8be
 DIST daq-2.0.2.tar.gz 474447 SHA256 d65d1e67c4994e02c3142c49a648642e780b7e3d942b4a51f605309beac269a8 SHA512 b2a47e174155f21cb1c6f1e1c431ea7cca6aa9f7371228e77def3c526a67fd42d0e26e4c94263195e041b203cdf0c2aaef14f9035afb23dde0bd5df3bf422cbd WHIRLPOOL 3902ccda294c5967c509971abbbfb787f46792cd6bc286097e1d8b88c5d0f25c29019c918d41cabb8d52e4fcb1d99ae60e6eea3319aea2ee46aa8aa9b117e738
 EBUILD daq-0.6.2-r1.ebuild 2008 SHA256 ffb451043ea6824824ab21d09c85f2e284f13b88279a4eab6e0e9522b7515d0e SHA512 21bdc18f8ef572b152680fe1dc16b0fc8f8cdbcf541206befeb6e2ff0e560bf2aeda53a05af9ac6ea1b43d75c9af0d8803a823dbfc499d2a51dd064bfe108a25 WHIRLPOOL 036eb36545b69c3afce8b3d15a861f2785b901d6a76b7e5727f5c880a6977c196e7b7eba61846363b128bf96e71238b861f6074161b3da8f0fd767cd6128b057
 EBUILD daq-0.6.2.ebuild 2035 SHA256 81ee24ec7a96f07ff7c9b4ee3d7d4de28f1ef8786dce1359d56934180b4798c2 SHA512 0db8ef53177ae9aca4343b119c9f56a6c344ee03f75d3475cb2505253ba2aa662e6d77250a056098ab71f41db68225953b4f66346687831afb4348150838c003 WHIRLPOOL 49fa21b5fc3e9d4fa5ed53ec8b3926068b99465ab55a6f87854deb7c95ab8073fefacda77056f295a1a9fd94cb134ec7572adfd4ec5db9005c1d256dd5c9f293
 EBUILD daq-2.0.0.ebuild 2004 SHA256 cbaf150fe96f99178196439c9c20972c05470b7ad9c01dcfbecfed2f5c9ecb20 SHA512 4ab220b3487e502472d0c56defb5a4693ada33484c4b1b31fd47d508adf26c044d1b14de8b19f57f0bbf4960a770b185ebd8e12e227481c434813d04d44fd73a WHIRLPOOL 5c39c078db31d49c33bd38b7790545e5b575cd400836ca48b5515614e5af57e4a5588c31090f278fb863409e77a0f58ff37ce3e42f95fad6e99ad9543df4f620
-EBUILD daq-2.0.2.ebuild 2004 SHA256 8648dbaf41bb6d91c5efa4dc1c8ee8a5c666e141aa957b83f9ca2f71d0b4e1ef SHA512 fbb11a9ce418cba7274f5bb02df5bdd5bd0f5f4cbf381cd6e63332e551422e68702cd5e396d89dfa28809e539b194e1eb184c660023ce5039b9627b9689419f0 WHIRLPOOL bcac11df5841eb277602f55291917c20da924cb8964ed0ebf7f40738d43919e2c0b83bea7713f4ef5b90318cebb106317c21d512db89b1a4b7bfd4e0d4a7cac3
-MISC ChangeLog 3235 SHA256 7ad84a335ca0e4a8936c6d4676d4f1ff83a30b1e3e18f62a1ed985e7a8000083 SHA512 d020a042e3043c6d248ffc4419e7106e8a95b49eb899b453cd3d96505794ed4b9888fb257cd3e7053644ce8fffc7167741a9473dc81b6b3bf039aa506e1e6ba8 WHIRLPOOL 62a478250ccadc2022bc1f5c7c7ea6ee3df0127c2f462baed4b8f07bfd20e50bcbc5d9e5c558f5e6332c719502e9defb61f6c855a70a4c6b518bc02160f49e67
+EBUILD daq-2.0.2.ebuild 2290 SHA256 3440e9d5af80a045552410204b9e04dd85700b09d304a2015a6aaeb196d5c251 SHA512 a6763f75f20c65447bce2d30a4876034e825ef13951c94eb2296ada8469997e42be5333d1947191305b6c6e8b7b6f796c51a4cef4f9fdadd95f2c26bbd9ab869 WHIRLPOOL 05b3c22587ff181de69320285fa616f64148c2e0aa6a5a83173c2913a36eaca384518688ce813cbfb6fcf678fb36081d75afcefd6a9d46cb4bd047392b0c11f0
+MISC ChangeLog 3473 SHA256 c2a727609ed14c1a334029d3b7a7872523b6462109f7568d889dcb147516cc2c SHA512 9d4a48839c394e94f96b0c694d5b7916103556565025c30b519ef2f370115b1fa7349b7b3dd6b90fec287e754b829942551420ae55bf6de72396bceb47c2ab0c WHIRLPOOL a3b56f328cbeac6cae0329185aa748f343bd6f19e12820ae00c1532b2028491f3b3d7561904b9c83de8d8c2ef527393e4fc5d1568b39c93a9c2edc777d9b9a4d
 MISC metadata.xml 1438 SHA256 ebc4236c947de55691e1ef1ce3b51b5b676e0725440b39a224f719d5c04a7000 SHA512 2d0b6e7801eb3d617c5c76b93ba86003b2f630f1143993918f2cec284a22fd7980e9a0a185f38fc31f771f657a8ecdf3da4f940b40eb418db3bb94100289d672 WHIRLPOOL 137d95c8bb539e54f0ff24f327eb1ab8868a2c2079510ebe35e8eedfc0967d2f560fa074ba46ba059157561c86557c2217108d35fbd741444722b6daf5958a01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS70YqAAoJENsjoH7SXZXjnFoQAKy1611P+8tWgmVJlVLoy1mq
-Tl1jNJ0BDRi/hlzaT3MqmrqdafMyt/rxfCMqsf/YBDNJuxP+o+HMhDgjkRcE83HU
-xk7B5wBEdnMz+HLyq/ytoj7SyDe+CsllEvizlX9jySctxajzBdYWuQnM2opd+6q2
-Bqp8r4cE/dodW7cCAiO6O4EsyBb/kfhJH/R9dJQ+udnVNiZZlLxgXa+O0jbuldIr
-m+UVpAm650gEoOJhd00Ad9BENqENn7/nhcxSu1iQxo6ZPK/y27iKdWrsrwLyv/Ge
-JHtkzyloMUV6N9eImb/Ctjokdo9kf9nzkiKB75X0fv0tph1xteSwNO3nkMVb/Wgs
-kzuOqbNspSt2nVt+V6Y1gT4gv7sk03lMNLcgxZqhTB+oigA4hrqGrZ1ePeq8pt0V
-JjWvzLyc6EPSsTj2XaH50Knw5/g1lYwnpsMcN9KX7uWhqvk9WSw/ypkTH1K6qrLk
-B2IyLSHfJH81iKnWPA1WaM3kMoNj/scnhKmduWz0/b3ILovbCuyhToC12rrOPLuJ
-jP0BsjIPp+e1fpjXT0400N+74dCgQXLakZsfethti301mO7ZHaeJiwUsRmdEzVEm
-skXL2cuI6KNau19c4Tcfiir0gHAaHnyu7SPpcr6HlfABOlL6t70ZtF2WnjEkecpC
-n3+WGV2W0SlGcsS55qNq
-=VVhx
+iQIcBAEBCAAGBQJTjf3nAAoJEPGu1DbS6WIAUs4P/0QOyGbAqJeBXbWYDxjQ2Ks8
+nitCAB7tmn+QEgkHbkHCusG5iAhQ7LrvmiMImPjaiiXYEA8iooicIuH4sEWzcU3s
+Ox+8/gbk6xeTZiVfF0sU75nPjqcaylCrumLOfDihq55sYLIH+oCfDRFjS0yqep/R
+rvi2nNVSD7KLAYyGyaa2htbl2FNaCyygXSOonMKdDwlqblH2EAQ3VxOyLJ9y/gAx
+XN5BKmhkh23ixa0u0w20R9wZop47u5x7+EApleMDZPtYXPudVmTxwLVNV2ijrER6
+YcNisj8Yc/Jx2e7mXzMl3vTdJ1xDvavpp2g/Y/sTPEukFwwev7oZWl30m6vD7rcK
+J9zPmYdGuhg/NiX4rBJRKBwxjgcH075xssH6FqobO5R0ql+88ChsBE8cybR6oFvE
+PmlUxQ4WUvv//07kYFuJHZE94zTpSb5xERb8pSxRDDEfGIT0BI44rMmTzH0GI6X2
+EOSK7iNkHywbwxMdXHAjP1PxqG4IvL5NbNEdmBEIXb4xTo4S737lvLOqS8knHnUQ
+kzXKvjHN9x74uoI0YsVn94W5jGbIf481WpX6AQ0FiuWxW3WPUYpHvfMG/6D5UMAh
+twbrUXt4+NNVC4gZwKov1ZrqLffozHSrXWseuTGvURYs1nQBEeIueBl+T7ip5mQQ
+kJ/igOmq2Gp/I9virErv
+=nD/4
 -----END PGP SIGNATURE-----
diff --git a/net-libs/daq/daq-2.0.2.ebuild b/net-libs/daq/daq-2.0.2.ebuild
index f4800613ac53..75500cac7b04 100644
--- a/net-libs/daq/daq-2.0.2.ebuild
+++ b/net-libs/daq/daq-2.0.2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.1 2014/02/03 07:33:22 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/daq/daq-2.0.2.ebuild,v 1.2 2014/06/03 16:54:59 vapier Exp $
 
 EAPI="4"
 
-inherit eutils multilib
+inherit eutils multilib autotools
 
 DESCRIPTION="Data Acquisition library, for packet I/O"
 HOMEPAGE="http://www.snort.org/"
 SRC_URI="http://www.snort.org/downloads/2778 -> ${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
@@ -22,10 +23,18 @@ DEPEND="pcap? ( >=net-libs/libpcap-1.0.0 )
 		ipq? ( dev-libs/libdnet
 			>=net-firewall/iptables-1.4.10
 			net-libs/libnetfilter_queue )"
-
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel-grammar.patch #511892
+	epatch "${FILESDIR}"/${P}-libpcap-check.patch
+	eautoreconf
+}
+
 src_configure() {
+	# We forced libpcap to 1.x, so we can set this cache var so
+	# cross-compiling doesn't break on us.
+	daq_cv_libpcap_version_1x=yes \
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable pcap pcap-module) \
@@ -44,10 +53,10 @@ src_install() {
 
 	# Remove unneeded .la files
 	rm \
-		"${D}"usr/$(get_libdir)/daq/*.la \
-		"${D}"usr/$(get_libdir)/libdaq*.la \
-		"${D}"usr/$(get_libdir)/libsfbpf.la \
-	|| die
+		"${ED}"usr/$(get_libdir)/daq/*.la \
+		"${ED}"usr/$(get_libdir)/libdaq*.la \
+		"${ED}"usr/$(get_libdir)/libsfbpf.la \
+		|| die
 
 	# If not using static-libs don't install the static libraries
 	# This has been bugged upstream
diff --git a/net-libs/daq/files/daq-2.0.2-libpcap-check.patch b/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
new file mode 100644
index 000000000000..b68a8a4865f1
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.2-libpcap-check.patch
@@ -0,0 +1,36 @@
+fix the libpcap check so that people can set the cache version when cross-compiling
+
+patch by Shawn Wallace <sjwallace@google.com>
+
+--- a/m4/sf.m4
++++ b/m4/sf.m4
+@@ -135,7 +135,7 @@
+         echo
+         exit 1
+     fi
+-    AC_MSG_CHECKING([for libpcap version >= $1])
++    AC_CACHE_CHECK([for libpcap version >= $1], [daq_cv_libpcap_version_1x], [
+     AC_RUN_IFELSE(
+     [AC_LANG_PROGRAM(
+     [[
+@@ -147,16 +147,13 @@
+         if (strcmp(pcap_version, $1) < 0)
+             return 1;
+     ]])],
+-    [libpcap_version_1x="yes"],
+-    [libpcap_version_1x="no"])
+-    if test "x$libpcap_version_1x" = "xno"; then
+-        AC_MSG_RESULT(no)
++    [daq_cv_libpcap_version_1x="yes"],
++    [daq_cv_libpcap_version_1x="no"])])
++    if test "x$daq_cv_libpcap_version_1x" = "xno"; then
+         echo
+         echo "    ERROR!  Libpcap library version >= $1  not found."
+         echo "    Get it from http://www.tcpdump.org"
+         echo
+         exit 1
+-    else
+-        AC_MSG_RESULT(yes)
+     fi
+ ])
+
diff --git a/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch b/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
new file mode 100644
index 000000000000..42e0f93791ac
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.2-parallel-grammar.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/511892
+
+the scanner needs the generated header file, so make sure it's listed as a
+dependency.  else you see a failure:
+	$ cd sfbpf
+	$ make clean
+	$ make sf_scanner.lo
+	<missing tokdefs.h>
+we'd like to list it as a dep of the object, but automake can use generated
+file names, so it's not easy to list that.
+
+we can't have both of the outputs from grammar.y run the lex, otherwise we
+hit random parallel build failures:
+	$ cd sfbpf
+	$ make clean
+	$ make tokdefs.h sf_grammar.c -j
+	<run yacc twice & fail>
+
+--- a/sfbpf/Makefile.am
++++ b/sfbpf/Makefile.am
+@@ -43,14 +43,16 @@
+ libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
+ 
+ # use of $@ and $< here is a GNU idiom that borks BSD
+-${builddir}/sf_scanner.c: ${srcdir}/scanner.l
++${builddir}/sf_scanner.c: ${srcdir}/scanner.l ${builddir}/tokdefs.h
+ 	@rm -f ${builddir}/sf_scanner.c
+ 	${srcdir}/runlex.sh $(V_LEX) -osf_scanner.c ${srcdir}/scanner.l
+ 
+-${builddir}/tokdefs.h ${builddir}/sf_grammar.c: ${srcdir}/grammar.y
++${builddir}/sf_grammar.c: ${srcdir}/grammar.y
+ 	@rm -f ${builddir}/sf_grammar.c ${builddir}/tokdefs.h
+ 	$(V_YACC) -d ${srcdir}/grammar.y
+ 	mv y.tab.c sf_grammar.c
+ 	mv y.tab.h tokdefs.h
+ 
++${builddir}/tokdefs.h: ${builddir}/sf_grammar.c ; @true
++
+ CLEANFILES = ${builddir}/sf_scanner.c ${builddir}/sf_grammar.c ${builddir}/tokdefs.h ${builddir}/sf_scanner.h