Browse Source

ncurses: changed to create compatibility symlink /usr/lib/terminfo by ourself

user/amery/next/luajit
Christian Wiese 13 years ago
parent
commit
721ad10e82
  1. 56
      base/ncurses/ncurses-5.9-run_tic.sh-no-terminfo-compat-symlink.patch
  2. 13
      base/ncurses/ncurses.conf

56
base/ncurses/ncurses-5.9-run_tic.sh-no-terminfo-compat-symlink.patch

@ -0,0 +1,56 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../ncurses/ncurses-5.9-run_tic.sh-no-terminfo-compat-symlink.patch
# Copyright (C) 2012 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 ---
--- ncurses-5.9/misc/run_tic.in.orig 2012-01-18 10:39:03.636079301 +0100
+++ ncurses-5.9/misc/run_tic.in 2012-01-18 12:09:49.360079352 +0100
@@ -164,37 +164,4 @@
fi
fi
-# Make a symbolic link to provide compatibility with applications that expect
-# to find terminfo under /usr/lib. That is, we'll _try_ to do that. Not
-# all systems support symbolic links, and those that do provide a variety
-# of options for 'test'.
-if test "$TICDIR" != "$TERMINFO" ; then
- ( rm -f $TICDIR 2>/dev/null )
- if ( cd $TICDIR 2>/dev/null )
- then
- cd $TICDIR
- TICDIR=`pwd`
- if test $TICDIR != $TERMINFO ; then
- # Well, we tried. Some systems lie to us, so the
- # installer will have to double-check.
- echo "Verify if $TICDIR and $TERMINFO are the same."
- echo "The new terminfo is in $TERMINFO; the other should be a link to it."
- echo "Otherwise, remove $TICDIR and link it to $TERMINFO."
- fi
- else
- cd ${DESTDIR}$prefix
- # Construct a symbolic link that only assumes $ticdir has the
- # same $prefix as the other installed directories.
- RELATIVE=`echo $ticdir|sed -e 's%^'$prefix'/%%'`
- if test "$RELATIVE" != "$ticdir" ; then
- RELATIVE=../`echo $ticdir|sed -e 's%^'$prefix'/%%' -e 's%^/%%'`
- fi
- if ( @LN_S@ $RELATIVE $TICDIR )
- then
- echo '** sym-linked '$TICDIR' for compatibility'
- else
- echo '** could not sym-link '$TICDIR' for compatibility'
- fi
- fi
-fi
# vile:shmode

13
base/ncurses/ncurses.conf

@ -128,6 +128,16 @@ make_termcap_symlinks() {
ln -svf libtinfo.a $root$libdir/libtermcap.a ln -svf libtinfo.a $root$libdir/libtermcap.a
} }
# function to create a compatibility symlink '/usr/lib/terminfo'
make_terminfo_symlink() {
# construct the path to the old terminfo dir (taken from run_tic.sh)
local compatdir="$(echo $datadir/terminfo | sed -e 's%/share/\([^/]*\)$%/lib/\1%')"
if [ ! -e $root$compatdir ]; then
ln -svf ../share/terminfo $root$compatdir
fi
}
if atstage toolchain; then if atstage toolchain; then
buildloops=1 buildloops=1
custmain='tic_only' custmain='tic_only'
@ -174,6 +184,9 @@ else
# always create compatibility symlinks for curses # always create compatibility symlinks for curses
hook_add postmake 5 "make_curses_symlinks" hook_add postmake 5 "make_curses_symlinks"
# always create compatibility symlinks for terminfo directory
hook_add postmake 5 "make_terminfo_symlink"
if pkginstalled termcap ; then if pkginstalled termcap ; then
echo_status "Found termcap package ->" \ echo_status "Found termcap package ->" \
"disable ncurses internal termcap library." "disable ncurses internal termcap library."

Loading…
Cancel
Save