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>
This commit is contained in:
parent
a55d8c6aa4
commit
2202d845ab
|
@ -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 = \
|
|
|
@ -4,11 +4,13 @@ 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
|
"make -j" issues with this build after my limited testing on that
|
||||||
newer version so we can assume this issue is fixed upstream
|
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
|
Index: libnl-2.0/lib/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libnl-2.0.orig/lib/Makefile.am
|
--- libnl-2.0.orig/lib/Makefile.am
|
||||||
+++ libnl-2.0/lib/Makefile.am
|
+++ libnl-2.0/lib/Makefile.am
|
||||||
@@ -27,11 +27,15 @@ CLEANFILES = \
|
@@ -27,11 +27,16 @@ CLEANFILES = \
|
||||||
route/pktloc_grammar.c route/pktloc_grammar.h \
|
route/pktloc_grammar.c route/pktloc_grammar.h \
|
||||||
route/pktloc_syntax.c route/pktloc_syntax.h
|
route/pktloc_syntax.c route/pktloc_syntax.h
|
||||||
|
|
||||||
|
@ -16,6 +18,7 @@ Index: libnl-2.0/lib/Makefile.am
|
||||||
+
|
+
|
||||||
# Hack to avoid using ylwrap. It does not function correctly in combination
|
# Hack to avoid using ylwrap. It does not function correctly in combination
|
||||||
# with --header-file=
|
# 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.h: route/pktloc_grammar.c
|
||||||
route/pktloc_grammar.c: route/pktloc_grammar.l
|
route/pktloc_grammar.c: route/pktloc_grammar.l
|
||||||
$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
|
$(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
|
|
@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b41e13261a330ee784153ecbb6a82bc"
|
||||||
DEPENDS = "flex-native bison-native"
|
DEPENDS = "flex-native bison-native"
|
||||||
PR = "r3"
|
PR = "r3"
|
||||||
|
|
||||||
SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \
|
SRC_URI = "\
|
||||||
file://fix-makefile.patch \
|
http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
|
||||||
file://fix-pktloc_syntax_h-race.patch \
|
file://fix-pktloc_syntax_h-race.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
|
SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7"
|
||||||
SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
|
SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c"
|
||||||
|
|
Loading…
Reference in New Issue