summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-11-03 17:52:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-30 16:38:11 +0000
commit2202d845abe3542507aa772b9ceb6d41062175d1 (patch)
tree3d79a5723cda2e1e03b4f27fc0d056af8d9e0ddb
parenta55d8c6aa4168cec9cf209ddbaf3045347fb7691 (diff)
downloadpoky-2202d845abe3542507aa772b9ceb6d41062175d1.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) (From OE-Core rev: 69701f7eaec6405fe2208d2412aebaf2db5ce606) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch32
-rw-r--r--meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch (renamed from meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch)5
-rw-r--r--meta/recipes-support/libnl/libnl_2.0.bb8
3 files changed, 8 insertions, 37 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 = \
diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
index 05d75dbaf3..ea32e82b66 100644
--- a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch
+++ b/meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch
@@ -4,11 +4,13 @@ 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 4"make -j" issues with this build after my limited testing on that
5newer version so we can assume this issue is fixed upstream 5newer version so we can assume this issue is fixed upstream
6 6
7Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
8
7Index: libnl-2.0/lib/Makefile.am 9Index: libnl-2.0/lib/Makefile.am
8=================================================================== 10===================================================================
9--- libnl-2.0.orig/lib/Makefile.am 11--- libnl-2.0.orig/lib/Makefile.am
10+++ libnl-2.0/lib/Makefile.am 12+++ libnl-2.0/lib/Makefile.am
11@@ -27,11 +27,15 @@ CLEANFILES = \ 13@@ -27,11 +27,16 @@ CLEANFILES = \
12 route/pktloc_grammar.c route/pktloc_grammar.h \ 14 route/pktloc_grammar.c route/pktloc_grammar.h \
13 route/pktloc_syntax.c route/pktloc_syntax.h 15 route/pktloc_syntax.c route/pktloc_syntax.h
14 16
@@ -16,6 +18,7 @@ Index: libnl-2.0/lib/Makefile.am
16+ 18+
17 # Hack to avoid using ylwrap. It does not function correctly in combination 19 # Hack to avoid using ylwrap. It does not function correctly in combination
18 # with --header-file= 20 # with --header-file=
21+route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
19+route/pktloc_grammar.h: route/pktloc_grammar.c 22+route/pktloc_grammar.h: route/pktloc_grammar.c
20 route/pktloc_grammar.c: route/pktloc_grammar.l 23 route/pktloc_grammar.c: route/pktloc_grammar.l
21 $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ 24 $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
diff --git a/meta/recipes-support/libnl/libnl_2.0.bb b/meta/recipes-support/libnl/libnl_2.0.bb
index 5339846599..f78386710d 100644
--- a/meta/recipes-support/libnl/libnl_2.0.bb
+++ b/meta/recipes-support/libnl/libnl_2.0.bb
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
8DEPENDS = "flex-native bison-native" 8DEPENDS = "flex-native bison-native"
9PR = "r3" 9PR = "r3"
10 10
11SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \ 11SRC_URI = "\
12 file://fix-makefile.patch \ 12 http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
13 file://fix-pktloc_syntax_h-race.patch \ 13 file://fix-pktloc_syntax_h-race.patch \
14 " 14"
15 15
16SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7" 16SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
17SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c" 17SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"