summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-09-30 12:21:23 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:15 +0100
commita8e69714ae5bebfb30dcadbff528b2597321c4a2 (patch)
tree9144890519498eabe2886afb365bbe50dfcd4e8e /meta/recipes-support
parent3124512e5e7a4ef1f025d04e406ecec0300bcc35 (diff)
downloadpoky-a8e69714ae5bebfb30dcadbff528b2597321c4a2.tar.gz
libnl2: Fix a race on route/pktloc_syntax.h
At issue is that route/pktloc.c (not generated) depends on route/pktloc_syntax.h (generated). (From OE-Core rev: 7bec22c70598a5180f754bbbe2dfdd3db2843a64) Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch26
-rw-r--r--meta/recipes-support/libnl/libnl_2.0.bb3
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
new file mode 100644
index 0000000000..05d75dbaf3
--- /dev/null
+++ b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
@@ -0,0 +1,26 @@
1Upstream-Status: Inappropriate [configuration]
2
3libnl has progressed to 0.3.2 and there does not appear to be any
4"make -j" issues with this build after my limited testing on that
5newer version so we can assume this issue is fixed upstream
6
7Index: libnl-2.0/lib/Makefile.am
8===================================================================
9--- libnl-2.0.orig/lib/Makefile.am
10+++ libnl-2.0/lib/Makefile.am
11@@ -27,11 +27,15 @@ CLEANFILES = \
12 route/pktloc_grammar.c route/pktloc_grammar.h \
13 route/pktloc_syntax.c route/pktloc_syntax.h
14
15+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
16+
17 # Hack to avoid using ylwrap. It does not function correctly in combination
18 # with --header-file=
19+route/pktloc_grammar.h: route/pktloc_grammar.c
20 route/pktloc_grammar.c: route/pktloc_grammar.l
21 $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
22
23+route/pktloc_syntax.h: route/pktloc_syntax.c
24 route/pktloc_syntax.c: route/pktloc_syntax.y
25 $(YACC) -d $(YFLAGS) -o $@ $^
26
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index 0dfcaf63a7..5339846599 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -6,10 +6,11 @@ LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" 6LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
7 7
8DEPENDS = "flex-native bison-native" 8DEPENDS = "flex-native bison-native"
9PR = "r2" 9PR = "r3"
10 10
11SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \ 11SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
12 file://fix-makefile.patch \ 12 file://fix-makefile.patch \
13 file://fix-pktloc_syntax_h-race.patch \
13 " 14 "
14 15
15SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7" 16SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"