Browse Source

readline: fixed reinstall when the shell already depends on readline.

tc-work-musl-mess
Nagy Károly Gábriel 8 years ago
parent
commit
b3fda903e1
2 changed files with 55 additions and 0 deletions
  1. +50
    -0
      base/readline/fix-install.patch
  2. +5
    -0
      base/readline/readline.conf

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

@ -0,0 +1,50 @@
# --- 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
#
# 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

+ 5
- 0
base/readline/readline.conf

@ -18,6 +18,11 @@ var_remove confopt " " "--disable-shared"
var_remove confopt " " "--disable-static"
hook_add postmake 5 "cp -rv examples/ $root/$docdir"
if pkginstalled -f ncurses; then
var_append makeopt ' ' 'SHLIB_LIBS=-lncurses'
var_append makeinstopt ' ' 'SHLIB_LIBS=-lncurses'
fi
pkg_readline_preconf() {
for x in $(match_source_file -p patch) ; do
echo "Applying patch ${x##*/} ..."

Loading…
Cancel
Save