* [PATCH] libnl: Fix building using flex
@ 2013-01-07 18:06 Otavio Salvador
2013-01-07 23:45 ` Saul Wold
0 siblings, 1 reply; 5+ messages in thread
From: Otavio Salvador @ 2013-01-07 18:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Otavio Salvador
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
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"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] libnl: Fix building using flex
2013-01-07 18:06 [PATCH] libnl: Fix building using flex Otavio Salvador
@ 2013-01-07 23:45 ` Saul Wold
[not found] ` <CAP9ODKqy4p045c045K6Smi391gK7cKW-jV-nmL66Ra2QUfQKXg@mail.gmail.com>
2013-01-08 8:08 ` Eric Bénard
0 siblings, 2 replies; 5+ messages in thread
From: Saul Wold @ 2013-01-07 23:45 UTC (permalink / raw)
To: Otavio Salvador; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4491 bytes --]
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"
>
[-- Attachment #2: Attached Message --]
[-- Type: message/rfc822, Size: 6936 bytes --]
[-- Attachment #2.1.1: Type: text/html, Size: 2758 bytes --]
[-- Attachment #2.1.2: Type: text/plain, Size: 161 bytes --]
_______________________________________________
Yocto-builds mailing list
Yocto-builds@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto-builds
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-01-08 8:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-07 18:06 [PATCH] libnl: Fix building using flex Otavio Salvador
2013-01-07 23:45 ` Saul Wold
[not found] ` <CAP9ODKqy4p045c045K6Smi391gK7cKW-jV-nmL66Ra2QUfQKXg@mail.gmail.com>
[not found] ` <CAP9ODKpf_btTLPgK9SCW_-7Fdu+krj2zrkeds+erahoyLeHUPQ@mail.gmail.com>
2013-01-08 3:15 ` Saul Wold
2013-01-08 8:17 ` Eric Bénard
2013-01-08 8:08 ` Eric Bénard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox