diff options
Diffstat (limited to 'meta/recipes-support/libnl/libnl')
-rw-r--r-- | meta/recipes-support/libnl/libnl/fix-pc-file.patch | 17 | ||||
-rw-r--r-- | meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch | 36 |
2 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-support/libnl/libnl/fix-pc-file.patch b/meta/recipes-support/libnl/libnl/fix-pc-file.patch deleted file mode 100644 index fe8b833a1c..0000000000 --- a/meta/recipes-support/libnl/libnl/fix-pc-file.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Some packages are asking only for libnl-2.0, but expects to get also -libnl-genl, libnl-nf libnl-route, easiest way to fix them is here. - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> -Index: libnl-3.2.14/libnl-3.0.pc.in -=================================================================== ---- libnl-3.2.14.orig/libnl-3.0.pc.in -+++ libnl-3.2.14/libnl-3.0.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs: -L${libdir} -lnl-@MAJ_VERSION@ -lnl-genl-@MAJ_VERSION@ -lnl-nf-@MAJ_VERSION@ -lnl-route-@MAJ_VERSION@ - Cflags: -I${includedir}/libnl@MAJ_VERSION@ diff --git a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch b/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch deleted file mode 100644 index 79aa0bdf11..0000000000 --- a/meta/recipes-support/libnl/libnl/fix-pktloc_syntax_h-race.patch +++ /dev/null @@ -1,36 +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 - -Signed-off-by: Martin Jansa <martin.jansa@gmail.com> - -Index: libnl-3.2.25/lib/Makefile.am -=================================================================== ---- libnl-3.2.25.orig/lib/Makefile.am -+++ libnl-3.2.25/lib/Makefile.am -@@ -46,9 +46,12 @@ CLEANFILES = \ - - # 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 - $(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^ - -+route/pktloc_syntax.h: route/pktloc_syntax.c - route/pktloc_syntax.c: route/pktloc_syntax.y - $(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^ - -@@ -102,7 +105,9 @@ BUILT_SOURCES = \ - route/cls/ematch_grammar.c \ - route/cls/ematch_syntax.c \ - route/pktloc_grammar.c \ -- route/pktloc_syntax.c -+ route/pktloc_syntax.c \ -+ route/pktloc_syntax.h \ -+ route/pktloc_grammar.h - - EXTRA_DIST = \ - route/pktloc_grammar.l \ |