diff options
author | Ross Burton <ross.burton@intel.com> | 2017-06-16 13:32:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-23 11:43:39 +0100 |
commit | aaed4e92d79919e40c896536fcb4ff6567c9a755 (patch) | |
tree | 188018477c1f83f8df90c4855bb75d8b6ff550da /meta/recipes-connectivity | |
parent | 2bfc7be412da501d8a9138a3dde33636c5fe2616 (diff) | |
download | openembedded-core-aaed4e92d79919e40c896536fcb4ff6567c9a755.tar.gz openembedded-core-aaed4e92d79919e40c896536fcb4ff6567c9a755.tar.bz2 openembedded-core-aaed4e92d79919e40c896536fcb4ff6567c9a755.zip |
libpcap: apply fix from upstream to fix build race
../libpcap-1.8.1/grammar.y:78:10:
fatal error: scanner.h: No such file or directory
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch | 29 | ||||
-rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch b/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch new file mode 100644 index 0000000000..f40e655c44 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap/fix-grammar-deps.patch @@ -0,0 +1,29 @@ +Fix a missing dependency that can result in: + +../libpcap-1.8.1/grammar.y:78:10: fatal error: scanner.h: No such file or directory + +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001 +From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com> +Date: Tue, 21 Feb 2017 11:41:43 +0100 +Subject: [PATCH] Makefile.in: Fix missing dependency + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 7044f043..f5d443ae 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -465,7 +465,7 @@ grammar.h: grammar.c + $(MAKE) $(MAKEFLAGS) grammar.c; \ + fi + +-grammar.o: grammar.c ++grammar.o: grammar.c scanner.h + $(CC) $(FULL_CFLAGS) -c grammar.c + + gencode.o: $(srcdir)/gencode.c grammar.h scanner.h diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb index 1893e675b2..13dfbd67a8 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb @@ -5,6 +5,7 @@ SRC_URI += " \ file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \ file://0002-Add-missing-compiler_state_t-parameter.patch \ file://disable-remote.patch \ + file://fix-grammar-deps.patch \ " SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447" |