diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group index 3093036..40e0164 100644 --- a/groups/251.native_packages_lib.group +++ b/groups/251.native_packages_lib.group @@ -141,9 +141,9 @@ libxslt libz libzip lzo sdl1 sdl1_net sdl1_image sdl2 sdl2_image sdl2_ttf wolfss : ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz}; : ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm --enable-nc}; : ${PKG_LIBREADLINE_DEPENDS:="ncurses ncursestw ncursesw"}; -: ${PKG_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334}; -: ${PKG_LIBREADLINE_VERSION:=7.0}; -: ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz}; +: ${PKG_LIBREADLINE_SHA256SUM:=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02}; +: ${PKG_LIBREADLINE_VERSION:=8.1}; +: ${PKG_LIBREADLINE_URL:=https://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz}; : ${PKG_LIBREADLINE_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }-I${PREFIX_NATIVE}/include"}; : ${PKG_LIBREADLINE_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}; : ${PKG_LIBREADLINE_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"}; diff --git a/patches/libreadline-7.0.local.patch b/patches/libreadline-7.0.local.patch deleted file mode 100644 index d719a3f..0000000 --- a/patches/libreadline-7.0.local.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru readline-7.0.orig/configure readline-7.0/configure ---- readline-7.0.orig/configure 2016-09-07 23:15:16.000000000 +0200 -+++ readline-7.0/configure 2018-05-18 13:35:12.958734947 +0200 -@@ -3851,7 +3851,7 @@ - - test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - --test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 755' - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -diff -ru readline-7.0.orig/shlib/Makefile.in readline-7.0/shlib/Makefile.in ---- readline-7.0.orig/shlib/Makefile.in 2015-07-13 00:41:58.000000000 +0200 -+++ readline-7.0/shlib/Makefile.in 2018-05-18 13:36:19.410406513 +0200 -@@ -86,7 +86,7 @@ - SHOBJ_LIBS = @SHOBJ_LIBS@ - - SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ --SHLIB_LIBS = @SHLIB_LIBS@ -+SHLIB_LIBS = @SHLIB_LIBS@ -lncurses -ltinfo - - SHLIB_DOT = @SHLIB_DOT@ - SHLIB_LIBPREF = @SHLIB_LIBPREF@ diff --git a/patches/libreadline-8.1.local.patch b/patches/libreadline-8.1.local.patch new file mode 100644 index 0000000..d719a3f --- /dev/null +++ b/patches/libreadline-8.1.local.patch @@ -0,0 +1,24 @@ +diff -ru readline-7.0.orig/configure readline-7.0/configure +--- readline-7.0.orig/configure 2016-09-07 23:15:16.000000000 +0200 ++++ readline-7.0/configure 2018-05-18 13:35:12.958734947 +0200 +@@ -3851,7 +3851,7 @@ + + test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 755' + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +diff -ru readline-7.0.orig/shlib/Makefile.in readline-7.0/shlib/Makefile.in +--- readline-7.0.orig/shlib/Makefile.in 2015-07-13 00:41:58.000000000 +0200 ++++ readline-7.0/shlib/Makefile.in 2018-05-18 13:36:19.410406513 +0200 +@@ -86,7 +86,7 @@ + SHOBJ_LIBS = @SHOBJ_LIBS@ + + SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ +-SHLIB_LIBS = @SHLIB_LIBS@ ++SHLIB_LIBS = @SHLIB_LIBS@ -lncurses -ltinfo + + SHLIB_DOT = @SHLIB_DOT@ + SHLIB_LIBPREF = @SHLIB_LIBPREF@