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:44:14 +0100 |
commit | fd8e632832eb9e0712b2869a3625821aef9cb7e4 (patch) | |
tree | 60fda4ab36459bbbfdfbf09b4defd0b81f1086a9 /meta | |
parent | 8f6c991a302a96b82bc3132ba75713f2153477d1 (diff) | |
download | poky-fd8e632832eb9e0712b2869a3625821aef9cb7e4.tar.gz |
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
(From OE-Core rev: aaed4e92d79919e40c896536fcb4ff6567c9a755)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@ | |||
1 | Fix a missing dependency that can result in: | ||
2 | |||
3 | ../libpcap-1.8.1/grammar.y:78:10: fatal error: scanner.h: No such file or directory | ||
4 | |||
5 | Upstream-Status: Backport | ||
6 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
7 | |||
8 | From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001 | ||
9 | From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com> | ||
10 | Date: Tue, 21 Feb 2017 11:41:43 +0100 | ||
11 | Subject: [PATCH] Makefile.in: Fix missing dependency | ||
12 | |||
13 | --- | ||
14 | Makefile.in | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/Makefile.in b/Makefile.in | ||
18 | index 7044f043..f5d443ae 100644 | ||
19 | --- a/Makefile.in | ||
20 | +++ b/Makefile.in | ||
21 | @@ -465,7 +465,7 @@ grammar.h: grammar.c | ||
22 | $(MAKE) $(MAKEFLAGS) grammar.c; \ | ||
23 | fi | ||
24 | |||
25 | -grammar.o: grammar.c | ||
26 | +grammar.o: grammar.c scanner.h | ||
27 | $(CC) $(FULL_CFLAGS) -c grammar.c | ||
28 | |||
29 | 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 += " \ | |||
5 | file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \ | 5 | file://0001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch \ |
6 | file://0002-Add-missing-compiler_state_t-parameter.patch \ | 6 | file://0002-Add-missing-compiler_state_t-parameter.patch \ |
7 | file://disable-remote.patch \ | 7 | file://disable-remote.patch \ |
8 | file://fix-grammar-deps.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447" | 11 | SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447" |