From 69a7c9345360b61eda79f818775656fc1aa9932c Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Mon, 21 Apr 2014 12:23:00 +0200 Subject: 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 Signed-off-by: Richard Purdie --- .../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(+) create mode 100644 meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch (limited to 'meta/recipes-core/console-tools') 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 + +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" -- cgit 1.2.3-korg