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:05:40 +0000 |
commit | 6a390d540b9fdd8b318163842a5bfc8441bebc95 (patch) | |
tree | c126755558cf57bc8551a8635c64731604ca4098 /meta/recipes-support/libnl/libnl-2.0 | |
parent | 163f7bda55ff76da27ca28110bd965704c628303 (diff) | |
download | poky-6a390d540b9fdd8b318163842a5bfc8441bebc95.tar.gz |
libnl-2.0: move fix-pktloc_syntax_h-race.patch to libnl-2.0 subdirectory and merge with fix-makefile.patch
(From OE-Core rev: a4882cd6f98c5b3df80ba96536d94d9f556f77a2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 3e88fbddc1..0000000000 --- a/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | 12/03/2010 | ||
4 | |||
5 | add explicit rules for header files generated by lex and yacc, | ||
6 | otherwise the build of lib/route/pktloc.c may fail in a parallel | ||
7 | environment. | ||
8 | |||
9 | Signed-off-by: Qing He <qing.he@intel.com> | ||
10 | |||
11 | 12/06/2010 | ||
12 | |||
13 | the dependency rule should really read pktloc.lo instead of | ||
14 | pktloc.$(OBJEXT), since it's in a libtool setup. | ||
15 | |||
16 | Signed-off-by: Qing He <qing.he@intel.com> | ||
17 | |||
18 | diff --git a/lib/Makefile.am b/lib/Makefile.am | ||
19 | index 92a916e..e8b8ef3 100644 | ||
20 | --- a/lib/Makefile.am | ||
21 | +++ b/lib/Makefile.am | ||
22 | @@ -35,6 +35,10 @@ route/pktloc_grammar.c: route/pktloc_grammar.l | ||
23 | route/pktloc_syntax.c: route/pktloc_syntax.y | ||
24 | $(YACC) -d $(YFLAGS) -o $@ $^ | ||
25 | |||
26 | +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h | ||
27 | +route/pktloc_syntax.h: route/pktloc_syntax.c | ||
28 | +route/pktloc_grammar.h: route/pktloc_grammar.c | ||
29 | + | ||
30 | libnl_route_la_LDFLAGS = -version-info 2:0:0 | ||
31 | libnl_route_la_LIBADD = libnl.la | ||
32 | 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 0000000000..ea32e82b66 --- /dev/null +++ b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | libnl has progressed to 0.3.2 and there does not appear to be any | ||
4 | "make -j" issues with this build after my limited testing on that | ||
5 | newer version so we can assume this issue is fixed upstream | ||
6 | |||
7 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
8 | |||
9 | Index: libnl-2.0/lib/Makefile.am | ||
10 | =================================================================== | ||
11 | --- libnl-2.0.orig/lib/Makefile.am | ||
12 | +++ libnl-2.0/lib/Makefile.am | ||
13 | @@ -27,11 +27,16 @@ CLEANFILES = \ | ||
14 | route/pktloc_grammar.c route/pktloc_grammar.h \ | ||
15 | route/pktloc_syntax.c route/pktloc_syntax.h | ||
16 | |||
17 | +BUILT_SOURCES = route/pktloc_syntax.h route/pktloc_grammar.h | ||
18 | + | ||
19 | # Hack to avoid using ylwrap. It does not function correctly in combination | ||
20 | # with --header-file= | ||
21 | +route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h | ||
22 | +route/pktloc_grammar.h: route/pktloc_grammar.c | ||
23 | route/pktloc_grammar.c: route/pktloc_grammar.l | ||
24 | $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ | ||
25 | |||
26 | +route/pktloc_syntax.h: route/pktloc_syntax.c | ||
27 | route/pktloc_syntax.c: route/pktloc_syntax.y | ||
28 | $(YACC) -d $(YFLAGS) -o $@ $^ | ||
29 | |||