summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-11-03 17:52:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:40 +0000
commit6a390d540b9fdd8b318163842a5bfc8441bebc95 (patch)
treec126755558cf57bc8551a8635c64731604ca4098 /meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch
parent163f7bda55ff76da27ca28110bd965704c628303 (diff)
downloadpoky-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/fix-makefile.patch')
-rw-r--r--meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch32
1 files changed, 0 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 @@
1Upstream-Status: Pending
2
312/03/2010
4
5add explicit rules for header files generated by lex and yacc,
6otherwise the build of lib/route/pktloc.c may fail in a parallel
7environment.
8
9Signed-off-by: Qing He <qing.he@intel.com>
10
1112/06/2010
12
13the dependency rule should really read pktloc.lo instead of
14pktloc.$(OBJEXT), since it's in a libtool setup.
15
16Signed-off-by: Qing He <qing.he@intel.com>
17
18diff --git a/lib/Makefile.am b/lib/Makefile.am
19index 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 = \