summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/console-tools
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@mikrodidakt.se>2014-04-21 12:23:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-24 17:54:55 +0100
commit69a7c9345360b61eda79f818775656fc1aa9932c (patch)
tree45ff9debeeb8b57c9761d40b136b5e8c80a8237a /meta/recipes-core/console-tools
parent1163b6e619102bea08c429e49a4792abfa234c1c (diff)
downloadopenembedded-core-contrib-69a7c9345360b61eda79f818775656fc1aa9932c.tar.gz
openembedded-core-contrib-69a7c9345360b61eda79f818775656fc1aa9932c.tar.bz2
openembedded-core-contrib-69a7c9345360b61eda79f818775656fc1aa9932c.zip
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@mikrodidakt.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/console-tools')
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch19
-rw-r--r--meta/recipes-core/console-tools/console-tools_0.3.2.bb1
2 files changed, 20 insertions, 0 deletions
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 0000000000..a6735a53ff
--- /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@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 80fab55214..c60a5a05bb 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"