diff options
author | Qing He <qing.he@intel.com> | 2010-12-03 11:12:55 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2010-12-03 13:15:15 -0800 |
commit | d2de3dc850960e4760b25ca0f5b413cbe226440a (patch) | |
tree | 8284aa0826c38feb6785ee04f6ba81e85105b8ce /meta | |
parent | b82ef69ca3030bd82d38cf077cf311ec65bead72 (diff) | |
download | poky-d2de3dc850960e4760b25ca0f5b413cbe226440a.tar.gz |
libnl: fix parallel make
lex/yacc generated header file should be explicitly listed for
makefile dependency
also add flex-native and bison-native for the recipe
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch | 22 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl_2.0.bb | 7 |
2 files changed, 27 insertions, 2 deletions
diff --git a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch new file mode 100644 index 0000000000..d9f00be2b6 --- /dev/null +++ b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | 12/03/2010 | ||
2 | |||
3 | add explicit rules for header files generated by lex and yacc, | ||
4 | otherwise the build of lib/route/pktloc.c may fail in a parallel | ||
5 | environment. | ||
6 | |||
7 | Signed-off-by: Qing He <qing.he@intel.com> | ||
8 | diff --git a/lib/Makefile.am b/lib/Makefile.am | ||
9 | index 92a916e..e8b8ef3 100644 | ||
10 | --- a/lib/Makefile.am | ||
11 | +++ b/lib/Makefile.am | ||
12 | @@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l | ||
13 | route/pktloc_syntax.c: route/pktloc_syntax.y | ||
14 | $(YACC) -d $(YFLAGS) -o $@ $^ | ||
15 | |||
16 | +route/pktloc.$(OBJEXT): route/pktloc_syntax.h route/pktloc_grammar.h | ||
17 | +route/pktloc_syntax.h: route/pktloc_syntax.c | ||
18 | +route/pktloc_grammar.h: route/pktloc_grammar.c | ||
19 | + | ||
20 | libnl_route_la_LDFLAGS = -version-info 2:0:0 | ||
21 | libnl_route_la_LIBADD = libnl.la | ||
22 | libnl_route_la_SOURCES = \ | ||
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb index fa96215f0f..e275670b51 100644 --- a/meta/recipes-support/libnl/libnl_2.0.bb +++ b/meta/recipes-support/libnl/libnl_2.0.bb | |||
@@ -6,9 +6,12 @@ PRIORITY = "optional" | |||
6 | LICENSE = "LGPLv2.1" | 6 | LICENSE = "LGPLv2.1" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc" |
8 | 8 | ||
9 | PR = "r0" | 9 | DEPENDS = "flex-native bison-native" |
10 | PR = "r1" | ||
10 | 11 | ||
11 | SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz" | 12 | SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz \ |
13 | file://fix-makefile.patch \ | ||
14 | " | ||
12 | 15 | ||
13 | inherit autotools pkgconfig | 16 | inherit autotools pkgconfig |
14 | 17 | ||