diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2013-01-07 16:06:55 -0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-07 19:22:53 +0000 |
| commit | 98c1c4d995416d6355354867d10281c10e9fc9aa (patch) | |
| tree | e56d52afe5a00b68c817e781332c72e33a0aa004 /meta/recipes-support/libnl | |
| parent | 337add4a13275b906a98476321f48d75141c5399 (diff) | |
| download | openembedded-core-contrib-98c1c4d995416d6355354867d10281c10e9fc9aa.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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libnl')
| -rw-r--r-- | meta/recipes-support/libnl/libnl/fix-build-using-flex.patch | 55 | ||||
| -rw-r--r-- | meta/recipes-support/libnl/libnl_3.2.16.bb | 3 |
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 00000000000..89a36bafbd4 --- /dev/null +++ b/meta/recipes-support/libnl/libnl/fix-build-using-flex.patch @@ -0,0 +1,55 @@ +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 + diff --git a/meta/recipes-support/libnl/libnl_3.2.16.bb b/meta/recipes-support/libnl/libnl_3.2.16.bb index be3a3a2055a..db9ae9d5768 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/" SECTION = "libs/network" PE = "1" -PR = "r0" +PR = "r1" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" @@ -12,6 +12,7 @@ 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" |