[oe-commits] Jacob Kroon : console-tools: Remove floating runtime dependency on flex

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 69a7c9345360b61eda79f818775656fc1aa9932c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=69a7c9345360b61eda79f818775656fc1aa9932c

Author: Jacob Kroon <jacob.kroon at mikrodidakt.se>
Date:   Mon Apr 21 12:23:00 2014 +0200

console-tools: Remove floating runtime dependency on flex

The 'loadkeys' program defines its own yywrap()/yylex() functions,
there is no need to link with flex shared library.

Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../console-tools-0.3.2/no-dep-on-libfl.patch         | 19 +++++++++++++++++++
 .../recipes-core/console-tools/console-tools_0.3.2.bb |  1 +
 2 files changed, 20 insertions(+)

diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
new file mode 100644
index 0000000..a6735a5
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
@@ -0,0 +1,19 @@
+No reason to link with libfl since 'loadkeys' implements
+its own yywrap()/yylex() functions.
+
+Upstream-Status: Pending
+Signed-off-by: Jacob Kroon <jacob.kroon at mikrodidakt.se>
+
+Index: console-tools-0.3.2/kbdtools/Makefile.am
+===================================================================
+--- console-tools-0.3.2.orig/kbdtools/Makefile.am
++++ console-tools-0.3.2/kbdtools/Makefile.am
+@@ -19,8 +19,6 @@ LDADD = ../lib/ctlocal/libctlocal.a ../l
+ 	../lib/cfont/libcfont.la \
+ 	../lib/console/libconsole.la ../lib/generic/libctgeneric.la
+ 
+-loadkeys_LDADD = $(LDADD) @LEXLIB@
+-
+ bin_SCRIPTS = mk_modmap
+ 
+ noinst_HEADERS = loadkeys.h
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 80fab55..c60a5a0 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -13,6 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
            file://uclibc-fileno.patch \
            file://nodocs.patch \
            file://fix-libconsole-linking.patch \
+           file://no-dep-on-libfl.patch \
            file://lcmessage.m4 \
            file://Makevars"