Thanks, applied as 572a6b869a83ba1f7b3c242f7df6f48025cec273. Michael
[sent from post-receive hook] On Mon, 03 Aug 2020 08:30:13 +0200, Robert Schwebel <[email protected]> wrote: > There is one new configure option; the patche have been forward-ported > and are still valid. > > Signed-off-by: Robert Schwebel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/readline-7.0/0001-rl-attribute.patch > b/patches/readline-8.0/0001-rl-attribute.patch > similarity index 92% > rename from patches/readline-7.0/0001-rl-attribute.patch > rename to patches/readline-8.0/0001-rl-attribute.patch > index ac9bd84e8ebd..7f8f9ec3f6dd 100644 > --- a/patches/readline-7.0/0001-rl-attribute.patch > +++ b/patches/readline-8.0/0001-rl-attribute.patch > @@ -14,10 +14,10 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/readline.h b/readline.h > -index 924bbfb0f213..b1a177a577d5 100644 > +index da782716af2a..5858147b2e8d 100644 > --- a/readline.h > +++ b/readline.h > -@@ -385,7 +385,7 @@ extern int rl_reset_line_state PARAMS((void)); > +@@ -393,7 +393,7 @@ extern int rl_reset_line_state PARAMS((void)); > extern int rl_crlf PARAMS((void)); > > #if defined (USE_VARARGS) && defined (PREFER_STDARG) > diff --git a/patches/readline-7.0/0002-rl-header.patch > b/patches/readline-8.0/0002-rl-header.patch > similarity index 91% > rename from patches/readline-7.0/0002-rl-header.patch > rename to patches/readline-8.0/0002-rl-header.patch > index 94a7f616effd..108957d3d374 100644 > --- a/patches/readline-7.0/0002-rl-header.patch > +++ b/patches/readline-8.0/0002-rl-header.patch > @@ -14,7 +14,7 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 2 files changed, 2 insertions(+) > > diff --git a/history.h b/history.h > -index 8ce7c805d168..8d568a79fa29 100644 > +index cc3de29a6423..24cd63ce111c 100644 > --- a/history.h > +++ b/history.h > @@ -32,6 +32,7 @@ extern "C" { > @@ -26,7 +26,7 @@ index 8ce7c805d168..8d568a79fa29 100644 > # include <readline/rltypedefs.h> > #endif > diff --git a/readline.h b/readline.h > -index b1a177a577d5..06c2abe61736 100644 > +index 5858147b2e8d..7d4ecd2346fa 100644 > --- a/readline.h > +++ b/readline.h > @@ -32,6 +32,7 @@ extern "C" { > diff --git a/patches/readline-7.0/0003-rl-no-rpath.patch > b/patches/readline-8.0/0003-rl-no-rpath.patch > similarity index 95% > rename from patches/readline-7.0/0003-rl-no-rpath.patch > rename to patches/readline-8.0/0003-rl-no-rpath.patch > index 5a97e715ecb5..0f49199e5791 100644 > --- a/patches/readline-7.0/0003-rl-no-rpath.patch > +++ b/patches/readline-8.0/0003-rl-no-rpath.patch > @@ -13,7 +13,7 @@ Signed-off-by: Marc Kleine-Budde <[email protected]> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/support/shobj-conf b/support/shobj-conf > -index 1f64433dea83..ce435d7db254 100644 > +index 7920f1b5cb90..7ac9c9fb311d 100644 > --- a/support/shobj-conf > +++ b/support/shobj-conf > @@ -128,7 +128,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) > diff --git a/patches/readline-7.0/0004-rlfe-history.patch > b/patches/readline-8.0/0004-rlfe-history.patch > similarity index 100% > rename from patches/readline-7.0/0004-rlfe-history.patch > rename to patches/readline-8.0/0004-rlfe-history.patch > diff --git > a/patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch > b/patches/readline-8.0/0005-always-link-against-our-termcap-libraries.patch > similarity index 100% > rename from > patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch > rename to > patches/readline-8.0/0005-always-link-against-our-termcap-libraries.patch > diff --git a/patches/readline-7.0/series b/patches/readline-8.0/series > similarity index 100% > rename from patches/readline-7.0/series > rename to patches/readline-8.0/series > diff --git a/rules/readline.make b/rules/readline.make > index 4cb9663f2c67..14b89cfb9747 100644 > --- a/rules/readline.make > +++ b/rules/readline.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_READLINE) += readline > # > # Paths and names > # > -READLINE_VERSION := 7.0 > -READLINE_MD5 := 205b03a87fc83dab653b628c59b9fc91 > +READLINE_VERSION := 8.0 > +READLINE_MD5 := 7e6c1f16aee3244a69aba6e438295ca3 > READLINE := readline-$(READLINE_VERSION) > READLINE_SUFFIX := tar.gz > READLINE_URL := $(call ptx/mirror, GNU, > readline/$(READLINE).$(READLINE_SUFFIX)) > @@ -34,6 +34,7 @@ READLINE_AUTOCONF := \ > --disable-multibyte \ > --enable-shared \ > --disable-static\ > + --disable-install-examples \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --$(call ptx/wwo,PTXCONF_READLINE_NCURSES)-curses > _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
