From da1fce1ea1a3dd26b2609a959a0af8bc8362a616 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Sep 27 2022 13:02:45 +0000 Subject: groups/{010,251}: readline(_host): bump to v8.2 Signed-off-by: Ørjan Malde --- diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index db621ae..9561f2f 100644 --- a/groups/010.host_deps.group +++ b/groups/010.host_deps.group @@ -249,8 +249,8 @@ HOST_DEPS_PREFIX="${PREFIX}"; : ${PKG_PYTHON3_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= EXEC_PREFIX= BINDIR=/bin SBINDIR=/sbin LIBDIR=/lib INCLUDEDIR=/include OLDINCLUDEDIR=/include MANDIR=/share/man DOCDIR=/share/doc LIBEXECDIR=/libexec"}; : ${PKG_PYTHON3_HOST_SUBDIR:=Python-${PKG_PYTHON3_HOST_VERSION}}; : ${PKG_READLINE_HOST_DEPENDS:="ncurses_host ncursestw_host ncursesw_host"}; -: ${PKG_READLINE_HOST_SHA256SUM:=7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6}; -: ${PKG_READLINE_HOST_VERSION:=8.1.2}; +: ${PKG_READLINE_HOST_SHA256SUM:=3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35}; +: ${PKG_READLINE_HOST_VERSION:=8.2}; : ${PKG_READLINE_HOST_URL:=https://ftp.gnu.org/gnu/readline/readline-${PKG_READLINE_HOST_VERSION}.tar.gz}; : ${PKG_READLINE_HOST_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}; : ${PKG_READLINE_HOST_CONFIGURE_ARGS_EXTRA:="--with-curses"}; diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 90a9be1..9f9a0a6 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -366,8 +366,8 @@ gl_cv_ld_output_def=no"}; : ${PKG_NETTLE_INSTALL_FILES_V2:="m0755=lib/%"}; : ${PKG_NETTLE_MAKEFLAGS_BUILD:=-j1}; : ${PKG_READLINE_DEPENDS:="ncurses ncursestw ncursesw"}; -: ${PKG_READLINE_SHA256SUM:=7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6}; -: ${PKG_READLINE_VERSION:=8.1.2}; +: ${PKG_READLINE_SHA256SUM:=3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35}; +: ${PKG_READLINE_VERSION:=8.2}; : ${PKG_READLINE_URL:=https://ftp.gnu.org/gnu/readline/readline-${PKG_READLINE_VERSION}.tar.gz}; : ${PKG_READLINE_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }-I${PREFIX_NATIVE}/include"}; : ${PKG_READLINE_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}; diff --git a/patches/readline-8.1.2.local.patch b/patches/readline-8.1.2.local.patch deleted file mode 100644 index 6e6a9ba..0000000 --- a/patches/readline-8.1.2.local.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru a/shlib/Makefile.in b/shlib/Makefile.in ---- a/shlib/Makefile.in 2020-10-29 19:47:57.000000000 +0000 -+++ b/shlib/Makefile.in 2021-06-17 12:56:54.468810553 +0000 -@@ -36,7 +36,7 @@ - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_DATA = @INSTALL_DATA@ -m 0755 - - CC = @CC@ - RANLIB = @RANLIB@ -@@ -86,7 +86,7 @@ - SHOBJ_LIBS = @SHOBJ_LIBS@ - - SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ --SHLIB_LIBS = @SHLIB_LIBS@ -+SHLIB_LIBS = @SHLIB_LIBS@ $(TERMCAP_LIB) - - SHLIB_DOT = @SHLIB_DOT@ - SHLIB_LIBPREF = @SHLIB_LIBPREF@ diff --git a/patches/readline-8.2.local.patch b/patches/readline-8.2.local.patch new file mode 100644 index 0000000..6e6a9ba --- /dev/null +++ b/patches/readline-8.2.local.patch @@ -0,0 +1,21 @@ +diff -ru a/shlib/Makefile.in b/shlib/Makefile.in +--- a/shlib/Makefile.in 2020-10-29 19:47:57.000000000 +0000 ++++ b/shlib/Makefile.in 2021-06-17 12:56:54.468810553 +0000 +@@ -36,7 +36,7 @@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_DATA = @INSTALL_DATA@ -m 0755 + + CC = @CC@ + RANLIB = @RANLIB@ +@@ -86,7 +86,7 @@ + SHOBJ_LIBS = @SHOBJ_LIBS@ + + SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ +-SHLIB_LIBS = @SHLIB_LIBS@ ++SHLIB_LIBS = @SHLIB_LIBS@ $(TERMCAP_LIB) + + SHLIB_DOT = @SHLIB_DOT@ + SHLIB_LIBPREF = @SHLIB_LIBPREF@ diff --git a/patches/readline_host-8.1.2.local.patch b/patches/readline_host-8.1.2.local.patch deleted file mode 120000 index b8fdbfa..0000000 --- a/patches/readline_host-8.1.2.local.patch +++ /dev/null @@ -1 +0,0 @@ -readline-8.1.2.local.patch \ No newline at end of file diff --git a/patches/readline_host-8.2.local.patch b/patches/readline_host-8.2.local.patch new file mode 120000 index 0000000..e459969 --- /dev/null +++ b/patches/readline_host-8.2.local.patch @@ -0,0 +1 @@ +readline-8.2.local.patch \ No newline at end of file