Patchwork libnl: Fix building using flex

login
register
mail settings
Submitter Otavio Salvador
Date Jan. 7, 2013, 6:06 p.m.
Message ID <1357582015-16423-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/42249/
State Accepted
Commit 51ce14351d4a67a3c285be139a2c3af6610f2d70
Headers show

Comments

Otavio Salvador - Jan. 7, 2013, 6:06 p.m.
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>
---
 .../libnl/libnl/fix-build-using-flex.patch         |   55 ++++++++++++++++++++
 meta/recipes-support/libnl/libnl_3.2.16.bb         |    3 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/libnl/libnl/fix-build-using-flex.patch
Saul Wold - Jan. 7, 2013, 11:45 p.m.
On 01/07/2013 10:06 AM, Otavio Salvador wrote:
> 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.
>
Otavio,

This patch seems to be causing another failure
> | bison -y -d -o route/cls/ematch_syntax.c route/cls/ematch_syntax.y
> | lex --header-file=route/pktloc_grammar.h -o route/pktloc_grammar.c route/pktloc_grammar.l
> | bison -y -d -o route/pktloc_syntax.c route/pktloc_syntax.y
> | flex: Can't use --reentrant or --bison-bridge with -l option
> | flex: Can't use --reentrant or --bison-bridge with -l option
> | make[1]: *** [route/pktloc_grammar.c] Error 1


I am looking into the failure now, can you on your side also.

Thanks
	Sau!

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   .../libnl/libnl/fix-build-using-flex.patch         |   55 ++++++++++++++++++++
>   meta/recipes-support/libnl/libnl_3.2.16.bb         |    3 +-
>   2 files changed, 57 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-support/libnl/libnl/fix-build-using-flex.patch
>
> 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 0000000..89a36ba
> --- /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 be3a3a2..db9ae9d 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"
>
Saul Wold - Jan. 8, 2013, 3:15 a.m.
On 01/07/2013 04:00 PM, Otavio Salvador wrote:
> Looking at the error it seems it is using your distribution binary, not
> the built one (for flex).
>
My bad, you patch was not in the first build I did, RP pulled it in 
after I started the build.  I am rebuilding MASTER now with your patch in.

Sau!

> On Jan 7, 2013 9:59 PM, "Otavio Salvador" <otavio@ossystems.com.br
> <mailto:otavio@ossystems.com.br>> wrote:
>
>     I'm out of office now but I have a new patch that upgrade to 3.2.17
>     and I can send it layer today or tomorrow early morning.
>
>     On Jan 7, 2013 9:45 PM, "Saul Wold" <sgw@linux.intel.com
>     <mailto:sgw@linux.intel.com>> wrote:
>
>         On 01/07/2013 10:06 AM, Otavio Salvador wrote:
>
>             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.
>
>         Otavio,
>
>         This patch seems to be causing another failure
>
>             | bison -y -d -o route/cls/ematch_syntax.c
>             route/cls/ematch_syntax.y
>             | lex --header-file=route/pktloc___grammar.h -o
>             route/pktloc_grammar.c route/pktloc_grammar.l
>             | bison -y -d -o route/pktloc_syntax.c route/pktloc_syntax.y
>             | flex: Can't use --reentrant or --bison-bridge with -l option
>             | flex: Can't use --reentrant or --bison-bridge with -l option
>             | make[1]: *** [route/pktloc_grammar.c] Error 1
>
>
>
>         I am looking into the failure now, can you on your side also.
>
>         Thanks
>                  Sau!
>
>             Signed-off-by: Otavio Salvador <otavio@ossystems.com.br
>             <mailto:otavio@ossystems.com.br>>
>             ---
>                .../libnl/libnl/fix-build-__using-flex.patch         |
>             55 ++++++++++++++++++++
>                meta/recipes-support/libnl/lib__nl_3.2.16.bb
>             <http://libnl_3.2.16.bb>         |    3 +-
>                2 files changed, 57 insertions(+), 1 deletion(-)
>                create mode 100644
>             meta/recipes-support/libnl/__libnl/fix-build-using-flex.__patch
>
>             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 0000000..89a36ba
>             --- /dev/null
>             +++
>             b/meta/recipes-support/libnl/__libnl/fix-build-using-flex.__patch
>             @@ -0,0 +1,55 @@
>             +From 89ab8d4f1229a1d2605193686cc00e__6b2c9786ff Mon Sep 17
>             00:00:00 2001
>             +From: Otavio Salvador <otavio@ossystems.com.br
>             <mailto: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/l__ibnl_3.2.16.bb
>             <http://libnl_3.2.16.bb>
>             b/meta/recipes-support/libnl/l__ibnl_3.2.16.bb
>             <http://libnl_3.2.16.bb>
>             index be3a3a2..db9ae9d 100644
>             --- a/meta/recipes-support/libnl/l__ibnl_3.2.16.bb
>             <http://libnl_3.2.16.bb>
>             +++ b/meta/recipes-support/libnl/l__ibnl_3.2.16.bb
>             <http://libnl_3.2.16.bb>
>             @@ -3,7 +3,7 @@ HOMEPAGE =
>             "http://www.infradead.org/~__tgr/libnl/
>             <http://www.infradead.org/~tgr/libnl/>"
>                SECTION = "libs/network"
>
>                PE = "1"
>             -PR = "r0"
>             +PR = "r1"
>
>                LICENSE = "LGPLv2.1"
>                LIC_FILES_CHKSUM =
>             "file://COPYING;md5=__4fbd65380cdd255951079008b36451__6c"
>             @@ -12,6 +12,7 @@ DEPENDS = "flex-native bison-native"
>
>                SRC_URI =
>             "http://www.infradead.org/~__tgr/${BPN}/files/${BP}.tar.gz
>             <http://www.infradead.org/~tgr/$%7BBPN%7D/files/$%7BBP%7D.tar.gz>
>             \
>                           file://fix-pktloc_syntax_h-__race.patch \
>             +           file://fix-build-using-flex.__patch \
>                           file://fix-pc-file.patch "
>
>                SRC_URI[md5sum] = "__f06e6de102abb2cef71ed671957ee0__99"
>
Eric BENARD - Jan. 8, 2013, 8:08 a.m.
Hi Saul,

Le Mon, 07 Jan 2013 15:45:41 -0800,
Saul Wold <sgw@linux.intel.com> a écrit :
> I am looking into the failure now, can you on your side also.
> 
strange it seems you are still using lex and not flex : do you have the
same problem with my patch ?
http://lists.linuxtogo.org/pipermail/openembedded-core/2013-January/033884.html

Eric
Eric BENARD - Jan. 8, 2013, 8:17 a.m.
Le Mon, 07 Jan 2013 19:15:06 -0800,
Saul Wold <sgw@linux.intel.com> a écrit :

> On 01/07/2013 04:00 PM, Otavio Salvador wrote:
> > Looking at the error it seems it is using your distribution binary, not
> > the built one (for flex).
> >
> My bad, you patch was not in the first build I did, RP pulled it in 
> after I started the build.  I am rebuilding MASTER now with your patch in.
> 
OK forget my previous mail ;-)

Eric

Patch

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 0000000..89a36ba
--- /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 be3a3a2..db9ae9d 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"