[gentoo-commits] repo/gentoo:master commit in: net-libs/daq/files/, net-libs/daq/

[Jeroen Roovers]

commit:     ec97c7ca0bf2b577b0555fa9ffa30d29b89051b5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 18 14:15:57 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Dec 18 14:16:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec97c7ca

net-libs/daq: Fix parallel make again

Fixes: https://bugs.gentoo.org/673390
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/daq/daq-2.0.6.ebuild                       |  3 +++
 net-libs/daq/files/daq-2.0.6-parallel-grammar.patch | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/net-libs/daq/daq-2.0.6.ebuild b/net-libs/daq/daq-2.0.6.ebuild
index 42db1344051..5b5742cc309 100644
--- a/net-libs/daq/daq-2.0.6.ebuild
+++ b/net-libs/daq/daq-2.0.6.ebuild
@@ -27,6 +27,9 @@ DEPEND="
 	pcap? ( ${PCAP_DEPEND} )
 "
 RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390
+)
 
 src_prepare() {
 	default

diff --git a/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch b/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch
new file mode 100644
index 00000000000..1911caf72ea
--- /dev/null
+++ b/net-libs/daq/files/daq-2.0.6-parallel-grammar.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/673390
+
+--- a/sfbpf/Makefile.am
++++ b/sfbpf/Makefile.am
+@@ -43,13 +43,14 @@
+ libsfbpf_la_LDFLAGS = -version-info 0:1:0 @XCCFLAGS@
+ 
+ # use of $@ and $< here is a GNU idiom that borks BSD
+-sf_scanner.c: $(srcdir)/scanner.l
++sf_scanner.c: $(srcdir)/scanner.l tokdefs.h
+ 	@rm -f $(srcdir)/sf_scanner.c
+ 	$(srcdir)/runlex.sh $(V_LEX) -osf_scanner.c $(srcdir)/scanner.l
+ 
+ sf_scanner.o: sf_scanner.c tokdefs.h
+ 
+ tokdefs.h: sf_grammar.c
++
+ sf_grammar.c: $(srcdir)/grammar.y
+ 	@rm -f sf_grammar.c tokdefs.h
+ 	$(V_YACC) -d $(srcdir)/grammar.y