diff --git a/base/readline/fix-install.patch b/base/readline/fix-install.patch.disabled similarity index 93% rename from base/readline/fix-install.patch rename to base/readline/fix-install.patch.disabled index 6461f2869..957658f09 100644 --- a/base/readline/fix-install.patch +++ b/base/readline/fix-install.patch.disabled @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../readline/fix-install.patch -# Copyright (C) 2016 The OpenSDE Project +# Filename: package/.../readline/fix-install.patch.disabled +# Copyright (C) 2016 - 2020 The OpenSDE Project # # More information can be found in the files COPYING and README. # diff --git a/base/readline/readline.conf b/base/readline/readline.conf index cdbcbf4fb..952ff00ea 100644 --- a/base/readline/readline.conf +++ b/base/readline/readline.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../readline/readline.conf -# Copyright (C) 2009 - 2016 The OpenSDE Project +# Copyright (C) 2009 - 2020 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -14,13 +14,12 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_remove confopt " " "--disable-shared" -var_remove confopt " " "--disable-static" -hook_add postmake 5 "cp -rv examples/ $root/$docdir" +var_append confopt ' ' '--disable-static' if pkginstalled -f ncurses; then - var_append makeopt ' ' 'SHLIB_LIBS=-lncurses' - var_append makeinstopt ' ' 'SHLIB_LIBS=-lncurses' + var_append confopt ' ' '--with-curses' + var_append makeopt ' ' 'SHLIB_LIBS=-lncursesw' + var_append makeinstopt ' ' 'SHLIB_LIBS=-lncursesw' fi pkg_readline_preconf() { @@ -43,3 +42,13 @@ hook_add preconf 5 "pkg_readline_preconf" if atstage cross; then var_append configcache ' ' 'bash_cv_wcwidth_broken=no' fi + +pkg_readline_postinstall() { +# we move libs in a nicer place + mv $root/usr/lib/lib{readline,history}.so.* $root//lib + chmod -v u+w $root/lib/lib{readline,history}.so.* + ln -sfv $root/lib/$(readlink $root/usr/lib/libreadline.so) $root/usr/lib/libreadline.so + ln -sfv $root/lib/$(readlink $root/usr/lib/libhistory.so ) $root/usr/lib/libhistory.so +} + +hook_add postinstall 7 "pkg_readline_postinstall" diff --git a/base/readline/readline.desc b/base/readline/readline.desc index 9fc3e2ea0..ee6f77b7e 100644 --- a/base/readline/readline.desc +++ b/base/readline/readline.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../readline/readline.desc -[COPY] Copyright (C) 2006 - 2016 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2020 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -32,15 +32,11 @@ [L] GPL [S] Stable -[V] 6.3.008 +[V] 8.0.4 [P] X -1---5---9 104.100 -[D] 3521982106 readline-6.3.tar.gz http://ftp.gnu.org/pub/gnu/readline/ -[D] 2184266482 readline-6.3-001.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-001 -[D] 1734273339 readline-6.3-002.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-002 -[D] 572765940 readline-6.3-003.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-003 -[D] 4193524951 readline-6.3-004.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-004 -[D] 1156979521 readline-6.3-005.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-005 -[D] 1194544246 readline-6.3-006.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-006 -[D] 1024539952 readline-6.3-007.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-007 -[D] 1838080251 readline-6.3-008.patch !http://ftp.gnu.org/gnu/readline/readline-6.3-patches/readline63-008 +[D] 3069858631 readline-8.0.tar.gz http://ftp.gnu.org/pub/gnu/readline/ +[D] 95990153 readline-8.0-001.patch !http://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-001 +[D] 442497316 readline-8.0-002.patch !http://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-002 +[D] 3853092205 readline-8.0-003.patch !http://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-003 +[D] 997971303 readline-8.0-004.patch !http://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-004