libnl: Update to 3.2.18
This release fixes the build failures found when building against old Linux kernel headers and also includes the fix for to use 'flex' instead of 'lex'. (From OE-Core rev: 5de138939c42b0a6d80732130b2617fd60a7d545) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
de446b7131
commit
b5fbf48b62
|
@ -1,55 +0,0 @@
|
|||
From 89ab8d4f1229a1d2605193686cc00e6b2c9786ff Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Date: Mon, 7 Jan 2013 15:44:38 -0200
|
||||
Subject: [PATCH] Fix build using flex
|
||||
|
||||
Upstream-Status: Backport [3.2.17]
|
||||
---
|
||||
lib/Makefile.am | 4 ++--
|
||||
src/lib/Makefile.am | 4 ++--
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/Makefile.am b/lib/Makefile.am
|
||||
index 98c7b90..89cc5d2 100644
|
||||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -43,14 +43,14 @@ CLEANFILES = \
|
||||
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) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
|
||||
+ $(AM_V_GEN) $(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) $(YACC) -d $(YFLAGS) -o $@ $^
|
||||
|
||||
route/cls/ematch_grammar.c: route/cls/ematch_grammar.l
|
||||
- $(AM_V_GEN) $(LEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
|
||||
+ $(AM_V_GEN) $(FLEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
|
||||
|
||||
route/cls/ematch_syntax.c: route/cls/ematch_syntax.y
|
||||
$(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
|
||||
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
|
||||
index 6688e7c..507635d 100644
|
||||
--- a/src/lib/Makefile.am
|
||||
+++ b/src/lib/Makefile.am
|
||||
@@ -11,13 +11,13 @@ AM_LDFLAGS = \
|
||||
#cls_ematch_cmp_la_LDFLAGS = -module -version-info 2:0:0
|
||||
|
||||
#cls/ematch_grammar.c: cls/ematch_grammar.l
|
||||
-# $(LEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^
|
||||
+# $(FLEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^
|
||||
|
||||
#cls/ematch_syntax.c: cls/ematch_syntax.y
|
||||
# $(YACC) -d $(YFLAGS) -o $@ $^
|
||||
|
||||
#cls/pktloc_grammar.c: cls/pktloc_grammar.l
|
||||
-# $(LEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^
|
||||
+# $(FLEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^
|
||||
|
||||
#cls/pktloc_syntax.c: cls/pktloc_syntax.y
|
||||
# $(YACC) -d $(YFLAGS) -o $@ $^
|
||||
--
|
||||
1.7.10.4
|
||||
|
|
@ -17,7 +17,7 @@ Index: libnl-3.2.14/lib/Makefile.am
|
|||
+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) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
|
||||
$(AM_V_GEN) $(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
|
||||
|
|
|
@ -3,7 +3,7 @@ HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
|
|||
SECTION = "libs/network"
|
||||
|
||||
PE = "1"
|
||||
PR = "r1"
|
||||
PR = "r0"
|
||||
|
||||
LICENSE = "LGPLv2.1"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
@ -12,11 +12,10 @@ DEPENDS = "flex-native bison-native"
|
|||
|
||||
SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
|
||||
file://fix-pktloc_syntax_h-race.patch \
|
||||
file://fix-build-using-flex.patch \
|
||||
file://fix-pc-file.patch "
|
||||
|
||||
SRC_URI[md5sum] = "f06e6de102abb2cef71ed671957ee099"
|
||||
SRC_URI[sha256sum] = "c43a42336c6a3cf559f390e202f8f029d165bd767da7cf7a32a815c570b31826"
|
||||
SRC_URI[md5sum] = "378eafcca1f51d1c7498d78946cd891a"
|
||||
SRC_URI[sha256sum] = "6563e4e72a35f9f96380086f6bd17307552977af98e98bd3dd0fdde8013d53a9"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
Loading…
Reference in New Issue