summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-12-03 11:12:55 +0800
committerSaul Wold <sgw@linux.intel.com>2010-12-03 13:15:15 -0800
commitd2de3dc850960e4760b25ca0f5b413cbe226440a (patch)
tree8284aa0826c38feb6785ee04f6ba81e85105b8ce
parentb82ef69ca3030bd82d38cf077cf311ec65bead72 (diff)
downloadopenembedded-core-d2de3dc850960e4760b25ca0f5b413cbe226440a.tar.gz
openembedded-core-d2de3dc850960e4760b25ca0f5b413cbe226440a.tar.bz2
openembedded-core-d2de3dc850960e4760b25ca0f5b413cbe226440a.tar.xz
openembedded-core-d2de3dc850960e4760b25ca0f5b413cbe226440a.zip
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>
-rw-r--r--meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch22
-rw-r--r--meta/recipes-support/libnl/libnl_2.0.bb7
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 000000000..d9f00be2b
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
@@ -0,0 +1,22 @@
+12/03/2010
+
+add explicit rules for header files generated by lex and yacc,
+otherwise the build of lib/route/pktloc.c may fail in a parallel
+environment.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 92a916e..e8b8ef3 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l
+ route/pktloc_syntax.c: route/pktloc_syntax.y
+ $(YACC) -d $(YFLAGS) -o $@ $^
+
++route/pktloc.$(OBJEXT): route/pktloc_syntax.h route/pktloc_grammar.h
++route/pktloc_syntax.h: route/pktloc_syntax.c
++route/pktloc_grammar.h: route/pktloc_grammar.c
++
+ libnl_route_la_LDFLAGS = -version-info 2:0:0
+ libnl_route_la_LIBADD = libnl.la
+ 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 fa96215f0..e275670b5 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"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
-PR = "r0"
+DEPENDS = "flex-native bison-native"
+PR = "r1"
-SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz"
+SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${PN}-${PV}.tar.gz \
+ file://fix-makefile.patch \
+ "
inherit autotools pkgconfig