diff options
| author | Jacob Kroon <jacob.kroon@mikrodidakt.se> | 2014-04-21 12:23:00 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-24 17:55:13 +0100 |
| commit | 5c98e90ce97d26c640ffbb91539721ecb4ea82f2 (patch) | |
| tree | 2791c10b1d6cd1cb765484c846d4003cfa60848e | |
| parent | a111ca6c811bae3d8b2114c914ba92edd7ea546b (diff) | |
| download | poky-5c98e90ce97d26c640ffbb91539721ecb4ea82f2.tar.gz | |
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.
(From OE-Core rev: 69a7c9345360b61eda79f818775656fc1aa9932c)
Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-core/console-tools/console-tools_0.3.2.bb | 1 |
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 @@ | |||
| 1 | No reason to link with libfl since 'loadkeys' implements | ||
| 2 | its own yywrap()/yylex() functions. | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> | ||
| 6 | |||
| 7 | Index: console-tools-0.3.2/kbdtools/Makefile.am | ||
| 8 | =================================================================== | ||
| 9 | --- console-tools-0.3.2.orig/kbdtools/Makefile.am | ||
| 10 | +++ console-tools-0.3.2/kbdtools/Makefile.am | ||
| 11 | @@ -19,8 +19,6 @@ LDADD = ../lib/ctlocal/libctlocal.a ../l | ||
| 12 | ../lib/cfont/libcfont.la \ | ||
| 13 | ../lib/console/libconsole.la ../lib/generic/libctgeneric.la | ||
| 14 | |||
| 15 | -loadkeys_LDADD = $(LDADD) @LEXLIB@ | ||
| 16 | - | ||
| 17 | bin_SCRIPTS = mk_modmap | ||
| 18 | |||
| 19 | 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 \ | |||
| 13 | file://uclibc-fileno.patch \ | 13 | file://uclibc-fileno.patch \ |
| 14 | file://nodocs.patch \ | 14 | file://nodocs.patch \ |
| 15 | file://fix-libconsole-linking.patch \ | 15 | file://fix-libconsole-linking.patch \ |
| 16 | file://no-dep-on-libfl.patch \ | ||
| 16 | file://lcmessage.m4 \ | 17 | file://lcmessage.m4 \ |
| 17 | file://Makevars" | 18 | file://Makevars" |
| 18 | 19 | ||
