From 18403fc8d044e9d4ef669f7a64adb8f0a1ac48a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Mon, 17 Jan 2022 17:05:06 +0100 Subject: groups/251.native_packages_lib.group: readline: bump to v8.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/251.native_packages_lib.group | 9 +++++++-- patches/readline-8.1.2.local.patch | 21 +++++++++++++++++++++ patches/readline-8.1.local.patch | 21 --------------------- 3 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 patches/readline-8.1.2.local.patch delete mode 100644 patches/readline-8.1.local.patch diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 6717a2bc..c05ea442 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -328,14 +328,19 @@ 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:=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02}; -: ${PKG_READLINE_VERSION:=8.1}; +: ${PKG_READLINE_SHA256SUM:=7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6}; +: ${PKG_READLINE_VERSION:=8.1.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}"}; : ${PKG_READLINE_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"}; : ${PKG_READLINE_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }-L${PREFIX_NATIVE}/lib"}; : ${PKG_READLINE_MAKEFLAGS_INSTALL:="PREFIX= prefix="}; +: ${PKG_READLINE_CONFIG_CACHE_EXTRA:=" +bash_cv_func_strcoll_broken=yes +bash_cv_func_ctype_nonascii=no +bash_cv_must_reinstall_sighandlers=no +bash_cv_func_sigsetjmp=yes"}; : ${PKG_SDL1_DEPENDS:="w32api w32lib"}; : ${PKG_SDL1_SHA256SUM:=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00}; : ${PKG_SDL1_VERSION:=1.2.15}; diff --git a/patches/readline-8.1.2.local.patch b/patches/readline-8.1.2.local.patch new file mode 100644 index 00000000..6e6a9bad --- /dev/null +++ b/patches/readline-8.1.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-8.1.local.patch b/patches/readline-8.1.local.patch deleted file mode 100644 index 6e6a9bad..00000000 --- a/patches/readline-8.1.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@ -- cgit v1.2.3