diff options
| author | Vlad Glagolev | 2015-02-12 16:54:52 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-02-12 16:54:52 +0300 |
| commit | 6bf31e0a2bdd4652e0b2def1e23ef8f1e57942b2 (patch) | |
| tree | a06b7bf3b7e85e4cdafad4bcdec4a93eef4498f2 | |
| parent | 4ba01339abaaeb7cb7082608c44c8c6d76429a3f (diff) | |
reiser4progs: fixed build with readline 6.3
| -rwxr-xr-x | disk/reiser4progs/BUILD | 2 | ||||
| -rwxr-xr-x | disk/reiser4progs/DEPENDS | 7 | ||||
| -rw-r--r-- | disk/reiser4progs/HISTORY | 6 | ||||
| -rwxr-xr-x | disk/reiser4progs/PRE_BUILD | 4 | ||||
| -rw-r--r-- | disk/reiser4progs/readline63.patch | 11 |
5 files changed, 28 insertions, 2 deletions
diff --git a/disk/reiser4progs/BUILD b/disk/reiser4progs/BUILD index 131b8aba9d..a29ec0847b 100755 --- a/disk/reiser4progs/BUILD +++ b/disk/reiser4progs/BUILD @@ -1,2 +1,2 @@ -OPTS="${OPTS} ${LIB_MINIMAL}" && +OPTS="${OPTS} ${LIB_MINIMAL}" && default_build diff --git a/disk/reiser4progs/DEPENDS b/disk/reiser4progs/DEPENDS index c0bb464c6a..28716f2022 100755 --- a/disk/reiser4progs/DEPENDS +++ b/disk/reiser4progs/DEPENDS @@ -1 +1,6 @@ -depends libaal +depends libaal && + +optional_depends readline \ + "--with-readline" \ + "--without-readline" \ + "for fancy command line editing support" diff --git a/disk/reiser4progs/HISTORY b/disk/reiser4progs/HISTORY index 7ff8721c71..3b0d9195ef 100644 --- a/disk/reiser4progs/HISTORY +++ b/disk/reiser4progs/HISTORY @@ -1,3 +1,9 @@ +2015-02-12 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: added missing optional dependency -- readline + * BUILD: cleaned up + * PRE_BUILD: added, to apply the patch + * readline63.patch: added, to fix build with readline 6.3 + 2011-10-14 Bor Kraljič <pyrobor@ver.si> * DETAILS: fixed long description wrap (scripted) diff --git a/disk/reiser4progs/PRE_BUILD b/disk/reiser4progs/PRE_BUILD new file mode 100755 index 0000000000..f57b714c9d --- /dev/null +++ b/disk/reiser4progs/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && + +patch -p0 < "$SPELL_DIRECTORY/readline63.patch" diff --git a/disk/reiser4progs/readline63.patch b/disk/reiser4progs/readline63.patch new file mode 100644 index 0000000000..15cfd21e43 --- /dev/null +++ b/disk/reiser4progs/readline63.patch @@ -0,0 +1,11 @@ +--- libmisc/ui.c.orig 2015-02-12 13:38:15.110001105 +0000 ++++ libmisc/ui.c 2015-02-12 13:41:23.940001104 +0000 +@@ -257,7 +257,7 @@ + #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H) + rl_initialize(); + rl_attempted_completion_function = +- (CPPFunction *)misc_complete; ++ (rl_completion_func_t *)misc_complete; + #endif + + aal_exception_set_handler(misc_exception_handler); |