diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2011-11-03 17:52:42 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-07 14:03:37 +0000 |
| commit | a4882cd6f98c5b3df80ba96536d94d9f556f77a2 (patch) | |
| tree | 7e592fb192aa7713942ce6b7e664df3dfc282e8a /meta/recipes-support/libnl/libnl-2.0 | |
| parent | addcb5106ca0b1849299d6ad4e734135da29b0ab (diff) | |
| download | openembedded-core-a4882cd6f98c5b3df80ba96536d94d9f556f77a2.tar.gz openembedded-core-a4882cd6f98c5b3df80ba96536d94d9f556f77a2.tar.bz2 openembedded-core-a4882cd6f98c5b3df80ba96536d94d9f556f77a2.tar.xz openembedded-core-a4882cd6f98c5b3df80ba96536d94d9f556f77a2.zip | |
libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-support/libnl/libnl-2.0')
| -rw-r--r-- | meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch | 29 |
2 files changed, 29 insertions, 32 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 deleted file mode 100644 index 3e88fbddc..000000000 --- a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-Status: Pending - -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> - -12/06/2010 - -the dependency rule should really read pktloc.lo instead of -pktloc.$(OBJEXT), since it's in a libtool setup. - -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.lo: 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/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch new file mode 100644 index 000000000..ea32e82b6 --- /dev/null +++ b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch @@ -0,0 +1,29 @@ +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 + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> + +Index: libnl-2.0/lib/Makefile.am +=================================================================== +--- libnl-2.0.orig/lib/Makefile.am ++++ libnl-2.0/lib/Makefile.am +@@ -27,11 +27,16 @@ 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.lo: route/pktloc_syntax.h route/pktloc_grammar.h ++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 $@ $^ + |