Browse Source

readline: Updated (6.3.008 -> 8.0.4)

tc-work-musl-mess
Nagy Károly Gábriel 4 years ago
parent
commit
0e06e8c209
Signed by: karasz GPG Key ID: C6BA1070A8CBDA0C
3 changed files with 72 additions and 17 deletions
  1. +50
    -0
      base/readline/fix-install.patch.disabled
  2. +15
    -6
      base/readline/readline.conf
  3. +7
    -11
      base/readline/readline.desc

+ 50
- 0
base/readline/fix-install.patch.disabled

@ -0,0 +1,50 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# 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.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./support/shlib-install.orig 2016-05-09 15:43:49.716808655 +0300
+++ ./support/shlib-install 2016-05-09 15:48:01.368808655 +0300
@@ -44,7 +44,7 @@
OLDSUFF=old
MV=mv
RM="rm -f"
-LN="ln -s"
+LN="ln -sf"
# pre-install
@@ -73,7 +73,7 @@
case "$host_os" in
hpux*|darwin*|macosx*|linux*|solaris2*)
if [ -z "$uninstall" ]; then
- chmod 555 ${INSTALLDIR}/${LIBNAME}
+ chmod 644 ${INSTALLDIR}/${LIBNAME}
fi ;;
cygwin*|mingw*)
IMPLIBNAME=`echo ${LIBNAME} \
@@ -120,13 +120,11 @@
case "$host_os-$host_vendor" in
*linux*|freebsd*-gentoo)
# libname.so.M -> libname.so.M.N
- ${echo} ${RM} ${INSTALLDIR}/$LINK2
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK2
fi
# libname.so -> libname.so.M
- ${echo} ${RM} ${INSTALLDIR}/$LINK1
if [ -z "$uninstall" ]; then
${echo} cd $INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1
fi

+ 15
- 6
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"

+ 7
- 11
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

Loading…
Cancel
Save