diff options
| author |   Zhenhua Luo <zhenhua.luo@freescale.com> | 2014-03-26 20:22:36 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-29 22:39:50 +0100 |
| commit | 56e6228696a25d27c7b271701debf314aa9d53d5 (patch) | |
| tree | 09030f80e9b9d64912f38ce6e0e68abde28e5ba4 /meta-oe/recipes-support/lvm2/lvm2 | |
| parent | f717a295431e518a7bbd6ed878340aecfebd4e2f (diff) | |
| download | meta-openembedded-contrib-56e6228696a25d27c7b271701debf314aa9d53d5.tar.gz | |
lvm2: replace CPPFunction with rl_completion_func_t to fix build error
lvm2 depends on readline, CPPFunction has been replaced by rl_completion_func_t
in recent readline,
Error log:
| lvm.c: In function 'lvm_shell':
| lvm.c:189:38: error: 'CPPFunction' undeclared (first use in this function)
| rl_attempted_completion_function = (CPPFunction *) _completion;
| ^
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/lvm2/lvm2')
| -rw-r--r-- | meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch new file mode 100644 index 0000000000..98c21fdb37 --- /dev/null +++ b/meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch @@ -0,0 +1,33 @@ +From e2484e179c389b98366c8b66b451d9d2ba8f35e8 Mon Sep 17 00:00:00 2001 +From: Zhenhua Luo <zhenhua.luo@freescale.com> +Date: Tue, 25 Mar 2014 17:39:43 +0800 +Subject: [PATCH] Replace CPPFunction with rl_completion_func_t + +lvm2 depends on readline, CPPFunction has been replaced by rl_completion_func_t +in recent readline, + +Upstream-Status: Inappropriate [configuration] +The change depends on the build environment, it is required by OpenEmbedded env +due to readline upgrade. + +Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> +--- + tools/lvm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/lvm.c b/tools/lvm.c +index e002a76..5fa35d2 100644 +--- a/tools/lvm.c ++++ b/tools/lvm.c +@@ -186,7 +186,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) + char *input = NULL, *args[MAX_ARGS], **argv; + + rl_readline_name = "lvm"; +- rl_attempted_completion_function = (CPPFunction *) _completion; ++ rl_attempted_completion_function = (rl_completion_func_t *) _completion; + + _read_history(cmd); + +-- +1.9.1 + |