summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2015-02-12 13:26:41 +0300
committerVlad Glagolev2015-02-12 13:26:41 +0300
commit4ba01339abaaeb7cb7082608c44c8c6d76429a3f (patch)
tree39bda06092633d672956a542443f3215fcd94c54
parent1d002cceeee95c0863bbf8fcfc23f0553c003220 (diff)
lvm: fixed build with readline 6.3
-rw-r--r--disk/lvm/HISTORY4
-rwxr-xr-xdisk/lvm/PRE_BUILD4
-rw-r--r--disk/lvm/readline63.patch11
3 files changed, 19 insertions, 0 deletions
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index fcd037667d..f26b79af78 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,7 @@
+2015-02-12 Vlad Glagolev <stealth@sourcemage.org>
+ * PRE_BUILD: added, apply the patch
+ * readline63.patch: added, to fix build with readline 6.3
+
2012-02-21 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.02.92
diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD
new file mode 100755
index 0000000000..f57b714c9d
--- /dev/null
+++ b/disk/lvm/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/readline63.patch"
diff --git a/disk/lvm/readline63.patch b/disk/lvm/readline63.patch
new file mode 100644
index 0000000000..7f1c9d6660
--- /dev/null
+++ b/disk/lvm/readline63.patch
@@ -0,0 +1,11 @@
+--- tools/lvm.c.orig 2015-02-12 09:49:09.480001104 +0000
++++ tools/lvm.c 2015-02-12 09:49:47.670001106 +0000
+@@ -186,7 +186,7 @@
+ 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);
+