summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-01-07 16:06:55 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 19:26:28 +0000
commit51ce14351d4a67a3c285be139a2c3af6610f2d70 (patch)
tree251f6dea37ccc991618f2277ffe7edebe39a27bf /meta/recipes-support
parent39eb22bbc479ff84aad069f8821e9be026e8c1bc (diff)
downloadpoky-51ce14351d4a67a3c285be139a2c3af6610f2d70.tar.gz
libnl: Fix building using flex
The build system has not been fully changed to use flex in 3.2.16 so we need to finish the conversion. In 3.2.17 this bug has been fixed. (From OE-Core rev: 98c1c4d995416d6355354867d10281c10e9fc9aa) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libnl/libnl/fix-build-using-flex.patch55
-rw-r--r--meta/recipes-support/libnl/libnl_3.2.16.bb3
2 files changed, 57 insertions, 1 deletions
diff --git a/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch b/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch
new file mode 100644
index 0000000000..89a36bafbd
--- /dev/null
+++ b/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch
@@ -0,0 +1,55 @@
1From 89ab8d4f1229a1d2605193686cc00e6b2c9786ff Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Mon, 7 Jan 2013 15:44:38 -0200
4Subject: [PATCH] Fix build using flex
5
6Upstream-Status: Backport [3.2.17]
7---
8 lib/Makefile.am | 4 ++--
9 src/lib/Makefile.am | 4 ++--
10 2 files changed, 4 insertions(+), 4 deletions(-)
11
12diff --git a/lib/Makefile.am b/lib/Makefile.am
13index 98c7b90..89cc5d2 100644
14--- a/lib/Makefile.am
15+++ b/lib/Makefile.am
16@@ -43,14 +43,14 @@ CLEANFILES = \
17 route/pktloc.lo: route/pktloc_syntax.h route/pktloc_grammar.h
18 route/pktloc_grammar.h: route/pktloc_grammar.c
19 route/pktloc_grammar.c: route/pktloc_grammar.l
20- $(AM_V_GEN) $(LEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
21+ $(AM_V_GEN) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
22
23 route/pktloc_syntax.h: route/pktloc_syntax.c
24 route/pktloc_syntax.c: route/pktloc_syntax.y
25 $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
26
27 route/cls/ematch_grammar.c: route/cls/ematch_grammar.l
28- $(AM_V_GEN) $(LEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
29+ $(AM_V_GEN) $(FLEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
30
31 route/cls/ematch_syntax.c: route/cls/ematch_syntax.y
32 $(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
33diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
34index 6688e7c..507635d 100644
35--- a/src/lib/Makefile.am
36+++ b/src/lib/Makefile.am
37@@ -11,13 +11,13 @@ AM_LDFLAGS = \
38 #cls_ematch_cmp_la_LDFLAGS = -module -version-info 2:0:0
39
40 #cls/ematch_grammar.c: cls/ematch_grammar.l
41-# $(LEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^
42+# $(FLEX) --header-file=cls/ematch_grammar.h $(LFLAGS) -o $@ $^
43
44 #cls/ematch_syntax.c: cls/ematch_syntax.y
45 # $(YACC) -d $(YFLAGS) -o $@ $^
46
47 #cls/pktloc_grammar.c: cls/pktloc_grammar.l
48-# $(LEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^
49+# $(FLEX) --header-file=cls/pktloc_grammar.h $(LFLAGS) -o $@ $^
50
51 #cls/pktloc_syntax.c: cls/pktloc_syntax.y
52 # $(YACC) -d $(YFLAGS) -o $@ $^
53--
541.7.10.4
55
diff --git a/meta/recipes-support/libnl/libnl_3.2.16.bb b/meta/recipes-support/libnl/libnl_3.2.16.bb
index be3a3a2055..db9ae9d576 100644
--- a/meta/recipes-support/libnl/libnl_3.2.16.bb
+++ b/meta/recipes-support/libnl/libnl_3.2.16.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
3SECTION = "libs/network" 3SECTION = "libs/network"
4 4
5PE = "1" 5PE = "1"
6PR = "r0" 6PR = "r1"
7 7
8LICENSE = "LGPLv2.1" 8LICENSE = "LGPLv2.1"
9LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 9LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
@@ -12,6 +12,7 @@ DEPENDS = "flex-native bison-native"
12 12
13SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \ 13SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
14 file://fix-pktloc_syntax_h-race.patch \ 14 file://fix-pktloc_syntax_h-race.patch \
15 file://fix-build-using-flex.patch \
15 file://fix-pc-file.patch " 16 file://fix-pc-file.patch "
16 17
17SRC_URI[md5sum] = "f06e6de102abb2cef71ed671957ee099" 18SRC_URI[md5sum] = "f06e6de102abb2cef71ed671957ee099"