console-tools: Remove floating runtime dependency on flex
authorJacob Kroon <jacob.kroon@mikrodidakt.se>
Mon, 21 Apr 2014 10:23:00 +0000 (12:23 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 24 Apr 2014 16:55:13 +0000 (17:55 +0100)
The 'loadkeys' program defines its own yywrap()/yylex() functions,
there is no need to link with flex shared library.

(From OE-Core rev: 69a7c9345360b61eda79f818775656fc1aa9932c)

Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch [new file with mode: 0644]
meta/recipes-core/console-tools/console-tools_0.3.2.bb

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 (file)
index 0000000..a6735a5
--- /dev/null
@@ -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@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
index 80fab55..c60a5a0 100644 (file)
@@ -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"