From 6a390d540b9fdd8b318163842a5bfc8441bebc95 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 3 Nov 2011 17:52:42 +0100 Subject: 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 Signed-off-by: Richard Purdie --- .../libnl/fix-pktloc_syntax_h-race.patch | 26 ------------------ .../libnl/libnl-2.0/fix-makefile.patch | 32 ---------------------- .../libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch | 29 ++++++++++++++++++++ meta/recipes-support/libnl/libnl_2.0.bb | 8 +++--- 4 files changed, 33 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch delete mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-makefile.patch create mode 100644 meta/recipes-support/libnl/libnl-2.0/fix-pktloc_syntax_h-race.patch (limited to 'meta/recipes-support/libnl') diff --git a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch deleted file mode 100644 index 05d75dbaf3..0000000000 --- a/meta/recipes-support/libnl/fix-pktloc_syntax_h-race.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - -Index: libnl-2.0/lib/Makefile.am -=================================================================== ---- libnl-2.0.orig/lib/Makefile.am -+++ libnl-2.0/lib/Makefile.am -@@ -27,11 +27,15 @@ 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_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 $@ $^ - 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 @@ -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 - -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 - -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 0000000000..ea32e82b66 --- /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 + +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 $@ $^ + 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" DEPENDS = "flex-native bison-native" PR = "r3" -SRC_URI= "http://www.infradead.org/~tgr/libnl/files/${BPN}-${PV}.tar.gz \ - file://fix-makefile.patch \ - file://fix-pktloc_syntax_h-race.patch \ - " +SRC_URI = "\ + http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ + file://fix-pktloc_syntax_h-race.patch \ +" SRC_URI[md5sum] = "6aaf1e9802a17a7d702bb0638044ffa7" SRC_URI[sha256sum] = "5a40dc903d3ca1074da7424b908bec8ff16936484798c7e46e53e9db8bc87a9c" -- cgit v1.2.3-54-g00ecf