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)

(From OE-Core rev: b992c9e631bfb4888a20a13b7ebf3b5acf59edb5)

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>
This commit is contained in:
Tom Rini 2011-09-30 12:21:23 -05:00 committed by Richard Purdie
parent f7d5b31d6c
commit 53db004d24
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,26 @@
Upstream-Status: Inappropriate [configuration]
libnl has progressed to 0.3.2 and there does not appear to be any
"make -j" issues with this build after my limited testing on that
newer version so we can assume this issue is fixed upstream
Index: libnl-2.0/lib/Makefile.am
===================================================================
--- libnl-2.0.orig/lib/Makefile.am
+++ libnl-2.0/lib/Makefile.am
@@ -27,11 +27,15 @@ CLEANFILES = \
route/pktloc_grammar.c route/pktloc_grammar.h \
route/pktloc_syntax.c route/pktloc_syntax.h
+BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h
+
# Hack to avoid using ylwrap. It does not function correctly in combination
# with --header-file=
+route/pktloc_grammar.h: route/pktloc_grammar.c
route/pktloc_grammar.c: route/pktloc_grammar.l
$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
+route/pktloc_syntax.h: route/pktloc_syntax.c
route/pktloc_syntax.c: route/pktloc_syntax.y
$(YACC) -d $(YFLAGS) -o $@ $^

View File

@ -6,10 +6,11 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
DEPENDS = "flex-native bison-native"
PR = "r2"
PR = "r3"
SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
file://fix-makefile.patch \
file://fix-pktloc_syntax_h-race.patch \
"
SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"