Skip to contentSkip to conversation

fix occasional build failure of libnl

PATCH New Qing He 1 participant 2 messages Dec 3, 2010

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/1 libnl: fix parallel make

In reply to Qing He

lex/yacc generated header file should be explicitly listed for makefile dependency

also add flex-native and bison-native for the recipe

---
 .../libnl/libnl-2.0/fix-makefile.patch             |   22 ++++++++++++++++++++
 meta/recipes-support/libnl/libnl_2.0.bb            |    7 ++++-
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch new file +22 -0
new file mode 100644
index 0000000..d9f00be
@@ -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 <[email protected]>
+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 = \
meta/recipes-support/libnl/libnl_2.0.bb +5 -2
index fa96215..e275670 100644
@@ -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
 
Signature · 1 line
1.7.0

Qing He

author
#0 lore raw

cover fix occasional build failure of libnl

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He
---

Qing He (1):
libnl: fix parallel make

 .../libnl/libnl-2.0/fix-makefile.patch             |   22 ++++++++++++++++++++
 meta/recipes-support/libnl/libnl_2.0.bb            |    7 ++++-
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch