helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 19:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

lvm2: replace CPPFunction with rl_completion_func_t to fix build error

Browse Source 
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>
This commit is contained in:
Zhenhua Luo 2014-03-26 20:22:36 +08:00 committed by Martin Jansa
parent f717a29543
commit 56e6228696
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-oe/recipes-support/lvm2/lvm2.inc
View File

@ -9,6 +9,7 @@ INC_PR = "r4"
S = "${WORKDIR}/LVM2.${PV}" S = "${WORKDIR}/LVM2.${PV}"
SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \ SRC_URI = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${PV}.tgz \
file://0001-Replace-CPPFunction-with-rl_completion_func_t.patch \
file://lvm.conf" file://lvm.conf"
PACKAGECONFIG ??= "readline" PACKAGECONFIG ??= "readline"

33
meta-oe/recipes-support/lvm2/lvm2/0001-Replace-CPPFunction-with-rl_completion_func_t.patch Normal file
View File

@ -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